修复 redis 写入异常

alg/algorithm.py

@@ -8,6 +8,7 @@
 
 from para_config import *
 from equipment import ExcavatorInfo, DumpInfo, TruckInfo
+from data.dispatchInfo import DispatchInfo
 # from core.group import Group
 from core.schedule import PreSchedule
 
@@ -296,8 +297,11 @@ class ExpectedTime(AlgorithmBase):
                 # 车辆所在卸点
                 dump_id = DeviceMap.dump_index_to_uuid_dict[int(trip[1])]
 
+                # 卸载区域id
+                unload_area_id = DispatchInfo.dump_unload_area_dict[dump_id]
+
                 # 卸点对应分组编号
-                unload_area_group_index = self.group.unload_area_uuid_index_dict[dump_id]
+                unload_area_group_index = self.group.unload_area_uuid_index_dict[unload_area_id]
 
                 # 车辆驶往各目的地时间
                 truck_reach_time = 60 * self.group.to_excavator_distance[unload_area_group_index, :] \

core/dispatcher.py

@@ -135,7 +135,7 @@ class DispatchSubmission:
 
                     record["dispatchId"] = item.id
                     record["exactorId"] = item.exactor_id
-                    record["dumpId"] = dispatch_seq[1]
+                    record["dumpId"] = DispatchInfo.unload_area_dump_dict[dispatch_seq[1]]
                     record["loadAreaId"] = item.load_area_id
                     record["unloadAreaId"] = item.unload_area_id
                     record["groupId"] = group_id

data/dispatchInfo.py

@@ -53,6 +53,10 @@ class DispatchInfo:
     # truck -> match(excavator_id, unload_area_id)
     truck_match_dict = {}
 
+    # unload_area <-> dump id
+    dump_unload_area_dict = {}
+    unload_area_dump_dict = {}
+
     @classmethod
     def reset(cls):
         """
@@ -84,6 +88,9 @@ class DispatchInfo:
 
         cls.truck_match_dict = {}
 
+        cls.dump_unload_area_dict = {}
+        cls.unload_area_dump_dict = {}
+
         # cls.group_unload_area_dict = {}   # cls.group_unload_area_dict.keys() 相当于所有的team_id
         # cls.unload_area_group_dict = {}  # cls.unload_area_group_dict.keys() 相当于所有的卸载区 unload_area_id
         # cls.group_excavator_dict = {}
@@ -115,6 +122,17 @@ class DispatchInfo:
             logger.error("挖机和装载区映射更新异常")
             logger.error(es)
 
+        # update dump_id <-> unload_area_id
+        try:
+            for item in session_mysql.query(DispatchSetting).all():
+
+                cls.unload_area_dump_dict[item.unload_area_id] = item.dump_id
+                cls.dump_unload_area_dict[item.dump_id] = item.unload_area_id
+            # aa = cls.load_excavator_dict
+        except Exception as es:
+            logger.error("卸载设备和卸载区映射更新异常")
+            logger.error(es)
+
         # update excavator_id <-> group_id && unload_area_id <-> group_id && truck_id <-> group_id
         try:
             for item in session_mysql.query(DispatchSetting).all():