From cfa8420c0b381b4e002f311b2ea36ee9175b59ca Mon Sep 17 00:00:00 2001 From: yinzijian Date: Wed, 28 Jan 2026 18:34:56 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=8C=E6=AC=A1=E8=A1=8C?= =?UTF-8?q?=E4=BA=BA=E8=BF=87=E8=A1=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: yinzijian --- app/phasetable_worker.py | 3 +++ app/tmnet_db_func.py | 12 ++++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/app/phasetable_worker.py b/app/phasetable_worker.py index 9d34383..354339b 100644 --- a/app/phasetable_worker.py +++ b/app/phasetable_worker.py @@ -42,9 +42,12 @@ def phase_cross_list(params): "crossid": item_cross_road_list['crossid'], "name": item_cross_road_list['name'], "src_dir": [], + "two_ped_dir": [], } if item_cross_road_list['src_direct'] not in cross_map[item_cross_road_list['crossid']]['src_dir']: cross_map[item_cross_road_list['crossid']]['src_dir'].append(item_cross_road_list['src_direct']) + if item_cross_road_list['pedestrian_crossing'] == 2 and item_cross_road_list['src_direct'] not in cross_map[item_cross_road_list['crossid']]['two_ped_dir']: + cross_map[item_cross_road_list['crossid']]['two_ped_dir'].append(item_cross_road_list['src_direct']) res = make_common_res(0, 'ok') res["data"] = list(cross_map.values()) return json.dumps(res, ensure_ascii=False) diff --git a/app/tmnet_db_func.py b/app/tmnet_db_func.py index a537b24..d914ae4 100644 --- a/app/tmnet_db_func.py +++ b/app/tmnet_db_func.py @@ -281,7 +281,8 @@ class TmnetDbHelper(TableDbHelperBase): IFNULL(rlui.from_crossid, r.from_crossid) as from_crossid, IFNULL(rlui.to_crossid, r.to_crossid) as to_crossid, IFNULL(rlui.name, r.name) as road_name, - IFNULL(rlui.src_direct, r.src_direct) as src_direct + IFNULL(rlui.src_direct, r.src_direct) as src_direct, + IFNULL(rlui.pedestrian_crossing, r.pedestrian_crossing) as pedestrian_crossing from `bound_crosses` as c join `cross` c2 on c2.crossid = c.crossid and c2.nodeid = %s and c2.area_id = %s left join `cross_ledger_update_info` as clui on clui.crossid = c.crossid and clui.nodeid = %s and clui.area_id = %s @@ -299,7 +300,8 @@ class TmnetDbHelper(TableDbHelperBase): udr.from_crossid, udr.to_crossid, udr.name, - udr.src_direct + udr.src_direct, + udr.pedestrian_crossing from `bound_crosses` as c join `cross` c2 on c2.crossid = c.crossid and c2.nodeid = %s and c2.area_id = %s left join `cross_ledger_update_info` as clui on clui.crossid = c.crossid and clui.nodeid = %s and clui.area_id = %s @@ -316,7 +318,8 @@ class TmnetDbHelper(TableDbHelperBase): IFNULL(rlui.from_crossid, r.from_crossid) as from_crossid, IFNULL(rlui.to_crossid, r.to_crossid) as to_crossid, IFNULL(rlui.name, r.name) as road_name, - IFNULL(rlui.src_direct, r.src_direct) as src_direct + IFNULL(rlui.src_direct, r.src_direct) as src_direct, + IFNULL(rlui.pedestrian_crossing, r.pedestrian_crossing) as pedestrian_crossing from `bound_crosses` as c join `user_defined_cross` udc on udc.crossid = c.crossid and udc.nodeid = %s and udc.area_id = %s left join `road` as r on r.nodeid = %s and r.to_crossid = udc.crossid and r.recordstate = 0 and (r.is_sup_road is null or r.is_sup_road <> 1) @@ -333,7 +336,8 @@ class TmnetDbHelper(TableDbHelperBase): udr.from_crossid, udr.to_crossid, udr.name as road_name, - udr.src_direct + udr.src_direct, + udr.pedestrian_crossing from `bound_crosses` as c join `user_defined_cross` udc on udc.crossid = c.crossid and udc.nodeid = %s and udc.area_id = %s left join `user_defined_roads` as udr on udr.nodeid = %s and udr.recordstate = 0 and udr.to_crossid = c.crossid and (udr.is_sup_road is null or udr.is_sup_road <> 1)