定铲派车写入分离

core/dispatcher.py

@@ -16,6 +16,7 @@ from equipment import TruckInfo, ExcavatorInfo, DumpInfo
 from core.schedule import PreSchedule
 import json
 import uuid
+from tables import session_mysql, session_postgre
 import numpy as np
 from datetime import datetime, timedelta
 
@@ -115,10 +116,44 @@ class DispatchSubmission:
 
                 record = {"truckId": truck_id}
                 task = self.truck.get_truck_current_task()[truck_id]
+
             except Exception as es:
                 self.logger.error("调度结果写入异常-读取矿卡信息异常(uuid, group id, task)")
                 self.logger.error(es)
 
+            try:
+                group_mode = DispatchInfo.get_group_mode(group_id)
+
+            except Exception as es:
+                self.logger.error("调度模式读取异常")
+                self.logger.error(es)
+                group_mode = 3
+
+            if group_mode == 3:
+                try:
+                    item = session_mysql.query(DispatchSetting).filter_by(truck_id=truck_id, isdeleted=0, ).first()
+                    record["dispatchId"] = 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["groupId"] = item.group_id
+                    record["isdeleted"] = False
+                    record["isTemp"] = False
+                    record["haulFlag"] = -1
+                    record["groupName"] = DispatchInfo.group_name[group_id]
+
+                    self.logger.info("调度结果")
+                    self.logger.info(record)
+
+                except Exception as es:
+                    self.logger.error(es)
+                    session_postgre.rollback()
+                    session_mysql.rollback()
+                finally:
+                    redis5.set(truck_id, str(json.dumps(record)))
+            else:
+
                 if task in [0, 1, 2]:  # 卡车空载或在装载区出场前, 可变更卸载目的地
 
                     # 查询车辆相关派车计划