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

增加二次行人过街 

Signed-off-by: yinzijian <yinzijian@haomozhixing.onaliyun.com>
This commit is contained in:
yinzijian 2026-01-28 18:34:56 +08:00
parent 665fa7a86b
commit cfa8420c0b
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/phasetable_worker.py
View File

@ -42,9 +42,12 @@ def phase_cross_list(params):
"crossid": item_cross_road_list['crossid'], "crossid": item_cross_road_list['crossid'],
"name": item_cross_road_list['name'], "name": item_cross_road_list['name'],
"src_dir": [], "src_dir": [],
"two_ped_dir": [],
} }
if item_cross_road_list['src_direct'] not in cross_map[item_cross_road_list['crossid']]['src_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']) 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 = make_common_res(0, 'ok')
res["data"] = list(cross_map.values()) res["data"] = list(cross_map.values())
return json.dumps(res, ensure_ascii=False) return json.dumps(res, ensure_ascii=False)

12
app/tmnet_db_func.py
View File

@ -281,7 +281,8 @@ class TmnetDbHelper(TableDbHelperBase):
IFNULL(rlui.from_crossid, r.from_crossid) as from_crossid, IFNULL(rlui.from_crossid, r.from_crossid) as from_crossid,
IFNULL(rlui.to_crossid, r.to_crossid) as to_crossid, IFNULL(rlui.to_crossid, r.to_crossid) as to_crossid,
IFNULL(rlui.name, r.name) as road_name, 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 from `bound_crosses` as c
join `cross` c2 on c2.crossid = c.crossid and c2.nodeid = %s and c2.area_id = %s 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 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.from_crossid,
udr.to_crossid, udr.to_crossid,
udr.name, udr.name,
udr.src_direct udr.src_direct,
udr.pedestrian_crossing
from `bound_crosses` as c from `bound_crosses` as c
join `cross` c2 on c2.crossid = c.crossid and c2.nodeid = %s and c2.area_id = %s 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 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.from_crossid, r.from_crossid) as from_crossid,
IFNULL(rlui.to_crossid, r.to_crossid) as to_crossid, IFNULL(rlui.to_crossid, r.to_crossid) as to_crossid,
IFNULL(rlui.name, r.name) as road_name, 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 from `bound_crosses` as c
join `user_defined_cross` udc on udc.crossid = c.crossid and udc.nodeid = %s and udc.area_id = %s 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) 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.from_crossid,
udr.to_crossid, udr.to_crossid,
udr.name as road_name, udr.name as road_name,
udr.src_direct udr.src_direct,
udr.pedestrian_crossing
from `bound_crosses` as c from `bound_crosses` as c
join `user_defined_cross` udc on udc.crossid = c.crossid and udc.nodeid = %s and udc.area_id = %s 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) 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)