From 69facf40120e294e46db6655d6fa59cf56713733 Mon Sep 17 00:00:00 2001 From: luxiaotao1123 <t1341870251@163.com> Date: 星期一, 09 十二月 2024 15:56:04 +0800 Subject: [PATCH] # --- zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/DigitalTwinDataScheduler.java | 3 +-- zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java | 5 ++++- zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/config/MapDataConfig.java | 12 +++++++----- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/DigitalTwinDataScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/DigitalTwinDataScheduler.java index 4bbbc2b..a85c9fd 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/DigitalTwinDataScheduler.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/DigitalTwinDataScheduler.java @@ -12,7 +12,6 @@ import lombok.Data; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.scheduling.annotation.Scheduled; -import org.springframework.stereotype.Component; import java.util.Comparator; import java.util.HashMap; @@ -22,7 +21,7 @@ /** * Created by vincent on 4/11/2024 */ -@Component +//@Component public class DigitalTwinDataScheduler { @Autowired diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/config/MapDataConfig.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/config/MapDataConfig.java index beeb729..9e8ed68 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/config/MapDataConfig.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/config/MapDataConfig.java @@ -21,11 +21,13 @@ @Bean public MapDataDispatcher getMapDataDispatcher() { MapDataDispatcher dispatcher = new MapDataDispatcher(codeService, routeService); - dispatcher.getCodeMatrix(null); - dispatcher.getMapMatrix(null, null); - dispatcher.getTurnMatrix(null); - dispatcher.getCdaMatrix(null); - dispatcher.getDynamicMatrix(null); + String[][] codeMatrix = dispatcher.getCodeMatrix(null); + if (codeMatrix.length > 0) { + dispatcher.getMapMatrix(null, null); + dispatcher.getTurnMatrix(null); + dispatcher.getCdaMatrix(null); + dispatcher.getDynamicMatrix(null); + } return dispatcher; } diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java index 90819c2..7087a22 100644 --- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java +++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/controller/MapController.java @@ -160,7 +160,10 @@ vo.setVol(String.valueOf(agvDetail.getVol())); vo.setSoc(String.valueOf(agvDetail.getSoc())); vo.setPos(agvDetail.getPos() != null && agvDetail.getPos() == 1); - vo.setCode(codeService.getById(agvDetail.getRecentCode()).getData()); + Code code = codeService.getById(agvDetail.getRecentCode()); + if (null != code) { + vo.setCode(code.getData()); + } vo.setDirection(agvDetail.getAgvAngle()); vo.setBackpack(GsonUtils.fromJsonToList(agvDetail.getBackpack(), BackpackDto.class)); vo.setPatrol(patrolService.isPatrolling(agvNo)); -- Gitblit v1.9.1