Commit 9875a3db authored by Allvey's avatar Allvey

穿越装载区优化

parent c6e1edd1
{ {
"para": { "para": {
"log_path": "/usr/local/fleet-log/dispatch", "log_path": "/usr/local/fleet-log/dispatch",
"empty_speed": 80, "empty_speed": 15,
"heavy_speed": 60, "heavy_speed": 15,
"dump_target_mass": 5000, "dump_target_mass": 5000,
"excavator_target_mass": 5000 "excavator_target_mass": 5000
}, },
...@@ -23,5 +23,9 @@ ...@@ -23,5 +23,9 @@
"redis": { "redis": {
"host": "172.16.0.51", "host": "172.16.0.51",
"password": "Huituo@123" "password": "Huituo@123"
},
"gothrough": {
"closer_area_name": "1025装载区01",
"further_area_name": "1025装载区-03"
} }
} }
\ No newline at end of file
...@@ -1137,7 +1137,7 @@ class GoThroughDispatcher: ...@@ -1137,7 +1137,7 @@ class GoThroughDispatcher:
try: try:
further_area_backtrack_node_id = self.further_entrance_node_id further_area_backtrack_node_id = self.further_entrance_node_id
self.further_area_backtrack_lanes = [] self.further_area_backtrack_lanes = []
for i in range(5): for i in range(20):
# 查询回溯路段对象 # 查询回溯路段对象
item = session_postgre.query(Lane).filter_by(EndNodeId=further_area_backtrack_node_id).first() item = session_postgre.query(Lane).filter_by(EndNodeId=further_area_backtrack_node_id).first()
if item is None: if item is None:
...@@ -1191,7 +1191,7 @@ class GoThroughDispatcher: ...@@ -1191,7 +1191,7 @@ class GoThroughDispatcher:
# 多回溯一个路段 # 多回溯一个路段
if lowest_common_ancestor.Length < 200: if lowest_common_ancestor.Length < 200:
item = session_postgre.query(Lane).filter_by(EndNodeId=lowest_common_ancestor.StartNodeId).first() item = session_postgre.query(Lane).filter_by(EndNodeId=lowest_common_ancestor.StartNodeId).first()
self.gothrough_check_lanes.append(item.Id) self.gothrough_check_lanes.append(str(item.Id))
self.logger.info("gothrough_check_lanes") self.logger.info("gothrough_check_lanes")
self.logger.info(self.gothrough_check_lanes) self.logger.info(self.gothrough_check_lanes)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment