diff --git a/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py b/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py index eb1605e..40c7dea 100644 --- a/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py +++ b/ruoyi-fastapi-backend/module_admin/service/identification_record_service.py @@ -42,16 +42,20 @@ class Identification_recordService: # 获取门禁点列表, 获取机器人添加的门禁设备列表,有权限的. door_index_code_list = await DoorDao.get_door_index_code_list(query_db, permission='1') - haikang_record_list = await HaikangUtil.query_door_events_v2(door_index_code_list - ,pageNo=query_object.page_num - , pageSize=max(t-query_object.page_size, t-len(identification_record_list_result.rows)) - ,startTime=start_time, endTime=end_time - ,personName=query_object.person_name) + try: + haikang_record_list = await HaikangUtil.query_door_events_v2(door_index_code_list + ,pageNo=query_object.page_num + , pageSize=max(t-query_object.page_size, t-len(identification_record_list_result.rows)) + ,startTime=start_time, endTime=end_time + ,personName=query_object.person_name) + return identification_record_list_result.rows + cls.parse_haikang_record_list(haikang_record_list[1]["list"]) + except Exception as e: + print(e) # print(identification_record_list_result.rows) # print("*"*100) # print(haikang_record_list[1]) - return identification_record_list_result.rows + cls.parse_haikang_record_list(haikang_record_list[1]["list"]) + return identification_record_list_result.rows # return None