From f5236e277437b7e94c566d8f4068bb608f36d56e Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Mon, 8 Dec 2025 14:38:55 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=B7=AF=E5=8F=A3=E7=AE=A1?= =?UTF-8?q?=E5=AE=B6=E5=B7=A1=E6=A3=80=E9=A1=B5=E9=9D=A2=E4=BA=A7=E5=93=81?= =?UTF-8?q?=E8=B5=B0=E6=9F=A5bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/compare_views.py | 7 ++++++- app/cross_compare_worker.py | 4 ++-- app/db_func_base.py | 1 + app/monitor_common.py | 4 ++-- 4 files changed, 11 insertions(+), 5 deletions(-) diff --git a/app/compare_views.py b/app/compare_views.py index d343e7f..a22cea9 100644 --- a/app/compare_views.py +++ b/app/compare_views.py @@ -45,4 +45,9 @@ def rerun_cross_survey_part_api(): @app.route('/api/query_usable_survey_crosses', methods=['GET']) def query_usable_survey_crosses_api(): - return query_usable_survey_crosses(request.args) \ No newline at end of file + return query_usable_survey_crosses(request.args) + + +@app.route('/api/query_cross_survey_usable_dates', methods=['GET']) +def query_cross_survey_usable_dates_api(): + return query_cross_survey_usable_dates(request.args) \ No newline at end of file diff --git a/app/cross_compare_worker.py b/app/cross_compare_worker.py index e89fb03..c4f230d 100644 --- a/app/cross_compare_worker.py +++ b/app/cross_compare_worker.py @@ -316,7 +316,7 @@ def query_usable_survey_crosses(params): return json.dumps(make_common_res(5, '辖区id异常，请检查后重试')) area_servey_jobs = db_tmnet.query_survey_job_info_by_area_id(area_id) - usable_crossid_list = list(set([job['crossid'] for job in area_servey_jobs.values()])) + usable_crossid_list = list(set([job['crossid'] for job in area_servey_jobs])) res_list = [] for crossid in usable_crossid_list: cross_name = g_roadnet.query_cross(crossid).name @@ -360,7 +360,7 @@ def query_cross_survey_usable_dates(params): end_day = row['update_time'].strftime('%Y%m%d') usable_info['job_info'].append({ 'jobid': row['id'], - 'time_range': start_day + '-' + end_day, + 'time_range': str(start_day) + '-' + str(end_day), }) res = make_common_res(0, 'ok') res['data'] = usable_info diff --git a/app/db_func_base.py b/app/db_func_base.py index 61edee6..f150749 100644 --- a/app/db_func_base.py +++ b/app/db_func_base.py @@ -75,6 +75,7 @@ class TableDbHelperBase: logging.error(f"do_execute '{sql_update}' Error: {e}") return 0 return ret + def do_executemany(self, sql, data_list, cursor=None): try: logging.info(f"sql = {sql}, data_list = {data_list}") diff --git a/app/monitor_common.py b/app/monitor_common.py index 72e566a..ae33c1b 100644 --- a/app/monitor_common.py +++ b/app/monitor_common.py @@ -1715,12 +1715,12 @@ def gen_cross_problem_detail(routing_crosses, high_park_problems, too_many_stop_ phase_infos = phase_tp['problems'][crossid] phase_list = [] for item in phase_infos: - if item['final_state_int'] in (4, 5): - continue if item['level_color_int'] < phase_color: phase_color = item['level_color_int'] if item['final_state_int'] < phase_final_state: phase_final_state = item['final_state_int'] + if item['final_state_int'] in (4, 5): + continue item_desc = '【' + item['first_date'] + ' ' + item['time_range'] + '】' + item['level_color'] + '异常' phase_list.append({ 'desc': item_desc,