代码优化

data/dispatchInfo.py

@@ -323,7 +323,7 @@ class DispatchInfo:
         cls.load_area_uuid_to_index_dict = {}
         cls.unload_area_uuid_to_index_dict = {}
 
-        # try:
+        try:
             groups = cls.group_excavator_dict.keys()
             for item in groups:
                 try:
@@ -388,6 +388,12 @@ class DispatchInfo:
                             if unload_area_id not in group_unload_area_uuid_to_index:
                                 group_unload_area_uuid_to_index[unload_area_id] = group_unload_area_count
 
+                            group_dump_count += 1
+                            group_unload_area_count += 1
+
+                        group_excavator_count += 1
+                        group_load_area_count += 1
+
                     group_excavator_uuid_to_index = bidict(group_excavator_uuid_to_index)
                     group_dump_uuid_to_index = bidict(group_dump_uuid_to_index)
                     group_load_area_uuid_to_index = bidict(group_load_area_uuid_to_index)
@@ -398,12 +404,6 @@ class DispatchInfo:
                     cls.load_area_uuid_to_index_dict[item] = group_load_area_uuid_to_index
                     cls.unload_area_uuid_to_index_dict[item] = group_unload_area_uuid_to_index
 
-                        group_dump_count += 1
-                        group_unload_area_count += 1
-
-                    group_excavator_count += 1
-                    group_load_area_count += 1
-
                     cls.load_distance[item] = unload_load_distance
 
                 except Exception as es:
@@ -430,9 +430,9 @@ class DispatchInfo:
                     session_postgre.rollback()
                     session_mysql.rollback()
 
-        # except Exception as es:
-        #     logger.error("路网距离更新异常-调度部分和路网部分不一致")
-        #     logger.error(es)
+        except Exception as es:
+            logger.error("路网距离更新异常-调度部分和路网部分不一致")
+            logger.error(es)
 
     # @classmethod
     # def update_device_dict(cls):