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

修复巡检页面信号机品牌字典获取逻辑

This commit is contained in:
wangxu 2026-03-12 15:12:58 +08:00
parent 432db750fa
commit 765b3bd830
3 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/cross_monitor_worker.py
View File

@ -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')

22
app/eva_common.py
View File

@ -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):

4
app/tmnet_db_func.py
View File

@ -625,3 +625,7 @@ class TmnetDbHelper(TableDbHelperBase):
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)