From 29aa7746640d7d0c0f01f3e0d3f23ef3250086a7 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期五, 13 六月 2025 16:50:39 +0800
Subject: [PATCH] 数据为空的校验补充

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java    |   10 +++++++---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java |    9 ++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
index cf2a240..35c0024 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java
@@ -179,8 +179,8 @@
         Double maxY = Double.parseDouble(String.valueOf(map.get("max_y")));
 
         // 缂╂斁鍚庨渶瑕佺殑鍋忕Щ閲�
-        double scaleOffsetX = width *  (1 -CodeUtils.ADAPTATION_SCALE) / 2;
-        double scaleOffsetY = height *  (1 -CodeUtils.ADAPTATION_SCALE) / 2;
+        double scaleOffsetX = width * (1 - CodeUtils.ADAPTATION_SCALE) / 2;
+        double scaleOffsetY = height * (1 - CodeUtils.ADAPTATION_SCALE) / 2;
 
         List<Code> codeList = this.list();
         for (Code code : codeList) {
@@ -213,7 +213,11 @@
         List<Long> ids = this.baseMapper.selectAllLocCode();
         List<Code> codeList = new ArrayList<>();
         for (Long id : ids) {
-            codeList.add(this.getById(id));
+            Code byId = this.getById(id);
+            if (byId != null) {
+                codeList.add(byId);
+            }
+
         }
         return codeList;
     }
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
index 630daac..f205ea9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/MissionServiceImpl.java
@@ -2,6 +2,7 @@
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.zy.acs.framework.common.Cools;
+import com.zy.acs.framework.exception.CoolException;
 import com.zy.acs.manager.common.exception.BusinessException;
 import com.zy.acs.manager.manager.controller.result.MissionVo;
 import com.zy.acs.manager.manager.entity.*;
@@ -70,7 +71,13 @@
         Long recentCode = agvDetail.getRecentCode();
         String currCode = null;
         if (null != recentCode) {
-            currCode = codeService.getCacheById(recentCode).getData();
+            Code cacheById = codeService.getCacheById(recentCode);
+            if (cacheById != null) {
+                currCode = cacheById.getData();
+            } else {
+                throw new CoolException(segment.getAgvId() + "灏忚溅杩樺湪鍒犻櫎鐨勭偣浣嶄腑");
+            }
+
         }
 
         // action -------------------------------

--
Gitblit v1.9.1