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

修复路口诊断趋势图bug

This commit is contained in:
wangxu 2025-12-25 19:27:05 +08:00
parent 3398e86007
commit f0668a309e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/cross_evaluate_worker.py
View File

@ -296,7 +296,7 @@ def query_cross_index_trend_controller(params):
hours_data_with_change_rate = calc_single_day_delay_info_change_rate(hours_data_dict) hours_data_with_change_rate = calc_single_day_delay_info_change_rate(hours_data_dict)
# 查询近30天的数据 # 查询近30天的数据
days_data = db_cross.query_cross_delay_info(crossid, nodeid, month_date_list, tp_start) days_data = db_cross.query_cross_delay_info(crossid, nodeid, month_date_list, tp_start)
days_pb_list = parse_data2pb(days_data) days_pb_list = parse_data2pb(days_data, weekdays)
days_data_dict = parse_single_cross_delay_info(crossid, nodeid, days_pb_list, 'day', roads_dir_dict) days_data_dict = parse_single_cross_delay_info(crossid, nodeid, days_pb_list, 'day', roads_dir_dict)
days_data_with_change_rate = calc_single_day_delay_info_change_rate(days_data_dict) days_data_with_change_rate = calc_single_day_delay_info_change_rate(days_data_dict)
# 查询近10周的数据 需要聚合 可能不能使用下述方式查询 # 查询近10周的数据 需要聚合 可能不能使用下述方式查询
@ -486,7 +486,7 @@ def explode_cross_problem_detail(params):
all_cross_data = [] all_cross_data = []
for crossid in routing_crosses_dict.keys(): for crossid in routing_crosses_dict.keys():
days_data = db_cross.query_cross_delay_info(crossid, nodeid, date_list, tp_start) days_data = db_cross.query_cross_delay_info(crossid, nodeid, date_list, tp_start)
days_pb_list = parse_data2pb(days_data) days_pb_list = parse_data2pb(days_data, '1,2,3,4,5,6,7')
cross_data_list = parse_cross_delay_detail_list(routing_crosses_dict[crossid], days_pb_list, time_range) cross_data_list = parse_cross_delay_detail_list(routing_crosses_dict[crossid], days_pb_list, time_range)
all_cross_data.extend(cross_data_list) all_cross_data.extend(cross_data_list)

4
app/eva_common.py
View File

@ -1211,7 +1211,7 @@ def calc_roads_data_change_rate(roads_data, prev_roads_data):
return res_data return res_data
def parse_data2pb(data_list): def parse_data2pb(data_list, weekdays):
res_list = [] res_list = []
for row in data_list: for row in data_list:
day = row['day'] day = row['day']
@ -1219,6 +1219,8 @@ def parse_data2pb(data_list):
tp_end = row['tp_end'] tp_end = row['tp_end']
item_cross_delay_info = pb.xl_cross_delayinfo_t() item_cross_delay_info = pb.xl_cross_delayinfo_t()
item_cross_delay_info.ParseFromString(row['data']) item_cross_delay_info.ParseFromString(row['data'])
if str(datetime.strptime(str(day), '%Y%m%d').weekday() + 1) not in weekdays:
item_cross_delay_info = None
res_list.append({ res_list.append({
'day': day, 'day': day,
'tp_start': tp_start, 'tp_start': tp_start,