合并Dev分支代码

backend/app/api/routers/request/base.py

@@ -18,14 +18,14 @@ class conversations:
 
         return datas
 
-    def get(self,user_id:str,id:str = ''):
-        records = dbManage.query(self._tableName,user_id = user_id,id=id)
+    def get(self, id:str):
+        records = dbManage.query(self._tableName, id=id)
         if len(records) >0:
             return records[0]
         return None
 
-    def add(self,user_id:str,name:str,id:str = ''):
-        template = BaseConfig.ConversationCfg
+    def add(self,id:str, user_id:str, name:str):
+        template = BaseConfig().ConversationCfg()
         template['id'] = id
         template['user_id'] = user_id
         template['name'] = name
@@ -111,7 +111,7 @@ class message:
         return datas
 
     def add(self,user_id:str,conversation_id:str,query:str,answer:str):
-        template = BaseConfig.MessageCfg
+        template = BaseConfig.MessageCfg()
         template['id'] = str(uuid.uuid4())
         template['user_id'] = user_id
         template['conversation_id'] = conversation_id
@@ -122,4 +122,34 @@ class message:
     def delete(self,user_id:str):
         dbManage.delete(self._tableName,user_id = user_id)
 
+    def query(self,**condition):
+        results = []
+        records = dbManage.query(self._tableName,**condition)
+        for record in records:
+            results.append(record.dict())
+        return results        
 
+class feedback:
+    def __init__(self) -> None:
+        self._tableName = 'feedbacks'
+        dbManage.createTable(self._tableName)
+
+    def add(self,message_id:str,query:str,answer:str,rating:str):
+        record = {
+            'message_id': message_id,
+            'query': query,  
+            'answer': answer,  
+            'rating': rating,  
+        }
+        dbManage.addRecord(self._tableName,record)
+ 
+    def delete(self,message_id:str):
+        cond = {'message_id':message_id}
+        dbManage.delete(self._tableName,**cond)
+    
+    def query(self,message_id:str):
+        cond = {'message_id':message_id}
+        records = dbManage.query(self._tableName,**cond)
+        if len(records) > 0:
+            return records[0].dict()    
+        return None