Commit cd3346f6 authored by Allvey's avatar Allvey

修复新版地图二次调度异常

parent bd837d18
...@@ -140,6 +140,8 @@ class Topo(): ...@@ -140,6 +140,8 @@ class Topo():
# item = [[load_area_id, unload_area_id], to_unload_lanes, to_load_lanes] # item = [[load_area_id, unload_area_id], to_unload_lanes, to_load_lanes]
# path_node_for_trip= [] # path_node_for_trip= []
try:
# unload_G # unload_G
Exitnode_for_digging = str( Exitnode_for_digging = str(
session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().ExitNodeId) session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().ExitNodeId)
...@@ -163,6 +165,12 @@ class Topo(): ...@@ -163,6 +165,12 @@ class Topo():
self.unload_G_all_nodes.append(Entrancenode_for_dump) self.unload_G_all_nodes.append(Entrancenode_for_dump)
self.unload_G_dump_nodes.append(Entrancenode_for_dump) self.unload_G_dump_nodes.append(Entrancenode_for_dump)
except Exception as es:
self.logger.error(es)
self.logger.error("读取卸载区入场点出错")
session_mysql.rollback()
session_postgre.rollback()
try: try:
unload_saved_lane = [] unload_saved_lane = []
for lane_id in item[1]: # for each lane in a to_unload route for lane_id in item[1]: # for each lane in a to_unload route
...@@ -215,6 +223,8 @@ class Topo(): ...@@ -215,6 +223,8 @@ class Topo():
# path_node_for_trip.append(Exitnode_for_digging) # add node for trip # path_node_for_trip.append(Exitnode_for_digging) # add node for trip
# if lane_endpoint in self.unload_G_dump_nodes: # if lane_endpoint in self.unload_G_dump_nodes:
try:
# load_G # load_G
Entrancenode_for_digging = str( Entrancenode_for_digging = str(
session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().EntranceNodeId) session_postgre.query(DiggingWorkArea).filter_by(FeatureId=item[0][0], MapVersion=map_version).first().EntranceNodeId)
...@@ -237,6 +247,12 @@ class Topo(): ...@@ -237,6 +247,12 @@ class Topo():
self.load_G.add_node(Exitnode_for_dump, name='group_dumps', type=dump_name) self.load_G.add_node(Exitnode_for_dump, name='group_dumps', type=dump_name)
self.load_G.add_node(Entrancenode_for_digging, name='digging', type=digging_name) self.load_G.add_node(Entrancenode_for_digging, name='digging', type=digging_name)
except Exception as es:
self.logger.error(es)
self.logger.error("读取装载区入场点出错")
session_mysql.rollback()
session_postgre.rollback()
try: try:
load_saved_lane = [] load_saved_lane = []
......
...@@ -6,4 +6,4 @@ ...@@ -6,4 +6,4 @@
# @File : versiontag.py.py # @File : versiontag.py.py
# @Software: PyCharm # @Software: PyCharm
VERSION_TAG = '81' VERSION_TAG = '82'
\ No newline at end of file \ No newline at end of file
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