Explorar o código

脚本配置查询更新response方式

liyuyi@c-top.com.cn %!s(int64=3) %!d(string=hai) anos
pai
achega
0ebafbe65f
Modificáronse 1 ficheiros con 17 adicións e 26 borrados
  1. 17 26
      routers/script_config.py

+ 17 - 26
routers/script_config.py

@@ -34,8 +34,8 @@ with open('/data/pythonProject/video_to_word/config/config.yaml', mode='r', enco
 
 class BaseResponse(BaseModel):
     message: str = Field(..., description='消息')
-    success: bool = Field(..., description='true or false')
-    code: int = Field(..., description='')
+    success: bool = Field(True, description='true or false')
+    code: int = Field(0, description='')
 
 
 class TaskDetail(BaseModel):
@@ -69,7 +69,7 @@ class ConfigResponse(BaseResponse):
     total_num: int = Field(0, description="总个数")
     page_num: int = Field(1, description="第几页")
     page_size: int = Field(10, description="每页个数")
-    result: List[ConfigDetail] = Field(..., description="结果详情")
+    result: List[ConfigDetail] = Field([], description="结果详情")
 
 
 class QueryWordItem(BaseModel):
@@ -207,6 +207,7 @@ def export_script_file(item: List[QueryWordItem]):
              summary='脚本配置列表'
              )
 def get_script_config_lst(item: ScriptConfigLst):
+    response = ConfigResponse(message="查询成功")
     try:
         end_date = item.end_date + timedelta(days=1)
         sql = f"select * from ctop_ai_script_query_word_config where config_id in " \
@@ -227,33 +228,23 @@ def get_script_config_lst(item: ScriptConfigLst):
             g_df['number'] = list(range(1, len(g_df) + 1))
             total_num = g_df.shape[0]
             detail = g_df.iloc[(item.page_num - 1) * item.page_size: item.page_num * item.page_size].to_dict('records')
-            response = {'code': 0,
-                        "message": "查询成功",
-                        "success": True,
-                        "result": detail,
-                        "total_num": total_num,
-                        "page_num": item.page_num,
-                        "page_size": item.page_size}
-            logger.info(f"request body: {item}, response body: {response}")
-            return response
+            response.result = detail
+            response.total_num = total_num
+            response.page_num = item.page_num
+            response.page_size = item.page_size
         else:
-            response = {'code': 0,
-                        "message": "没有符合条件的数据",
-                        "success": True,
-                        "result": [],
-                        "total_num": 0,
-                        "page_num": item.page_num,
-                        "page_size": item.page_size}
-            logger.info(f"request body: {item}, response body: {response}")
-            return response
+            response.message = "没有符合条件的数据"
+            response.page_num = item.page_num
+            response.page_size = item.page_size
 
+        logger.info(f"request body: {item}, response body: {response}")
     except:
-        response = {"code": -1,
-                    "message": traceback.format_exc(),
-                    "success": False,
-                    "result": None}
+        response.code = -1
+        response.message = traceback.format_exc()
+        response.success = False
         logger.error(f"request body: {item}, response body: {response}")
-        return response
+
+    return response
 
 
 @logger.catch