Merge remote-tracking branch 'origin/zhunneng' into zhunneng

8ac576ea · Allvey · 3cf7fbbf · 211c1252 · 8ac576ea · 8ac576ea
Commit 8ac576ea authored Aug 28, 2023 by Allvey
Show whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

.DS_Store .DS_Store +0 -0

config.json config.json +2 -2

group.py core/group.py +3 -1

调度系统部署说明4.2.docx 调度系统部署说明4.2.docx +0 -0

No files found.
--- a/.DS_Store
+++ b/.DS_Store
--- a/config.json
+++ b/config.json
 {
    "para": {
        "log_path": "/usr/local/fleet-log/dispatch",
-        "empty_speed": 25,
-        "heavy_speed": 25,
+        "empty_speed": 120,
+        "heavy_speed": 80,
        "dump_target_mass": 5000,
        "excavator_target_mass": 5000
    },

--- a/core/group.py
+++ b/core/group.py
@@ -559,7 +559,9 @@ class GroupDispatcher:

        # 获取车辆位置信息
        try:
-            truck_locate = self.group.truck.get_truck_lane_locate_dict()[truck_id]
+            # truck_locate = self.group.truck.get_truck_lane_locate_dict()[truck_id]
+            truck_locate = self.group.truck.update_trucks_lane_locate()[truck_id]
+
        except Exception as es:
            self.logger.error(f'车辆位置信息丢失 {es}')
            truck_locate = None

--- a/调度系统部署说明4.2.docx
+++ b/调度系统部署说明4.2.docx