From 2bdbfd1ac24d4e9a87daf6fb8b99ec32264d5752 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 21 十二月 2024 11:25:27 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java | 45 +++++++++++++++++++++++++++++++++++++++------
1 files changed, 39 insertions(+), 6 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 ab38279..e7d5133 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
@@ -8,38 +8,62 @@
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Agv;
import com.zy.acs.manager.manager.entity.AgvDetail;
+import com.zy.acs.manager.manager.entity.AgvModel;
import com.zy.acs.manager.manager.entity.Code;
import com.zy.acs.manager.manager.service.AgvDetailService;
+import com.zy.acs.manager.manager.service.AgvModelService;
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.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
/**
* Created by vincent on 10/14/2024
*/
+@Slf4j
@Component
public class MapDataWsScheduler {
+
+ public static final int WEBSOCKET_BROADCAST_INTERVAL = 200;
+
+ private ExecutorService singleThreadExecutor;
@Autowired
private AgvService agvService;
@Autowired
private AgvDetailService agvDetailService;
@Autowired
+ private AgvModelService agvModelService;
+ @Autowired
private CodeService codeService;
@Autowired
private MapDataDispatcher mapDataDispatcher;
- @Scheduled(cron = "0/1 * * * * ? ")
- public void broadcast() {
- 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);
+ } catch (Exception e) {
+ log.error("MapDataWsScheduler.init", e);
+ }
+ }
+ });
}
private List<MapWsAgvVo> syncAgv() {
@@ -50,17 +74,21 @@
);
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
if (null == agvDetail) { continue; }
Long recentCode = agvDetail.getRecentCode();
if (null == recentCode) { continue; }
Code code = codeService.getById(recentCode);
+ if (null == code) { continue; }
MapWsAgvVo vo = new MapWsAgvVo();
+ vo.setAgvModel(agvModel.getType());
vo.setAgvNo(agv.getUuid());
vo.setCode(code.getData());
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()));
@@ -70,4 +98,9 @@
return agvVos;
}
+ @PreDestroy
+ public void destroy() {
+ this.singleThreadExecutor.shutdownNow();
+ }
+
}
--
Gitblit v1.9.1