From ff7f41f5d6c99bff4a1d85a5b3342eec5a8fee0c Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 07 十一月 2024 08:52:34 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java |   17 +++++++++--------
 1 files changed, 9 insertions(+), 8 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 09035a8..4bb3460 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
@@ -42,18 +42,18 @@
 
     @Scheduled(cron = "0/1 * * * * ? ")
     public void broadcast() {
-        i++;
-        int key;
-        if (i > 10) {
-            i=0;
-        }
-        key = i /2;
-        MapWebSocket.broadcast(mockData.get(key));
+//        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));
+        MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
     }
 
     private List<MapWsAgvVo> syncAgv() {
@@ -68,6 +68,7 @@
             Long recentCode = agvDetail.getRecentCode();
             if (null == recentCode) { continue; }
             Code code = codeService.getById(recentCode);
+            if (null == code) { continue; }
 
             MapWsAgvVo vo = new MapWsAgvVo();
             vo.setAgvNo(agv.getUuid());

--
Gitblit v1.9.1