Skip to content

I
integrated-scheduling-v3
Commit 8d72df2a authored by 张晓彤's avatar 张晓彤
Browse files
Options

数据库更新BUG

parent e66dc548
Hide whitespace changes
Inline Side-by-side
Showing with 51 additions and 51 deletions
dispatcher.py
View file @ 8d72df2a
......@@ -141,7 +141,7 @@ class Dispatcher(WalkManage):
self.logger.error(es)
self.logger.error("调度规则读取异常")
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
try:
......
equipment/excavator.py
View file @ 8d72df2a
......@@ -137,7 +137,7 @@ class ExcavatorInfo(WalkManage):
except Exception as es:
self.logger.warning(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_excavator_priority(self):
......@@ -169,14 +169,14 @@ class ExcavatorInfo(WalkManage):
self.logger.error("物料更新异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_mining_ability(self):
try:
try:
rule4 = session_mysql.query(DispatchRule).filter_by(id=4).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if not rule4.disabled:
for excavator_index in range(len(self.excavator_index_to_uuid_dict)):
try:
......@@ -189,7 +189,7 @@ class ExcavatorInfo(WalkManage):
# raise Exception("挖机装载能力异常")
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
else:
self.excavator_strength = np.full(self.dynamic_excavator_num, 5000)
......@@ -228,7 +228,7 @@ class ExcavatorInfo(WalkManage):
rule7 = session_mysql.query(DispatchRule).filter_by(id=7).first().disabled
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
self.logger.info("物料优先级规则")
self.logger.info(rule7)
......
equipment/truck.py
View file @ 8d72df2a
......@@ -276,7 +276,7 @@ class TruckInfo(WalkManage):
self.logger.error("配对关系异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
continue
try:
......@@ -396,7 +396,7 @@ class TruckInfo(WalkManage):
self.logger.error("配对关系异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
continue
try:
......@@ -461,7 +461,7 @@ class TruckInfo(WalkManage):
rule6 = session_mysql.query(DispatchRule).filter_by(id=6).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
try:
if rule6.disabled == 0:
......@@ -470,7 +470,7 @@ class TruckInfo(WalkManage):
item = session_mysql.query(Equipment).filter_by(id=truck_id).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
truck_index = self.truck_uuid_to_index_dict[truck_id]
if item.priority == 0:
self.truck_priority[truck_index] = 0
......@@ -484,7 +484,7 @@ class TruckInfo(WalkManage):
self.logger.error("车辆优先级更新异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_truck_dump_area_bind(self):
truck_name_to_uuid_dict = get_value("truck_name_to_uuid_dict")
......@@ -502,7 +502,7 @@ class TruckInfo(WalkManage):
self.logger.error("矿卡-卸载区域绑定关系读取异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_truck_excavator_bind(self):
truck_name_to_uuid_dict = get_value("truck_name_to_uuid_dict")
......@@ -521,7 +521,7 @@ class TruckInfo(WalkManage):
self.logger.error("矿卡-挖机绑定关系读取异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_truck_excavator_exclude(self):
......@@ -538,7 +538,7 @@ class TruckInfo(WalkManage):
rule5 = session_mysql.query(DispatchRule).filter_by(id=5).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if rule5.disabled == 0:
for excavator_id in get_value("dynamic_excavator_set"):
try:
......@@ -549,7 +549,7 @@ class TruckInfo(WalkManage):
)
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if item is not None:
for truck_id in self.dynamic_truck_set:
if truck_uuid_to_name_dict[truck_id] not in item.bind_list:
......@@ -587,7 +587,7 @@ class TruckInfo(WalkManage):
dump_material_id = session_postgre.query(DumpArea).filter_by(Id=unload_area_id).first().Material
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
self.truck_material_bind[truck_id] = dump_material_id
if truck_id in self.truck_excavator_bind:
......@@ -628,7 +628,7 @@ class TruckInfo(WalkManage):
self.logger.error("车辆型号更新异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_truck_size(self):
self.update_truck_spec()
......@@ -641,7 +641,7 @@ class TruckInfo(WalkManage):
self.logger.error("车辆几何尺寸更新异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_truck_speed(self):
for truck_id in self.dynamic_truck_set:
......@@ -656,7 +656,7 @@ class TruckInfo(WalkManage):
self.logger.error("车辆速度更新异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_truck_disable_list(self) -> List:
try:
......@@ -666,7 +666,7 @@ class TruckInfo(WalkManage):
self.logger.error("车辆禁止列表更新异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return self.truck_disable_list
def truck_reset(self, dump, excavator):
......@@ -733,7 +733,7 @@ class TruckInfo(WalkManage):
self.logger.error("规则读取异常")
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
self.logger.info("Para truck update!")
......
group_control/group_control.py
View file @ 8d72df2a
......@@ -75,7 +75,7 @@ class Group(WalkManage):
except Exception as es:
self.logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if item is None:
print(truck_id)
continue
......@@ -101,7 +101,7 @@ class Group(WalkManage):
self.group_set.add(item.group_id)
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
self.group_num = len(self.group_set)
def update_device_group(self):
......@@ -121,7 +121,7 @@ class Group(WalkManage):
self.device_group[group_id][1].add(item.exactor_id)
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
def update_actual_traffic_flow(self):
"""
......
para_config.py
View file @ 8d72df2a
......@@ -353,7 +353,7 @@ class WalkManage(DeviceMap):
logger.error("路网信息异常")
logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
# 计算设备路网距离及行走时间
try:
......@@ -391,7 +391,7 @@ class WalkManage(DeviceMap):
logger.error("备停区路网信息异常")
logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
try:
for i in range(park_num):
for j in range(dynamic_excavator_num):
......
path_plan/path_plannner.py
View file @ 8d72df2a
......@@ -92,7 +92,7 @@ class PathPlanner(WalkManage):
load_area_id=load_area_id).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
# 读取道路路段信息
for lane_id in path.park_load_lanes:
if lane_id in self.lane.used_lane_set:
......@@ -112,7 +112,7 @@ class PathPlanner(WalkManage):
unload_area_id=unload_area_id).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
for lane_id in path.to_unload_lanes:
if lane_id in self.lane.used_lane_set:
if lane_id in lane_cost_memory:
......@@ -156,7 +156,7 @@ class PathPlanner(WalkManage):
lane_rec = session_postgre.query(Lane).filter_by(Id=lane_id).first() # 读取路段记录
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
lane_length = lane_rec.Length # 道路长度
......@@ -194,7 +194,7 @@ class PathPlanner(WalkManage):
rule1 = session_mysql.query(DispatchRule).filter_by(id=1).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if rule1.disabled == 0:
beta = rule1.rule_weight
......@@ -203,7 +203,7 @@ class PathPlanner(WalkManage):
rule2 = session_mysql.query(DispatchRule).filter_by(id=2).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if rule2.disabled == 0:
alpha = rule2.rule_weight
......@@ -226,7 +226,7 @@ class PathPlanner(WalkManage):
# WalkManage.distance_to_unload_area[unload_area_index][load_area_index]
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
# 读取备停区路网成本
try:
......@@ -239,7 +239,7 @@ class PathPlanner(WalkManage):
# WalkManage.distance_park_to_load_area[park_area_index][load_area_index]
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
logger.info(self.cost_park_to_load_area)
logger.info(self.distance_park_to_excavator)
......
path_plan/priority_control.py
View file @ 8d72df2a
......@@ -48,7 +48,7 @@ class PriorityController:
rule6 = session_mysql.query(DispatchRule).filter_by(id=6).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if not rule6.disabled:
for dump_id in dynamic_dump_set:
......@@ -63,7 +63,7 @@ class PriorityController:
rule7 = session_mysql.query(DispatchRule).filter_by(id=7).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if not rule7.disabled:
for dump_id in dynamic_dump_set:
......@@ -116,7 +116,7 @@ class PriorityController:
isdeleted=0).first()
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
if item is not None:
dump_index = self.dump.dump_uuid_to_index_dict[dump_id]
excavator_index = self.excavator.excavator_uuid_to_index_dict[excavator_id]
......
static_data_process.py
View file @ 8d72df2a
......@@ -44,7 +44,7 @@ def build_work_area_uuid_index_map():
logger.error("路网读取")
logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return (
load_area_uuid_to_index_dict,
unload_area_uuid_to_index_dict,
......@@ -73,7 +73,7 @@ def build_park_uuid_index_map():
logger.info("备停区路网读取")
logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return park_uuid_to_index_dict, park_index_to_uuid_dict
......@@ -95,7 +95,7 @@ def build_truck_uuid_name_map():
except Exception as es:
logger.warning(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return truck_uuid_to_name_dict, truck_name_to_uuid_dict
......@@ -116,7 +116,7 @@ def build_equipment_uuid_name_map():
except Exception as es:
logger.warning(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
try:
......@@ -130,7 +130,7 @@ def build_equipment_uuid_name_map():
except Exception as es:
logger.warning(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return excavator_uuid_to_name_dict, dump_uuid_to_name_dict
......@@ -186,7 +186,7 @@ def update_deveices_map(unload_area_uuid_to_index_dict, load_area_uuid_to_index_
logger.error("卸载区信息异常")
logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
logger.info("excavator_index_to_load_area_index_dict")
logger.info(excavator_index_to_load_area_index_dict)
......@@ -254,7 +254,7 @@ def update_total_truck():
logger.info("矿卡读取")
logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return truck_list
......@@ -275,7 +275,7 @@ def update_dynamic_truck():
logger.error(es)
logger.error("动态调度矿卡读取异常")
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return set(dynamic_truck_list)
......@@ -303,7 +303,7 @@ def update_fixdisp_truck():
)
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
for item in query:
fixed_truck_list.append(item.id)
......@@ -314,7 +314,7 @@ def update_fixdisp_truck():
logger.info("派车计划读取")
logger.error(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return set(fixed_truck_list)
......@@ -331,7 +331,7 @@ def update_autodisp_excavator():
except Exception as es:
logger.warning(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return set(dynamic_excavator_list)
......@@ -349,7 +349,7 @@ def update_autodisp_dump():
except Exception as es:
logger.warning(es)
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return set(dynamic_dump_list)
......@@ -361,7 +361,7 @@ def update_load_area():
load_area_list.append(walk_time.load_area_id)
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return load_area_list
......@@ -373,7 +373,7 @@ def update_unload_area():
unload_area_list.append(walk_time.unload_area_id)
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return unload_area_list
......@@ -384,7 +384,7 @@ def update_park_area():
park_area_list.append(walk_time_park.park_area_id)
except Exception as es:
session_postgre.rollback()
session_postgre.rollback()
session_mysql.rollback()
return park_area_list
# def build_work_area_uuid_index_map():
......
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