穿越装载区优化

core/group.py

@@ -625,6 +625,7 @@ class GroupDispatcher:
 
             # 穿越调度和二次调度均不触发，正常空载调度
             if not planned or truck_task != 0:
+                self.logger.info("穿越调度和二次调度均不触发，调度前往卸载区执行固定派车")
                 try:
                     truck_dispatch[truck_id] = DispatchInfo.get_truck_match(truck_id)
                 except Exception as es:
@@ -743,8 +744,7 @@ class GroupDispatcher:
                             planned = False
 
             # 穿越调度和二次调度均不触发，正常空载调度
-            if not planned or truck_task != 0:
-
+            if not planned:
                 self.logger.info("正常空载行驶，执行空载周期调度")
                 self.empty_period_dispatch(s, truck_dispatch, truck_id, truck_info, truck_trip)
 
@@ -983,15 +983,25 @@ class ReDispatcher:
         self.logger.info(load_area_dict)
         # 获取拥堵路段
         congestion_lane_dict = self.get_congestion_lanes()
+        self.logger.info("拥堵路段")
+        self.logger.info(congestion_lane_dict)
         # 获取当前交叉口下一路段集合
         next_lane_list = get_cross_next_lanes(truck_locate)
+        self.logger.info("当前交叉口下一路段集合")
+        self.logger.info(next_lane_list)
         # 交叉口下一路段可达的装载区
         next_lane_load_area_dict = get_lane_reach_load_areas(load_area_lane_dict, next_lane_list)
+        self.logger.info("交叉口下一路段可达的装载区")
+        self.logger.info(next_lane_load_area_dict)
         # 排除下一个路段阻塞的装载区
         delete_congestion_load_area(congestion_lane_dict, load_area_dict,
                                     next_lane_load_area_dict)
+        self.logger.info("排除下一个路段阻塞的装载区")
+        self.logger.info(load_area_dict)
         # 获取车辆经纬度信息
         truck_prise_location = self.group.truck.truck_current_prise_location[truck_id]
+        self.logger.info("获取车辆经纬度信息")
+        self.logger.info(truck_prise_location)
 
         if is_close_to_cross(truck_locate, truck_prise_location):
             self.logger.info(f'距离过近无法触发二次调度')
@@ -1455,7 +1465,9 @@ class GoThroughDispatcher:
             #     self.logger.error("pair表查询异常")
             #     self.logger.error(es)
 
-            current_unload_area_id = truck_info.get_combined_unload_area()
+            # current_unload_area_id = truck_info.get_combined_unload_area()
+
+            next_unload_area_id = DispatchInfo.get_truck_match(request_truck_id)[1]
 
             if (target_excavator is not None) and (current_truck_goto_excavator_id != target_excavator):
                 self.logger.info(f'近端lanes {request_truck_name} 派车计划前往 {target_excavator}')
@@ -1469,7 +1481,7 @@ class GoThroughDispatcher:
                 self.logger.info("派车计划未变动")
 
             # 将派车计划加入 dispatch_plan
-            truck_dispatch[request_truck_id] = [target_excavator, current_unload_area_id]
+            truck_dispatch[request_truck_id] = [target_excavator, next_unload_area_id]
 
             self.logger.info(f'新派车计划')
             self.logger.info(truck_dispatch[request_truck_id])