From 5414736b9689da31db31f315808d312743b1a31f Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 17 十月 2024 14:41:26 +0800
Subject: [PATCH] #

---
 zy-acs-flow/src/map/insight/agv/AgvMain.jsx                                              |    4 +++-
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java   |   14 +-------------
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java |    5 +++++
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java    |   20 ++++++++++++++++++--
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java  |    4 ++--
 5 files changed, 29 insertions(+), 18 deletions(-)

diff --git a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
index b6686e3..74c94de 100644
--- a/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
+++ b/zy-acs-flow/src/map/insight/agv/AgvMain.jsx
@@ -91,6 +91,8 @@
 
     useEffect(() => {
         if (info) {
+            console.log(info);
+
             endThree();
             setLoading(true);
             setTimeout(() => {
@@ -100,7 +102,7 @@
                 };
                 renderThree(info, curAgvNo);
                 setLoading(false);
-            }, 300);
+            }, 200);
         }
         return endThree;
     }, [info]);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
index 5c27759..1f22fac 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -54,24 +54,12 @@
             vo.setAgvNo(agv.getUuid());
             vo.setCode(code.getData());
             vo.setDirection(agvDetail.getAgvAngle());
-            vo.setBackpack(GsonUtils.fromJson(agvDetail.getBackpack(), List.class));
+            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
             vo.setBattery(agvDetail.getSoc());
             agvVos.add(vo);
         }
 
         return agvVos;
-    }
-
-    public static void main(String[] args) {
-        List<BackpackDto> backpackDtoList = new ArrayList<>();
-        backpackDtoList.add(new BackpackDto(1, true));
-        backpackDtoList.add(new BackpackDto(2, true));
-        backpackDtoList.add(new BackpackDto(3, false));
-        backpackDtoList.add(new BackpackDto(4, false));
-        backpackDtoList.add(new BackpackDto(5, false));
-        backpackDtoList.add(new BackpackDto(6, false));
-        backpackDtoList.add(new BackpackDto(7, false));
-        System.out.println(GsonUtils.toJson(backpackDtoList));
     }
 
 }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
index 299d4e2..b54eb71 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java
@@ -13,6 +13,7 @@
 import com.zy.acs.manager.common.domain.MapDto;
 import com.zy.acs.manager.common.domain.MapRouteDto;
 import com.zy.acs.manager.common.exception.BusinessException;
+import com.zy.acs.manager.core.domain.BackpackDto;
 import com.zy.acs.manager.core.service.MapService;
 import com.zy.acs.manager.core.service.floyd.FloydNavigateService;
 import com.zy.acs.manager.manager.controller.param.MapDataParam;
@@ -21,16 +22,17 @@
 import com.zy.acs.manager.manager.entity.Map;
 import com.zy.acs.manager.manager.entity.*;
 import com.zy.acs.manager.manager.enums.AgvStsType;
+import com.zy.acs.manager.manager.enums.TaskStsType;
 import com.zy.acs.manager.manager.mapper.MapMapper;
 import com.zy.acs.manager.manager.service.*;
 import com.zy.acs.manager.system.controller.BaseController;
-import com.zy.acs.manager.system.service.ConfigService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * Created by vincent on 2023/6/1
@@ -54,7 +56,7 @@
     @Autowired
     private MapService mapService;
     @Autowired
-    private ConfigService configService;
+    private TaskService taskService;
     @Autowired
     private MapMapper mapMapper;
     @Autowired
@@ -134,6 +136,20 @@
         AgvDetail agvDetail = agvDetailService.selectByAgvNo(agvNo);
         MapAgvVo vo = new MapAgvVo();
         vo.setAgvNo(agv.getUuid());
+        if (null != agvDetail) {
+            vo.setOnline(agvService.judgeOnline(agvDetail.getAgvId()));
+            vo.setAgvStatus(agvDetail.getStatusDesc());
+            vo.setVol(String.valueOf(agvDetail.getVol()));
+            vo.setSoc(String.valueOf(agvDetail.getSoc()));
+            vo.setPos(String.valueOf(agvDetail.getPos()));
+            vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
+            vo.setDirection(agvDetail.getAgvAngle());
+            vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
+        }
+        List<Task> tasks = taskService.selectInSts(agv.getId(), TaskStsType.WAITING, TaskStsType.ASSIGN, TaskStsType.PROGRESS);
+        if (!Cools.isEmpty(tasks)) {
+            vo.setTaskIds(tasks.stream().map(Task::getId).collect(Collectors.toList()));
+        }
         return R.ok().add(vo);
     }
 
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
index 0bf1c9f..155e1d4 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/AgvResult.java
@@ -26,6 +26,8 @@
 
     private String vol = "-";
 
+    private String soc = "-";
+
     private String pos = "-";
 
     private String code = "-";
@@ -46,6 +48,9 @@
             if (null != agvDetail.getVol()) {
                 this.setVol(String.valueOf(agvDetail.getVol()));
             }
+            if (null != agvDetail.getSoc()) {
+                this.setSoc(String.valueOf(agvDetail.getSoc()));
+            }
             if (null != agvDetail.getRecentCode()) {
                 this.setCode(codeService.getById(agvDetail.getRecentCode()).getData());
             }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java
index 895a84a..b185741 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/result/MapAgvVo.java
@@ -14,7 +14,7 @@
 
     private String agvNo;
 
-    private List<BackpackDto> backpack = new ArrayList<>();
+    private Boolean online = Boolean.FALSE;
 
     private String agvStatus = "-";
 
@@ -28,7 +28,7 @@
 
     private Double direction = 0.0;
 
-    private Boolean online = Boolean.FALSE;
+    private List<BackpackDto> backpack = new ArrayList<>();
 
     private List<Long> taskIds = new ArrayList<>();
 

--
Gitblit v1.9.1