From f0668a309ed6b93727d2f63689792a35e4795120 Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Thu, 25 Dec 2025 19:27:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=8F=A3=E8=AF=8A?= =?UTF-8?q?=E6=96=AD=E8=B6=8B=E5=8A=BF=E5=9B=BEbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/cross_evaluate_worker.py | 4 ++-- app/eva_common.py | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/app/cross_evaluate_worker.py b/app/cross_evaluate_worker.py index 19efbcf..3367a8c 100644 --- a/app/cross_evaluate_worker.py +++ b/app/cross_evaluate_worker.py @@ -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) # 查询近30天的数据 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_with_change_rate = calc_single_day_delay_info_change_rate(days_data_dict) # 查询近10周的数据 需要聚合 可能不能使用下述方式查询 @@ -486,7 +486,7 @@ def explode_cross_problem_detail(params): all_cross_data = [] for crossid in routing_crosses_dict.keys(): 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) all_cross_data.extend(cross_data_list) diff --git a/app/eva_common.py b/app/eva_common.py index 163d4d8..a33228f 100644 --- a/app/eva_common.py +++ b/app/eva_common.py @@ -1211,7 +1211,7 @@ def calc_roads_data_change_rate(roads_data, prev_roads_data): return res_data -def parse_data2pb(data_list): +def parse_data2pb(data_list, weekdays): res_list = [] for row in data_list: day = row['day'] @@ -1219,6 +1219,8 @@ def parse_data2pb(data_list): tp_end = row['tp_end'] item_cross_delay_info = pb.xl_cross_delayinfo_t() 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({ 'day': day, 'tp_start': tp_start,