redis 写入作业区域 featureId

core/group.py

@@ -41,8 +41,14 @@ def direct2redis():
             if item is None:
                 raise CoreException(101, "无可用派车计划")
             if item.truck_id not in truck_disp:
+                map_version = session_postgre.query(Distribute_Library).filter_by(Status="1").first().Version
+
+                load_area_feature_id = session_mysql.query(DiggingWorkArea).filter_by(Id=item.load_area_id,
+                                                                                      MapVersion=map_version).first().FeatureId
+                unload_area_feature_id = session_mysql.query(DumpArea).filter_by(Id=item.unload_area_id,
+                                                                                 MapVersion=map_version).first().FeatureId
                 record = {"truckId": item.truck_id, "dispatchId": item.id, "exactorId": item.exactor_id,
-                          "dumpId": item.dump_id, "loadAreaId": item.load_area_id, "unloadAreaId": item.unload_area_id,
+                          "dumpId": item.dump_id, "loadAreaId": load_area_feature_id, "unloadAreaId": unload_area_feature_id,
                           "groupId": item.group_id, "isdeleted": False, "isTemp": False, "haulFlag": -1,
                           "groupName": DispatchInfo.group_name[item.group_id]}
 
@@ -89,8 +95,14 @@ def truck_direct2redis(truck_id):
     item = session_mysql.query(DispatchSetting).filter_by(truck_id=truck_id, isdeleted=0, ).first()
     if item is None:
         raise CoreException(101, "无可用派车计划")
+    map_version = session_postgre.query(Distribute_Library).filter_by(Status="1").first().Version
+
+    load_area_feature_id = session_mysql.query(DiggingWorkArea).filter_by(Id=item.load_area_id,
+                                                                          MapVersion=map_version).first().FeatureId
+    unload_area_feature_id = session_mysql.query(DumpArea).filter_by(Id=item.unload_area_id,
+                                                                     MapVersion=map_version).first().FeatureId
     record = {"truckId": item.truck_id, "dispatchId": item.id, "exactorId": item.exactor_id,
-              "dumpId": item.dump_id, "loadAreaId": item.load_area_id, "unloadAreaId": item.unload_area_id,
+              "dumpId": item.dump_id, "loadAreaId": load_area_feature_id, "unloadAreaId": unload_area_feature_id,
               "groupId": item.group_id, "isdeleted": False, "isTemp": False, "haulFlag": -1,
               "groupName": DispatchInfo.group_name[item.group_id]}
     logger.info(f'写入redis调度结果: {record}')

core/submit.py

@@ -16,7 +16,7 @@ from data.para_config import get_value
 from equipment import DumpInfo, ExcavatorInfo, TruckInfo
 from graph.topo_graph import Topo
 from settings import get_logger, redis5
-from tables import session_mysql, DispatchSetting
+from tables import session_mysql, session_postgre, DispatchSetting, DiggingWorkArea, DumpArea, Distribute_Library
 from core.group import truck_direct2redis
 
 
@@ -245,7 +245,13 @@ class DispatchSubmission:
 
 
 def redis_format(truck_id, group_id, dispatch_id, item):
+    map_version = session_postgre.query(Distribute_Library).filter_by(Status="1").first().Version
+
+    load_area_feature_id = session_mysql.query(DiggingWorkArea).filter_by(Id=item.load_area_id,
+                                                                          MapVersion=map_version).first().FeatureId
+    unload_area_feature_id = session_mysql.query(DumpArea).filter_by(Id=item.unload_area_id,
+                                                                     MapVersion=map_version).first().FeatureId
     record = {"truckId": truck_id, "dispatchId": dispatch_id, "exactorId": item.exactor_id, "dumpId": item.dump_id,
-              "loadAreaId": item.load_area_id, "unloadAreaId": item.unload_area_id, "groupId": item.group_id,
+              "loadAreaId": load_area_feature_id, "unloadAreaId": unload_area_feature_id, "groupId": item.group_id,
               "isdeleted": False, "isTemp": False, "haulFlag": -1, "groupName": DispatchInfo.group_name[group_id]}
     return record

gothrough/gothrough_digging.py

@@ -432,12 +432,18 @@ def truck_dispatch_to_redis(truck_id, group_id, excavator_id):
 
     # 其余调度信息写入
     try:
+        map_version = session_postgre.query(Distribute_Library).filter_by(Status="1").first().Version
+
+        load_area_feature_id = session_mysql.query(DiggingWorkArea).filter_by(Id=item.load_area_id,
+                                                                              MapVersion=map_version).first().FeatureId
+        unload_area_feature_id = session_mysql.query(DumpArea).filter_by(Id=item.unload_area_id,
+                                                                         MapVersion=map_version).first().FeatureId
         # record["dispatchId"] = item.id
         record["dispatchId"] = str(uuid.uuid1())
         record["exactorId"] = item.exactor_id
-        record["loadAreaId"] = item.load_area_id
+        record["loadAreaId"] = load_area_feature_id
         record["dumpId"] = item.dump_id
-        record["unloadAreaId"] = item.unload_area_id
+        record["unloadAreaId"] = unload_area_feature_id
         record["groupId"] = group_id
         record["isdeleted"] = False
         record["isTemp"] = False

realtime_dispatch_test.py

@@ -36,12 +36,19 @@ def direct2redis():
     truck_disp = {}
     for item in session_mysql.query(DispatchSetting).all():
         if item.truck_id not in truck_disp:
+            map_version = session_postgre.query(Distribute_Library).filter_by(Status="1").first().Version
+
+            load_area_feature_id = session_mysql.query(DiggingWorkArea).filter_by(Id=item.load_area_id,
+                                                                                  MapVersion=map_version).first().FeatureId
+            unload_area_feature_id = session_mysql.query(DumpArea).filter_by(Id=item.unload_area_id,
+                                                                             MapVersion=map_version).first().FeatureId
+
             record = {"truckId": item.truck_id}
             record["id"] = item.id
             record["exactorId"] = item.exactor_id
             record["dumpId"] = item.dump_id
-            record["loadAreaId"] = item.load_area_id
-            record["unloadAreaId"] = item.unload_area_id
+            record["loadAreaId"] = load_area_feature_id
+            record["unloadAreaId"] = unload_area_feature_id
             record["groupId"] = item.group_id
             record["isdeleted"] = False
             record["isTemp"] = False