From 89c7f6e5bcc21b0e8f83a2bc6d680e2ffe431e6f Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 13 一月 2025 09:38:29 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java |  235 +++++++++-------------------------------------------------
 1 files changed, 38 insertions(+), 197 deletions(-)

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 c5dbffb..771fe7f 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
@@ -5,7 +5,7 @@
 import com.zy.acs.manager.core.domain.BackpackDto;
 import com.zy.acs.manager.core.domain.MapWsAgvVo;
 import com.zy.acs.manager.core.domain.MapWsVo;
-import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
+import com.zy.acs.manager.core.service.MapService;
 import com.zy.acs.manager.manager.entity.Agv;
 import com.zy.acs.manager.manager.entity.AgvDetail;
 import com.zy.acs.manager.manager.entity.AgvModel;
@@ -15,21 +15,29 @@
 import com.zy.acs.manager.manager.service.AgvService;
 import com.zy.acs.manager.manager.service.CodeService;
 import com.zy.acs.manager.manager.websocket.MapWebSocket;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
 import javax.annotation.PostConstruct;
+import javax.annotation.PreDestroy;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.stream.Collectors;
 
 /**
  * Created by vincent on 10/14/2024
  */
+@Slf4j
 @Component
 public class MapDataWsScheduler {
+
+    public static final int WEBSOCKET_BROADCAST_INTERVAL = 300;
+
+    private ExecutorService singleThreadExecutor;
 
     @Autowired
     private AgvService agvService;
@@ -40,24 +48,24 @@
     @Autowired
     private CodeService codeService;
     @Autowired
-    private MapDataDispatcher mapDataDispatcher;
+    private MapService mapService;
 
-    int i = 0;
-
-    @Scheduled(cron = "0/1 * * * * ? ")
-    public void broadcast() {
-        i++;
-        int key;
-        if (i > 10) {
-            i=0;
-        }
-        key = i /2;
-//        MapWebSocket.broadcast(mockData.get(key));
-
-
-        MapWsVo mapWsVo = new MapWsVo();
-        mapWsVo.setAgvVos(syncAgv());
-        MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
+    @PostConstruct
+    public void init() {
+        this.singleThreadExecutor = Executors.newSingleThreadExecutor();
+        this.singleThreadExecutor.execute(() -> {
+            try { Thread.sleep(200); } catch (InterruptedException ignore) {}
+            while (!Thread.currentThread().isInterrupted()) {
+                try {
+                    MapWsVo mapWsVo = new MapWsVo();
+                    mapWsVo.setAgvVos(syncAgv());
+                    MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
+                    Thread.sleep(WEBSOCKET_BROADCAST_INTERVAL / 3);
+                } catch (Exception e) {
+                    log.error("MapDataWsScheduler.init", e);
+                }
+            }
+        });
     }
 
     private List<MapWsAgvVo> syncAgv() {
@@ -66,9 +74,13 @@
         List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>()
 //                .eq(Agv::getStatus, 1)
         );
+
+        Map<String, List<String>> codeDataListMap = mapService.queryCodeListFromDynamicNode(null
+                , agvList.stream().map(Agv::getUuid).collect(Collectors.toSet()));
+
         for (Agv agv : agvList) {
             AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
-            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+            AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
             if (null == agvDetail) { continue; }
             Long recentCode = agvDetail.getRecentCode();
             if (null == recentCode) { continue; }
@@ -82,8 +94,9 @@
             vo.setDirection(agvDetail.getAgvAngle());
             vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class));
             vo.setBattery(agvDetail.getSoc());
+            vo.setError(agvDetail.realError());
 
-            vo.setDynamicRoute(mapDataDispatcher.queryCodeListFromDynamicNode(null, agv.getUuid()));
+            vo.setDynamicRoute(codeDataListMap.get(agv.getUuid()));
 
             agvVos.add(vo);
         }
@@ -91,181 +104,9 @@
         return agvVos;
     }
 
-
-
-
-
-
-    private static final Map<Integer, String> mockData = new ConcurrentHashMap<>();
-
-    @PostConstruct
-    public void init() {
-        mockData.put(1,
-               "{\n" +
-                       "    \"agvVos\": [\n" +
-                       "        {\n" +
-                       "            \"agvNo\": \"1\",\n" +
-                       "            \"code\": \"00000002\",\n" +
-                       "            \"direction\": 90,\n" +
-                       "            \"dynamicRoute\": [\n" +
-                       "                \"00000002\",\n" +
-                       "                \"00000003\",\n" +
-                       "                \"00000004\"\n" +
-                       "            ]\n" +
-                       "        },\n" +
-                       "        {\n" +
-                       "            \"agvNo\": \"2\",\n" +
-                       "            \"code\": \"00000063\",\n" +
-                       "            \"direction\": 90,\n" +
-                       "            \"dynamicRoute\": [\n" +
-                       "                \"00000063\",\n" +
-                       "                \"00000062\",\n" +
-                       "                \"00000061\",\n" +
-                       "                \"00000060\",\n" +
-                       "                \"00000059\"\n" +
-                       "            ]\n" +
-                       "        }\n" +
-                       "    ]\n" +
-                       "}"
-                );
-        mockData.put(2,
-"{\n" +
-        "    \"agvVos\": [\n" +
-        "        {\n" +
-        "            \"agvNo\": \"1\",\n" +
-        "            \"code\": \"00000003\",\n" +
-        "            \"direction\": 90,\n" +
-        "            \"dynamicRoute\": [\n" +
-        "                \"00000003\",\n" +
-        "                \"00000004\"\n" +
-        "            ]\n" +
-        "        },\n" +
-        "        {\n" +
-        "            \"agvNo\": \"2\",\n" +
-        "            \"code\": \"00000062\",\n" +
-        "            \"direction\": 90,\n" +
-        "            \"dynamicRoute\": [\n" +
-        " \n" +
-        "                \"00000062\",\n" +
-        "                \"00000061\",\n" +
-        "                \"00000060\",\n" +
-        "                \"00000059\"\n" +
-        "            ]\n" +
-        "        }\n" +
-        "    ]\n" +
-        "}"
-
-                );
-
-        mockData.put(3,
-                "{\n" +
-                        "    \"agvVos\": [\n" +
-                        "        {\n" +
-                        "            \"agvNo\": \"1\",\n" +
-                        "            \"code\": \"00000004\",\n" +
-                        "            \"direction\": 90,\n" +
-                        "            \"dynamicRoute\": [\n" +
-                        "           \n" +
-                        "                \"00000004\"\n" +
-                        "            ]\n" +
-                        "        },\n" +
-                        "        {\n" +
-                        "            \"agvNo\": \"2\",\n" +
-                        "            \"code\": \"00000061\",\n" +
-                        "            \"direction\": 90,\n" +
-                        "            \"dynamicRoute\": [\n" +
-                        "\n" +
-                        "                \"00000061\",\n" +
-                        "                \"00000060\",\n" +
-                        "                \"00000059\"\n" +
-                        "            ]\n" +
-                        "        }\n" +
-                        "    ]\n" +
-                        "}"
-                );
-
-        mockData.put(4,
-                "{\n" +
-                        "    \"agvVos\": [\n" +
-                        "        {\n" +
-                        "            \"agvNo\": \"1\",\n" +
-                        "            \"code\": \"00000004\",\n" +
-                        "            \"direction\": 120,\n" +
-                        "            \"dynamicRoute\": [\n" +
-                        "                \"00000004\"\n" +
-                        "            ]\n" +
-                        "        },\n" +
-                        "        {\n" +
-                        "            \"agvNo\": \"2\",\n" +
-                        "            \"code\": \"00000060\",\n" +
-                        "            \"direction\": 90,\n" +
-                        "            \"dynamicRoute\": [\n" +
-                        "\n" +
-                        "                \"00000060\",\n" +
-                        "                \"00000059\"\n" +
-                        "            ]\n" +
-                        "        }\n" +
-                        "    ]\n" +
-                        "}"
-                );
-
-        mockData.put(5,
-                "{\n" +
-                        "    \"agvVos\": [\n" +
-                        "        {\n" +
-                        "            \"agvNo\": \"1\",\n" +
-                        "            \"code\": \"00000004\",\n" +
-                        "            \"direction\": 180,\n" +
-                        "            \"dynamicRoute\": [\n" +
-                        "                \"00000004\"\n" +
-                        "            ]\n" +
-                        "        },\n" +
-                        "        {\n" +
-                        "            \"agvNo\": \"2\",\n" +
-                        "            \"code\": \"00000059\",\n" +
-                        "            \"direction\": 90,\n" +
-                        "            \"dynamicRoute\": [\n" +
-                        "\n" +
-                        "                \"00000059\"\n" +
-                        "            ]\n" +
-                        "        }\n" +
-                        "    ]\n" +
-                        "}"
-
-                );
+    @PreDestroy
+    public void destroy() {
+        this.singleThreadExecutor.shutdownNow();
     }
 
 }
-
-
-/**
-
- {
- "agvVos": [
- {
- "agvNo": "1",
- "code": "00000002",
- "direction": 90,
- "dynamicRoute": [
- "00000002",
- "00000003",
- "00000004"
- ]
- },
- {
- "agvNo": "2",
- "code": "00000063",
- "direction": 90,
- "dynamicRoute": [
- "00000063",
- "00000062",
- "00000061",
- "00000060",
- "00000059"
- ]
- }
- ]
- }
- ]
- }
- */
\ No newline at end of file

--
Gitblit v1.9.1