修复锁定恢复BUG

equipment/truck.py

@@ -459,8 +459,30 @@ class TruckInfo(WalkManage):
                 join(Equipment, EquipmentSpec.id == Equipment.equipment_spec). \
                 filter(Equipment.id == truck_id).first().max_speed
 
+    def reset(self):
+        # 矿卡挖机绑定关系
+        self.truck_excavator_bind = {}
+        # 矿卡卸点绑定关系
+        self.truck_dump_bind = {}
+        # 矿卡挖机排斥关系
+        self.truck_excavator_exclude = {}
+        # 矿卡卸点排斥关系
+        self.truck_dump_exclude = {}
+        # 排斥关系modify
+        self.excavator_exclude_modify = np.full((dynamic_truck_num, dynamic_excavator_num), 0)
+        # 矿卡优先级
+        self.truck_priority = np.ones(self.dynamic_truck_num)
+        # 矿卡绑定物料
+        self.truck_material_bind = {}
+        # 矿卡绑定物料modify
+        self.dump_material_bind_modify = np.full((self.dynamic_truck_num, dynamic_excavator_num), 0)
+        self.excavator_material_bind_modify =np.zeros(self.dynamic_truck_num)
+
     def para_period_update(self):
 
+        # 初始化参数
+        self.reset()
+
         # 设备优先级启用
         rule6 = session_mysql.query(DispatchRule).filter_by(id=6).first().disabled
 

realtime_dispatch.py

@@ -214,10 +214,6 @@ class Dispatcher(WalkManage):
     # 更新实际交通流
     def update_actual_traffic_flow(self):
 
-        loading_time = self.excavator.get_loading_time()
-
-        unloading_time = self.dump.get_unloading_time()
-
         loading_task_time = self.excavator.get_loading_task_time()
 
         unloading_task_time = self.dump.get_unloading_task_time()
@@ -229,24 +225,6 @@ class Dispatcher(WalkManage):
         dynamic_dump_num = self.dump.get_dump_num()
         dynamic_excavator_num = self.excavator.get_excavator_num()
 
-        # for item in session_mysql.query(EquipmentPair).filter(EquipmentPair.createtime >= self.start_time).all():
-        #     dump_index = self.dump_uuid_to_index_dict[item.dump_id]
-        #     excavator_index = self.excavator_uuid_to_index_dict[item.exactor_id]
-        #     task = truck_current_task[item.truck_id]
-        #     if task in heavy_task_set:
-        #         self.goto_dump_truck_num[dump_index][excavator_index] = \
-        #             self.goto_dump_truck_num[dump_index][excavator_index] + 1
-        #         self.actual_goto_dump_traffic_flow[dump_index][excavator_index] = \
-        #             self.actual_goto_dump_traffic_flow[dump_index][excavator_index] + float(
-        #                 payload[self.truck_uuid_to_index_dict[item.truck_id]])
-        #     if task in empty_task_set or task == -2:
-        #         self.goto_excavator_truck_num[dump_index][excavator_index] = \
-        #             self.goto_excavator_truck_num[dump_index][excavator_index] + 1
-        #         print(item.truck_id)
-        #         self.actual_goto_excavator_traffic_flow[dump_index][excavator_index] = \
-        #             self.actual_goto_excavator_traffic_flow[dump_index][excavator_index] + float(
-        #                 payload[self.truck_uuid_to_index_dict[item.truck_id]])
-
         self.goto_dump_truck_num = np.zeros((dynamic_excavator_num, dynamic_dump_num))
         self.actual_goto_dump_traffic_flow = np.zeros(
             (dynamic_excavator_num, dynamic_dump_num)