移除安全距离

core/group.py

@@ -605,7 +605,7 @@ class GroupDispatcher:
 
                 if excavator_prise_location[0] != -1 and \
                         truck_prise_location[0] != -1 and \
-                        haversine(excavator_prise_location, truck_prise_location) > 0.040 and \
+                        haversine(excavator_prise_location, truck_prise_location) > 0.010 and \
                         truck_locate in self.gothroghdispatcher.closer_area_backtrack_lanes:
                     self.gothroghdispatcher.redispatch_request(request_truck_id=truck_id, truck=self.group.truck, truck_dispatch=truck_dispatch)
 
@@ -1234,7 +1234,6 @@ class GoThroughDispatcher:
             self.logger.error(es)
             return
 
-
         '''
         3. 调度判断逻辑
         '''

equipment/excavator.py

@@ -83,7 +83,7 @@ class ExcavatorInfo(WalkManage):
             self.logger.info(self.loading_time)
             self.logger.info("excavator_uuid_to_index_dict")
             self.logger.info(self.excavator_uuid_to_index_dict)
-            self.loading_time[self.excavator_uuid_to_index_dict[excavator_id]] = 5.00
+            self.loading_time[self.excavator_uuid_to_index_dict[excavator_id]] = 30.00
 
     # 更新挖机设备出入时间
     def update_excavator_entrance_exit_time(self):

util/area_analysis.py

@@ -82,7 +82,15 @@ def area_choose(excavators_id, closer_area_id, further_area_id, further_lane_set
         else:
             continue
 
-    logger.info(f"近端挖机状态{closer_excavator_state}")
+    import datetime
+
+    # 获取当前时间
+    current_time = datetime.datetime.now()
+
+    # 打印当前时间
+
+
+    logger.info(f"近端挖机状态{closer_excavator_state} 当前时间{current_time}")
     logger.info(f"近端装载区外第一路段等待车辆数{goto_closer_area_num}")
 
     logger.info(f"远端挖机状态{further_excavator_state}")