test

123.txt

+123123123
\ No newline at end of file

integrated-scheduling @ ce9ea011

+Subproject commit ce9ea0115c095fcf55affdae3c20281d8a00aec4

settings.py

@@ -9,6 +9,10 @@
 
 # 数据库设备, redis设置, 日志设置
 
+<<<<<<< HEAD
+=======
+
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
 from tables import *
 from urllib.parse import quote
 import logging.handlers

static_data_process.py

@@ -51,7 +51,11 @@ def build_park_uuid_index_map():
     park_num = 0
 
     try:
+<<<<<<< HEAD
         for item in session_postgre.query(WalkTimePark).all():
+=======
+        for item in session_postgre.query(WalkTimePort).all():
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
             park = str(item.park_area_id)
             if park not in park_uuid_to_index_dict:
                 park_uuid_to_index_dict[park] = park_num
@@ -124,7 +128,11 @@ def update_deveices_map(unload_area_uuid_to_index_dict, load_area_uuid_to_index_
                     load_area_uuid_to_index_dict[load_area_id]
                 excavator_num = excavator_num + 1
         if excavator_num < 1 or dump_num < 1:
+<<<<<<< HEAD
             raise Exception("无动态派车计划可用-动态派车挖机/卸载设备映射失败")
+=======
+            raise Exception("无动态派车计划可用-动态派车挖机/卸点映射失败")
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
     except Exception as es:
         logger.warning(es)
 
@@ -191,7 +199,11 @@ def update_autodisp_excavator():
         for item in session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all():
             dynamic_excavator_list.append(item.exactor_id)
         if len(dynamic_excavator_list) < 1:
+<<<<<<< HEAD
             raise Exception("无动态派车计划可用-动态派车挖机/卸载设备集合读取异常")
+=======
+            raise Exception("无动态派车计划可用-动态派车挖机/卸点集合读取异常")
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
     except Exception as es:
         logger.warning(es)
 
@@ -205,7 +217,11 @@ def update_autodisp_dump():
         for item in session_mysql.query(Dispatch).filter_by(isdeleted=0, isauto=1).all():
             dynamic_dump_list.append(item.dump_id)
         if len(dynamic_dump_list) < 1:
+<<<<<<< HEAD
             raise Exception("无动态派车计划可用-动态派车挖机/卸载设备集合读取异常")
+=======
+            raise Exception("无动态派车计划可用-动态派车挖机/卸点集合读取异常")
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
     except Exception as es:
         logger.warning(es)
     return dynamic_dump_list
@@ -222,6 +238,7 @@ def update_unload_area():
     unload_area_list = []
     for walk_time in session_postgre.query(WalkTime).all():
         unload_area_list.append(walk_time.unload_area_id)
+<<<<<<< HEAD
     return unload_area_list
 
 def update_park_area():
@@ -229,3 +246,6 @@ def update_park_area():
     for walk_time_park in session_postgre.query(WalkTimePark).all():
         park_area_list.append(walk_time_park.park_area_id)
     return park_area_list
+=======
+    return unload_area_list
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81

tables.py

@@ -119,19 +119,28 @@ class WalkTime(Base):
     unload_area_name = Column(VARCHAR(30))
     to_unload_distance = Column(Float(10))
     to_load_distance = Column(Float(10))
+<<<<<<< HEAD
     to_unload_lanes = Column(VARCHAR(100))
     to_load_lanes = Column(VARCHAR(100))
 
     def __init__(self, load_area_id, unload_area_id, load_area_name, unload_area_name, to_load_distance,
                  to_unload_distance, to_unload_lanes, to_load_lanes):
+=======
+
+    def __init__(self, load_area_id, unload_area_id, load_area_name, unload_area_name, to_load_distance,
+                 to_unload_distance):
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
         self.load_area_id = load_area_id
         self.unload_area_id = unload_area_id
         self.load_area_name = load_area_name
         self.unload_area_name = unload_area_name
         self.to_load_distance = to_load_distance
         self.to_unload_distance = to_unload_distance
+<<<<<<< HEAD
         self.to_unload_lanes = to_unload_lanes
         self.to_load_lanes = to_load_lanes
+=======
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
 
     # Rid = Column(VARCHAR(36), primary_key=True)
     # load_area_id = Column(VARCHAR(36))
@@ -213,6 +222,7 @@ class EquipmentPair(Base):
         self.isdeleted = isdeleted
         self.createtime = createtime
 
+<<<<<<< HEAD
 # class Lane(Base):
 #     # 表的名字
 #     __tablename__ = 'Geo_Node'
@@ -235,6 +245,8 @@ class Lane(Base):
         self.Length = Length
         self.MaxSpeed = MaxSpeed
 
+=======
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
 class Dispatch(Base):
     # 表的名字:
     __tablename__ = 'sys_dispatch_setting'
@@ -275,7 +287,11 @@ class Dispatch(Base):
         self.deletor = deletor
         self.deletetime = deletetime
 
+<<<<<<< HEAD
 class WalkTimePark(Base):
+=======
+class WalkTimePort(Base):
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
     __tablename__ = 'park_load_distance'
 
     park_area_id = Column(VARCHAR(36), primary_key=True)
@@ -283,15 +299,23 @@ class WalkTimePark(Base):
     park_area_name = Column(VARCHAR(36))
     load_area_name = Column(VARCHAR(36))
     park_load_distance = Column(Float(10))
+<<<<<<< HEAD
     park_load_lanes = Column(VARCHAR(100))
 
     def __init__(self, park_area_id, load_area_id, park_area_name, load_area_name, park_load_distance, park_load_lanes):
+=======
+
+    def __init__(self, park_area_id, load_area_id, park_area_name, load_area_name, park_load_distance):
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
         self.park_area_id = park_area_id
         self.load_area_id = load_area_id
         self.park_area_name = park_area_name
         self.load_area_name = load_area_name
         self.park_load_distance = park_load_distance
+<<<<<<< HEAD
         self.park_load_lanes = park_load_lanes
+=======
+>>>>>>> acc639d456bb6cab81fb693f04b04a95a6f30b81
 
 class Equipment(Base):
     __tablename__ = 'sys_equipment'