|
@@ -62,7 +62,7 @@ class TaskResponse(BaseResponse):
|
|
page_num: int = Field(1, description="第几页")
|
|
page_num: int = Field(1, description="第几页")
|
|
page_size: int = Field(10, description="每页个数")
|
|
page_size: int = Field(10, description="每页个数")
|
|
config_id: str = Field('', description="脚本配置id")
|
|
config_id: str = Field('', description="脚本配置id")
|
|
- result: List[TaskDetail] = Field(..., description="结果详情")
|
|
|
|
|
|
+ result: List[TaskDetail] = Field([], description="结果详情")
|
|
|
|
|
|
|
|
|
|
class ConfigResponse(BaseResponse):
|
|
class ConfigResponse(BaseResponse):
|
|
@@ -262,6 +262,7 @@ def get_script_config_lst(item: ScriptConfigLst):
|
|
summary='脚本数据导出列表'
|
|
summary='脚本数据导出列表'
|
|
)
|
|
)
|
|
def get_query_word_task_info_lst(item: QueryWordTaskInfoLst):
|
|
def get_query_word_task_info_lst(item: QueryWordTaskInfoLst):
|
|
|
|
+ response = TaskResponse(code=0, message="查询成功", success=True)
|
|
try:
|
|
try:
|
|
end_date = item.end_date + timedelta(days=1)
|
|
end_date = item.end_date + timedelta(days=1)
|
|
source_code_lst = [-1, -2] if len(item.source_code) == 0 else (item.source_code * 2 if len(item.source_code) == 1 else item.source_code)
|
|
source_code_lst = [-1, -2] if len(item.source_code) == 0 else (item.source_code * 2 if len(item.source_code) == 1 else item.source_code)
|
|
@@ -299,35 +300,25 @@ def get_query_word_task_info_lst(item: QueryWordTaskInfoLst):
|
|
total_num = df.shape[0]
|
|
total_num = df.shape[0]
|
|
detail = df.iloc[(item.page_num - 1) * item.page_size: item.page_num * item.page_size].to_dict('records')
|
|
detail = 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,
|
|
|
|
- "config_id": item.config_id}
|
|
|
|
- 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
|
|
|
|
+ response.config_id = item.config_id
|
|
else:
|
|
else:
|
|
- response = {'code': 0,
|
|
|
|
- "message": "没有符合条件的数据",
|
|
|
|
- "success": True,
|
|
|
|
- "result": [],
|
|
|
|
- "total_num": 0,
|
|
|
|
- "page_num": item.page_num,
|
|
|
|
- "page_size": item.page_size,
|
|
|
|
- "config_id": item.config_id}
|
|
|
|
- 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
|
|
|
|
+ response.config_id = item.config_id
|
|
|
|
|
|
|
|
+ logger.info(f"request body: {item}, response body: {response}")
|
|
except:
|
|
except:
|
|
- response = {"code": -1,
|
|
|
|
- "message": traceback.format_exc(),
|
|
|
|
- "success": False,
|
|
|
|
- "result": None}
|
|
|
|
|
|
+ response.message = traceback.format_exc()
|
|
|
|
+ response.code = -1
|
|
|
|
+ response.success = False
|
|
logger.error(f"request body: {item}, response body: {response}")
|
|
logger.error(f"request body: {item}, response body: {response}")
|
|
- return response
|
|
|
|
|
|
+
|
|
|
|
+ return response
|
|
|
|
|
|
|
|
|
|
@logger.catch
|
|
@logger.catch
|