优化

core/group.py

@@ -1128,7 +1128,7 @@ class GoThroughDispatcher:
             closer_area_backtrack_node_id = self.closer_entrance_node_id
             self.closer_area_backtrack_lanes = []
 
-            for i in range(3):
+            for i in range(4):
                 # 查询回溯路段对象
                 item = session_postgre.query(Lane).filter_by(EndNodeId=closer_area_backtrack_node_id).first()
                 logger.info(f"查询到路段{str(item.Id)}")

util/area_analysis.py

@@ -76,13 +76,12 @@ def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set
         else:
             continue
 
-    logger.info("closer_excavator_state")
-    logger.info(closer_excavator_state)
-    logger.info(goto_closer_area_num)
+    logger.info(f"近端挖机状态{closer_excavator_state}")
+    logger.info(f"近端装载区外第一路段等待车辆数{goto_closer_area_num}")
+
+    logger.info(f"远端挖机状态{further_excavator_state}")
+    logger.info(f"已经前往远端的车辆数{goto_further_area_num}")
 
-    logger.info("further_excavator_state")
-    logger.info(further_excavator_state)
-    logger.info(goto_further_area_num)
 
     logger.info(before_cross_num)
 
@@ -119,22 +118,21 @@ def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set
             gothrough_config_area = load_value["gothrough"]
             dispatch_factor = float(gothrough_config_area["factor"])
 
-        # 近端挖机空闲
-        if closer_excavator_state == 0:
-            logger.info(f"穿越调度：近端挖机空闲, 调度车辆前往近端装载区，远端派车数量{goto_further_area_num},空载车总数{arrival_truck_num}")
-            target_excavator = DispatchInfo.load_excavator_dict[closer_area_id]
-            # truck_dispatch_to_redis(request_truck_id, group_id, DispatchInfo.load_excavator_dict[closer_area_id])
         # 远端挖机空闲
-        elif further_excavator_state == 0 and goto_further_area_num == 0:
+        if further_excavator_state == 0 and goto_further_area_num == 0:
             logger.info(
                 f"穿越调度：远端挖机空闲, 调度车辆前往远端装载区，远端派车数量{goto_further_area_num},空载车总数{arrival_truck_num}")
             target_excavator = DispatchInfo.load_excavator_dict[further_area_id]
-
-        # 近端挖机不空闲但是远端挖机已满载
-        elif closer_excavator_state != 0 and goto_further_area_num >= int(dispatch_factor*arrival_truck_num):
+        # 近端挖机空闲
+        elif closer_excavator_state == 0 and goto_closer_area_num == 0:
+            logger.info(f"穿越调度：近端挖机空闲, 调度车辆前往近端装载区，远端派车数量{goto_further_area_num},空载车总数{arrival_truck_num}")
+            target_excavator = DispatchInfo.load_excavator_dict[closer_area_id]
+            # truck_dispatch_to_redis(request_truck_id, group_id, DispatchInfo.load_excavator_dict[closer_area_id])
+        # 远端挖机已满载
+        elif goto_further_area_num >= int(dispatch_factor*arrival_truck_num):
             logger.info(f"穿越调度：远端挖机满载, 调度车辆前往近端装载区，远端派车数量{goto_further_area_num},空载车总数{arrival_truck_num}")
             target_excavator = DispatchInfo.load_excavator_dict[closer_area_id]
-        # 近端挖机满载，只能派往远端挖机
+        # 近端挖机已满载
         else:
             logger.info(f"穿越调度：近端挖机满载, 调度车辆前往远端装载区，远端派车数量{goto_further_area_num},空载车总数{arrival_truck_num}")
             target_excavator = DispatchInfo.load_excavator_dict[further_area_id]