info层修改3

data/dispatchInfo.py

@@ -184,7 +184,6 @@ class DispatchInfo:
             logger.error("group_id->mode_code更新异常")
             logger.error(es)
 
-
         # 新增：team_id-->>group_code;group_code-->>mode_code.结果：team_id-->>mode_code
         # team_group_dict = {}  # team_id-->>group_code的一个映射，格式：{team_id:group_code}
         # group_mode_dict = {}  # group-->>mode_code的一个映射，格式：{group_code:mode_code}
@@ -236,21 +235,20 @@ class DispatchInfo:
 
                 # unload->load 路网
                 unload_load_distance = np.zeros((len(unload_areas), len(load_areas)))
-                for i in unload_areas:
-                    for j in load_areas:
-
-                        distance = int(session_postgre.query(WalkTime).filter_by(unload_area_id=i, load_area_id=j).first().to_load_distance)
+                for i in range(len(unload_areas)):
+                    for j in range(len(load_areas)):
+                        distance = int(session_postgre.query(WalkTime).filter_by(unload_area_id=unload_areas[i], load_area_id=load_areas[j]).first().to_load_distance)
                         unload_load_distance[i][j] = distance
-
                 cls.load_distance[item] = unload_load_distance
 
                 # load->unload 路网
                 load_unload_distance = np.zeros((len(load_areas), len(unload_areas)))
-                for i in load_areas:
-                    for j in unload_areas:
-                        distance = session_postgre.query(WalkTime).filter_by(load_area_id=i, unload_area_id=j).first().to_unload_distance
+                for i in range(len(load_areas)):
+                    for j in range(len(unload_areas)):
+                        distance = int(session_postgre.query(WalkTime).filter_by(load_area_id=load_areas[i], unload_area_id=unload_areas[j]).first().to_unload_distance)
                         load_unload_distance[i][j] = distance
                 cls.unload_distance[item] = load_unload_distance
+
         except Exception as es:
             logger.error("路网距离更新异常")
             logger.error(es)
@@ -318,6 +316,10 @@ class DispatchInfo:
         return cls.group_truck_dict[group_id]
 
     @classmethod
+    def get_load_area(cls, excavator_id):
+        return cls.excavator_load_dict[excavator_id]
+
+    @classmethod
     def get_to_excavator_distance(cls, group_id):
         return cls.load_distance[group_id]
 
@@ -325,9 +327,6 @@ class DispatchInfo:
     def get_to_dump_distance(cls, group_id):
         return cls.unload_distance[group_id]
 
-    @classmethod
-    def get_load_area(cls, excavator_id):
-        return cls.excavator_load_dict[excavator_id]
 
     @classmethod
     def get_park_to_excavator_distance(cls, group_id):

realtime_dispatch.py

@@ -25,7 +25,6 @@ def process(dispatcher):
     :param dispatcher:  (Dispatch Class) 矿卡调度类对象
     :return: None
     """
-
     # try:
     # 更新周期参数
     logger.info("#####################################周期更新开始#####################################")

tables.py

@@ -257,7 +257,7 @@ class EquipmentPair(Base):
 
     id = Column(VARCHAR(36), primary_key=True)
     truck_id = Column(VARCHAR(36))
-    excavator_id = Column(VARCHAR(36))
+    exactor_id = Column(VARCHAR(36))
     dump_id = Column(VARCHAR(36))
     load_area_id = Column(VARCHAR(36))
     unload_area_id = Column(VARCHAR(36))
@@ -265,11 +265,11 @@ class EquipmentPair(Base):
     isdeleted = Column(BOOLEAN)
     createtime = Column(DateTime)
 
-    def __init__(self, id, truck_id, excavator_id, dump_id, load_area_id, unload_area_id, dispatch_id, isdeleted,
+    def __init__(self, id, truck_id, exactor_id, dump_id, load_area_id, unload_area_id, dispatch_id, isdeleted,
                  createtime):
         self.id = id
         self.truck_id = truck_id
-        self.excavator_id = excavator_id
+        self.exactor_id = exactor_id
         self.dump_id = dump_id
         self.load_area_id = load_area_id
         self.unload_area_id = unload_area_id
@@ -307,7 +307,7 @@ class Dispatch(Base):
 
     id = Column(VARCHAR(36), primary_key=True)
     load_area_id = Column(VARCHAR(36))
-    excavator_id = Column(VARCHAR(36))
+    exactor_id = Column(VARCHAR(36))
     unload_area_id = Column(VARCHAR(36))
     dump_id = Column(VARCHAR(36))
     isauto = Column(BOOLEAN)
@@ -323,12 +323,12 @@ class Dispatch(Base):
     deletor = Column(VARCHAR(36))
     deletetime = Column(DateTime)
 
-    def __init__(self, id, load_area_id, excavator_id, unload_area_id, dump_id, isauto, truck_id, group_id, remark,
+    def __init__(self, id, load_area_id, exactor_id, unload_area_id, dump_id, isauto, truck_id, group_id, remark,
                  proportion_id,
                  isdeleted, creator, createtime, updator, updatetime, deletor, deletetime):
         self.id = id
         self.load_area_id = load_area_id
-        self.excavator_id = excavator_id
+        self.exactor_id = exactor_id
         self.unload_area_id = unload_area_id
         self.dump_id = dump_id
         self.isauto = isauto
@@ -561,7 +561,6 @@ class DispatchMatch(Base):
     match_code = Column(VARCHAR(36))
     team_id = Column(VARCHAR(36))
     load_area_id = Column(VARCHAR(36))
-    # excavator_id = Column(VARCHAR(36))
     dump_id = Column(VARCHAR(36))
     exactor_id = Column(VARCHAR(36))
     unload_area_id = Column(VARCHAR(36))

test.py

@@ -12,7 +12,7 @@ if __name__ == '__main__':
     #
     # dynamic_dump_set = set(update_autodisp_dump())
     # dynamic_dump_num = len(dynamic_dump_set)
-
+    #
     # dynamic_excavator_list = []
     # for item in (
     #         session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all()
@@ -34,18 +34,18 @@ if __name__ == '__main__':
     a_excavator = DispatchInfo.get_excavator_dict('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
     a_dump = DispatchInfo.get_dump_dict('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
     a_truck = DispatchInfo.get_truck_set('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
-    bb = DispatchInfo.excavator_load_dict
-    cc = DispatchInfo.load_excavator_dict
+    bb = DispatchInfo.get_to_excavator_distance('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
+    cc = DispatchInfo.get_to_dump_distance('9bb14655-4fd5-49da-a31a-13f6ced88d6c')
 
     # print(bb)
     # print(cc)
-
-    hh = DispatchInfo.group_excavator_dict
-    print(hh)
+    #
+    # hh = DispatchInfo.group_excavator_dict
+    # print(hh)
     # print(a)
     # print(a_excavator)
     # print(a_dump)
-    # print(a_truck)
+    print(a_truck)
     # for i in a_excavator:
     #     load = DispatchInfo.get_load_area(i)
     #     print(load)