From 765b3bd8303d50ccdda5eb8f1e4b486ab132eaea Mon Sep 17 00:00:00 2001 From: wangxu <1318272526@qq.com> Date: Thu, 12 Mar 2026 15:12:58 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=B7=A1=E6=A3=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E4=BF=A1=E5=8F=B7=E6=9C=BA=E5=93=81=E7=89=8C=E5=AD=97?= =?UTF-8?q?=E5=85=B8=E8=8E=B7=E5=8F=96=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/cross_monitor_worker.py | 2 +- app/eva_common.py | 22 +++++----------------- app/tmnet_db_func.py | 4 ++++ 3 files changed, 10 insertions(+), 18 deletions(-) diff --git a/app/cross_monitor_worker.py b/app/cross_monitor_worker.py index 84d4a86..7110fed 100644 --- a/app/cross_monitor_worker.py +++ b/app/cross_monitor_worker.py @@ -97,7 +97,7 @@ def query_monitor_data(params): cross_report_pb.ParseFromString(row_list[0]['data']) # print(MessageToJson(cross_report_pb, indent=None, always_print_fields_with_no_presence=True)) overview_data = gen_monitor_overview_data(cross_report_pb, date_type, routing_crosses, special_time_range, routing_crosses_dict) - division_list, company_list, slc_company_dict, slckind_list, detector_type_dict = gen_ledger_base_info(nodeid, area_id) + slc_company_dict = gen_ledger_base_info() monitor_crosses_ledger_info = gen_monitor_cross_ledger_info(routing_crosses, nodeid, area_id, slc_company_dict, date_type, query_date) cross_delay_info_list = gen_cross_delay_info_list(userid, area_id, nodeid, date_type, cross_report_pb, special_time_range, routing_crosses_dict, slc_company_dict) res = make_common_res(0, 'ok') diff --git a/app/eva_common.py b/app/eva_common.py index 1bc54c9..8af2c83 100644 --- a/app/eva_common.py +++ b/app/eva_common.py @@ -371,7 +371,7 @@ def query_cross_ledger_info(crossid, nodeid, area_id, userid): def gen_cross_static_info(crossid, nodeid, area_id, cross_ledger_info_dict): - division_list, company_list, slc_company_dict, slckind_list, detector_type_dict = gen_ledger_base_info(nodeid, area_id) + slc_company_dict = gen_ledger_base_info() slc_company = cross_ledger_info_dict['data']['ledger']['slc_company'] location = cross_ledger_info_dict['data']['ledger']['location'] cross_name = cross_ledger_info_dict['data']['ledger']['name'] @@ -437,22 +437,10 @@ def gen_cross_static_info(crossid, nodeid, area_id, cross_ledger_info_dict): return cross_static_info, cross_ledger_info_dict['data'] -def gen_ledger_base_info(nodeid, area_id): - node_base_params_info = db_tmnet.query_base_info(nodeid, area_id) - # 下列字段当为空时需在前端展示尚未针对该城市进行配置的同义提示语句 - division_list, company_list, slc_company_dict, slckind_list, detector_type_dict = [], [], {}, [], {} - for row in node_base_params_info: - if row['param_type'] == 'division': - division_list.append(row['param_value']) - elif row['param_type'] == 'company': - company_list.append(row['param_value']) - elif row['param_type'] == 'slc_company': - slc_company_dict[row['param_code']] = row['param_value'] - elif row['param_type'] == 'slckind': - slckind_list.append(row['param_value']) - elif row['param_type'] == 'detector_type': - detector_type_dict[row['param_code']] = row['param_value'] - return division_list, company_list, slc_company_dict, slckind_list, detector_type_dict +def gen_ledger_base_info(): + slc_company_info = db_tmnet.query_slc_company_dict() + slc_company_dict = {int(row['mapping_code']): row['web_tag'] for row in slc_company_info} + return slc_company_dict def gen_dir_light_info_dict(light_infos): diff --git a/app/tmnet_db_func.py b/app/tmnet_db_func.py index d914ae4..d0c123e 100644 --- a/app/tmnet_db_func.py +++ b/app/tmnet_db_func.py @@ -624,4 +624,8 @@ class TmnetDbHelper(TableDbHelperBase): sql = """ select crossid from light_info where nodeid = %s and light_type = 4 """ % (nodeid) + return self.do_select(sql) + + def query_slc_company_dict(self): + sql = "select mapping_code, web_tag from tags.cross_tag_meta where field_eng_name = 'slc_company'" return self.do_select(sql) \ No newline at end of file