改善group类结构

core/dispatcher.py

@@ -55,7 +55,7 @@ class Dispatcher:
         :return: None
         """
         self.group_list = {}
-        groups = DispatchInfo.get_all_group()
+        groups = DispatchInfo.get_all_groups_id()
         for group_id in groups:
             if group_id not in self.group_list:
                 group = Group(group_id, self.truck, self.pre_sch, self.excavator, self.dump)

core/group.py

@@ -223,35 +223,13 @@ class Group:
         update group device map.
         :return:
         """
-        # excavator_index = 0
-
-        self.excavator_uuid_index_dict = {}
-        self.unload_area_uuid_index_dict = {}
-        self.truck_uuid_index_dict = {}
-        self.dump_uuid_index_dict = {}
-
-        for i in range(len(self.excavator)):
-            self.excavator_uuid_index_dict[list(self.excavator)[i]] = i
-
-        for i in range(len(self.unload_area)):
-            self.unload_area_uuid_index_dict[list(self.unload_area)[i]] = i
-
-        for i in range(len(self.dump)):
-            self.dump_uuid_index_dict[list(self.dump)[i]] = i
-
-        for i in range(len(self.truck_set)):
-            self.truck_uuid_index_dict[list(self.truck_set)[i]] = i
-
-        self.excavator_uuid_index_dict = bidict(DispatchInfo.excavator_uuid_to_index_dict[self.group_id])
-        self.unload_area_uuid_index_dict = bidict(DispatchInfo.unload_area_uuid_to_index_dict[self.group_id])
-        self.dump_uuid_index_dict = bidict(DispatchInfo.dump_uuid_to_index_dict[self.group_id])
+        # group_excavator_dict = {group_1: {excavator_1: load_area_1}, group_2: {excavator_2: load_area_2}}
 
-        # self.excavator_uuid_index_dict = bidict(self.excavator_uuid_index_dict)
-        # self.unload_area_uuid_index_dict = bidict(self.unload_area_uuid_index_dict)
-        # self.truck_uuid_index_dict = bidict(self.truck_uuid_index_dict)
-        self.dump_uuid_index_dict = bidict(self.dump_uuid_index_dict)
+        # update devices(excavators, unload_areas, dumps) bidirectional map within a group
+        self.excavator_uuid_index_dict = DispatchInfo.get_group_excavator_dict(self.group_id)
+        self.unload_area_uuid_index_dict = DispatchInfo.get_group_unload_area_dict(self.group_id)
+        self.dump_uuid_index_dict = DispatchInfo.get_group_dump_dict(self.group_id)
 
-        # group_excavator_dict = {group_1: {excavator_1: load_area_1}, group_2: {excavator_2: load_area_2}}
 
     def update_device_material(self):
         """