From 09c600841c87ed1c6c50814bd274c772f5a5631e Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期一, 17 二月 2025 15:25:16 +0800
Subject: [PATCH] #

---
 zy-acs-flow/.env                                                                          |    2 +-
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/CodeServiceImpl.java |    6 ++++++
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java  |   14 ++++++++++++--
 3 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/zy-acs-flow/.env b/zy-acs-flow/.env
index ecc2ec9..561bdda 100644
--- a/zy-acs-flow/.env
+++ b/zy-acs-flow/.env
@@ -1,4 +1,4 @@
-VITE_BASE_IP=localhost
+VITE_BASE_IP=192.168.4.20
 VITE_BASE_PORT=8088
 
 # VITE_BASE_IP=192.168.1.100
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
index fb3e5b4..2cf5b4a 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvServiceImpl.java
@@ -80,7 +80,12 @@
     @Override
     public Long getAgvId(String uuid) {
         if (Cools.isEmpty(uuid)) {
-            return null;
+            Agv agv = this.selectByUuid(uuid);
+            if (agv != null) {
+                AGV_ID_MAP.put(uuid, agv.getId());
+            } else {
+                return null;
+            }
         }
         return AGV_ID_MAP.get(uuid);
     }
@@ -88,7 +93,12 @@
     @Override
     public String getAgvNo(Long agvId) {
         if (Cools.isEmpty(agvId)) {
-            return null;
+            Agv agv = this.getById(agvId);
+            if (agv != null) {
+                AGV_NO_MAP.put(agvId, agv.getUuid());
+            } else {
+                return null;
+            }
         }
         return AGV_NO_MAP.get(agvId);
     }
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 81446cb..cf2a240 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
@@ -54,6 +54,9 @@
         Code code = CODE_ID_CACHE.get(id);
         if (code == null) {
             code = this.getById(id);
+            if (code != null) {
+                CODE_ID_CACHE.put(id, code);
+            }
         }
         return code;
     }
@@ -63,6 +66,9 @@
         Code code = CODE_DATA_CACHE.get(data);
         if (code == null) {
             code = this.selectByData(data);
+            if (null != code) {
+                CODE_DATA_CACHE.put(data, code);
+            }
         }
         return code;
     }

--
Gitblit v1.9.1