From 7c4d3d957c431aad12f90511770e2fe429bcd380 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 24 十二月 2024 16:38:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 18 +++++++++++++-----
1 files changed, 13 insertions(+), 5 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 a28cb5b..c0d5448 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
@@ -15,6 +15,7 @@
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.stereotype.Component;
@@ -28,8 +29,11 @@
/**
* Created by vincent on 10/14/2024
*/
+@Slf4j
@Component
public class MapDataWsScheduler {
+
+ public static final int WEBSOCKET_BROADCAST_INTERVAL = 800;
private ExecutorService singleThreadExecutor;
@@ -50,11 +54,14 @@
this.singleThreadExecutor.execute(() -> {
try { Thread.sleep(200); } catch (InterruptedException ignore) {}
while (!Thread.currentThread().isInterrupted()) {
-
- MapWsVo mapWsVo = new MapWsVo();
- mapWsVo.setAgvVos(syncAgv());
- MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
- try { Thread.sleep(500); } catch (InterruptedException ignore) {}
+ 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);
+ }
}
});
}
@@ -81,6 +88,7 @@
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()));
--
Gitblit v1.9.1