xuwang
/
cross_doctor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改 

Signed-off-by: yinzijian <yinzijian@haomozhixing.onaliyun.com>
This commit is contained in:
yinzijian 2026-05-20 19:20:10 +08:00
parent c97ddcb2c2 da6f6661bc
commit 78b6d0425b
1 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
app/cross_compare_report.py
View File

@ -70,7 +70,19 @@ def gen_cross_compare_report(params):
cut_images = check_param(params, 'cut_images') cut_images = check_param(params, 'cut_images')
if not cut_images: if not cut_images:
cut_images = 0 cut_images = 0
date_list4screen = transition_date_list4screen(date_list)
all_date_set = set()
for item_list in date_list:
for item in item_list:
all_date_set.add(item)
date_list = list(all_date_set)
date_list.sort()
all_compare_date_set = set()
for item_list in compare_date_list:
for item in item_list:
all_compare_date_set.add(item)
compare_date_list = list(all_compare_date_set)
compare_date_list.sort()
# 路口静态信息及台账信息 # 路口静态信息及台账信息
cross_ledger_info_dict = query_cross_ledger_info(crossid, nodeid, area_id, userid) cross_ledger_info_dict = query_cross_ledger_info(crossid, nodeid, area_id, userid)
if not cross_ledger_info_dict: if not cross_ledger_info_dict:
@ -116,7 +128,7 @@ def gen_cross_compare_report(params):
doc1.area_id = int(area_id) doc1.area_id = int(area_id)
doc1.crossid = crossid doc1.crossid = crossid
doc1.cross_name = cross_static_info['name'] doc1.cross_name = cross_static_info['name']
doc1.time_list = date_list doc1.time_list = date_list4screen
doc1.tp = time_range doc1.tp = time_range
logging.info(doc1.cut_image, doc1.area_id, doc1.crossid, doc1.cross_name, doc1.time_list, doc1.tp) logging.info(doc1.cut_image, doc1.area_id, doc1.crossid, doc1.cross_name, doc1.time_list, doc1.tp)
# 必要数据获取 # 必要数据获取
@ -603,3 +615,14 @@ def cancel_collect_report(params):
if not ret: if not ret:
return json.dumps(make_common_res(7, '取消失败，请检查后重试')) return json.dumps(make_common_res(7, '取消失败，请检查后重试'))
return json.dumps(make_common_res(0, 'ok')) return json.dumps(make_common_res(0, 'ok'))
def transition_date_list4screen(date_list):
for i in range(0, len(date_list)):
if len(date_list[i]) == 1:
date_list[i] = [datetime.datetime.strptime(date_list[i][0], '%Y%m%d').strftime('%Y-%m-%d'), datetime.datetime.strptime(date_list[i][0], '%Y%m%d').strftime('%Y-%m-%d')]
elif len(date_list[i]) == 2:
date_list[i] = [datetime.datetime.strptime(date_list[i][0], '%Y%m%d').strftime('%Y-%m-%d'), datetime.datetime.strptime(date_list[i][1], '%Y%m%d').strftime('%Y-%m-%d')]
elif len(date_list[i]) > 2:
date_list[i] = [datetime.datetime.strptime(date_list[i][0], '%Y%m%d').strftime('%Y-%m-%d'), datetime.datetime.strptime(date_list[i][-1], '%Y%m%d').strftime('%Y-%m-%d')]
return date_list