调整车辆速度，删除穿越装载区配置

alg/algorithm.py

@@ -195,7 +195,7 @@ class ExpectedTime(AlgorithmBase):
 
                 # 车辆驶往各目的地时间
                 truck_reach_time_ls = 60 * self.group.park_to_excavator_distance[0, :] / 1000 / \
-                                      self.truck.empty_speed[truck_id] + truck_avl_time
+                                      empty_speed + truck_avl_time
 
                 # 计算车辆得到服务时间
                 truck_service_time = np.maximum(truck_reach_time_ls, group_excavator_avl_time_ls)
@@ -326,7 +326,7 @@ class ExpectedTime(AlgorithmBase):
 
                 # 车辆驶往各目的地时间
                 truck_reach_time_ls = 60 * self.group.to_excavator_distance[unload_area_group_index, :] \
-                                      / 1000 / self.truck.empty_speed[truck_id] + truck_avl_time
+                                      / 1000 / empty_speed + truck_avl_time
 
                 # 计算车辆得到服务时间
                 truck_service_time = np.maximum(truck_reach_time_ls, group_excavator_avl_time_ls)

config.json

 {
     "para": {
         "log_path": "/usr/local/fleet-log/dispatch",
-        "empty_speed": 17,
-        "heavy_speed": 17,
+        "empty_speed": 25,
+        "heavy_speed": 25,
         "dump_target_mass": 5000,
         "excavator_target_mass": 5000
     },
     "mysql": {
-        "host": "172.16.0.51",
+        "host": "172.16.0.103",
         "port": "3306",
         "user": "root",
         "password": "Huituo@123",
         "database": "ht_zhunneng"
     },
     "postgresql": {
-        "host": "172.16.0.51",
+        "host": "172.16.0.103",
         "port": "5432",
         "user": "postgres",
         "password": "Huituo@123",
         "database": "gis_zhunneng"
     },
     "redis": {
-        "host": "172.16.0.51",
+        "host": "172.16.0.103",
         "password": "Huituo@123"
-    },
-    "gothrough": {
-        "closer_area_name": "哈1010平盘",
-        "further_area_name": "哈1026平盘"
     }
 }
\ No newline at end of file

core/group.py

@@ -581,7 +581,7 @@ class GroupDispatcher:
                         # self.redispatch_to_dump(truck_id, truck_dispatch, truck_locate, truck_trip)
                         try:
                             truck_info.redispatch =\
-                                self.redispatcher.redispatch_to_dump(truck_id, truck_dispatch, truck_locate, truck_trip)
+                                self.redispatcher.redispatch_to_dump(truck_id, truck_dispatch, truck_locate, truck_trip, truck_info)
                         except Exception as es:
                             self.logger.error("二次调度至卸载点失败")
                             self.logger.error(es)
@@ -761,7 +761,7 @@ class GroupDispatcher:
         truck_name = truck_uuid_to_name_dict[truck_id]
 
         # 获取车辆当前派车计划
-        if truck_task in [0, 1, 5]:
+        if truck_task in [0, 1, 2]:
 
             excavator_index = int(truck_trip[1])
             dump_index = int(truck_trip[0])