测试锁定排斥及问题修复

core/dispatcher.py

@@ -62,7 +62,8 @@ class Dispatcher:
             if group_id not in self.group_list:
                 group = Group(group_id, self.truck, self.pre_sch, self.excavator, self.dump, self.topo)
                 group.info_update()
-                self.group_list[group_id] = group
+                if len(group.group_trucks) != 0:
+                    self.group_list[group_id] = group
 
     def group_info_update(self):
         """

core/schedule.py

@@ -57,23 +57,27 @@ class PreSchedule:
             excavator_avl_ls: (list) 驶往挖机的各矿卡抵达时间
             dump_avl_ls: (list) 驶往卸点的各矿卡抵达时间
         """
-        try:
-            dynamic_excavator_num = self.excavator.get_excavator_num()
-            dumps = self.dump.get_dump_num()
-            trucks = self.truck.get_truck_num()
+        # try:
+        # dynamic_excavator_num = self.excavator.get_excavator_num()
+        dynamic_excavator_num = get_value("dynamic_excavator_num")
+        # dumps = self.dump.get_dump_num()
+        dumps = get_value("dynamic_dump_num")
+        # trucks = self.truck.get_truck_num()
+        trucks = get_value("dynamic_truck_num")
 
-            truck_current_task = self.truck.get_truck_current_task()
+        truck_current_task = self.truck.get_truck_current_task()
 
-            truck_current_trip = self.truck.get_truck_current_trip()
+        truck_current_trip = self.truck.get_truck_current_trip()
 
-            truck_reach_excavator = self.truck.get_truck_reach_excavator()
+        truck_reach_excavator = self.truck.get_truck_reach_excavator()
 
-            truck_reach_dump = self.truck.get_truck_reach_dump()
+        truck_reach_dump = self.truck.get_truck_reach_dump()
 
-            excavator_avl_ls = [[] for _ in range(dynamic_excavator_num)]
-            dump_avl_ls = [[] for _ in range(dumps)]
-            # self.logger.info("update_truck_reach_time-trucks")
-            # self.logger.info(trucks)
+        excavator_avl_ls = [[] for _ in range(dynamic_excavator_num)]
+        dump_avl_ls = [[] for _ in range(dumps)]
+        # self.logger.info("update_truck_reach_time-trucks")
+        # self.logger.info(trucks)
+        try:
             for i in range(trucks):
                 if truck_id is not None and i == self.truck.truck_uuid_to_index_dict[truck_id]:
                     continue
@@ -99,7 +103,7 @@ class PreSchedule:
         except Exception as es:
             self.logger.error("矿卡预计抵达时间计算异常")
             self.logger.error(es)
-            return [], []
+            return excavator_avl_ls, dump_avl_ls
 
         return excavator_avl_ls, dump_avl_ls
 

equipment/truck.py

@@ -653,7 +653,7 @@ class TruckInfo(WalkManage):
                             .filter_by(EQUIPMENT_ID=int(excavator_id), ONLY_ALLOWED=1)
                             .first()
                     )
-                    if item is not None:
+                    if item is not None and len(eval(item.bind_list)) > 0:
                         for truck_id in self.dynamic_truck_set:
                             if truck_uuid_to_name_dict[truck_id] not in item.BIND_LIST:
                                 if truck_id not in self.truck_excavator_exclude: