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 | 12 +++++++++--- 1 files changed, 9 insertions(+), 3 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 9d502e1..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 @@ -23,8 +23,10 @@ import javax.annotation.PreDestroy; import java.util.ArrayList; import java.util.List; +import java.util.Map; import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; +import java.util.stream.Collectors; /** * Created by vincent on 10/14/2024 @@ -33,7 +35,7 @@ @Component public class MapDataWsScheduler { - public static final int WEBSOCKET_BROADCAST_INTERVAL = 600; + public static final int WEBSOCKET_BROADCAST_INTERVAL = 300; private ExecutorService singleThreadExecutor; @@ -72,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; } @@ -90,7 +96,7 @@ vo.setBattery(agvDetail.getSoc()); vo.setError(agvDetail.realError()); - vo.setDynamicRoute(mapService.queryCodeListFromDynamicNode(null, agv.getUuid())); + vo.setDynamicRoute(codeDataListMap.get(agv.getUuid())); agvVos.add(vo); } -- Gitblit v1.9.1