From 7958b0e136e96d2730c2df17a46046d1bbe74358 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 07 四月 2026 10:52:28 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java |   91 ++++++++++++++++++++++++++++++++++++++++-----
 1 files changed, 80 insertions(+), 11 deletions(-)

diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java
index e50f56e..9ad3bf6 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/service/impl/AgvModelServiceImpl.java
@@ -8,17 +8,19 @@
 import com.zy.acs.manager.manager.service.AgvModelService;
 import com.zy.acs.manager.manager.service.AgvService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;
-import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.ConcurrentHashMap;
 
 @Service("agvModelService")
 public class AgvModelServiceImpl extends ServiceImpl<AgvModelMapper, AgvModel> implements AgvModelService {
 
-    public static final Map<Long, AgvModel> AGV_ID_MODEL_CACHE = new HashMap<>();
-    public static final Map<String, AgvModel> AGV_NO_MODEL_CACHE = new HashMap<>();
+    public static final Map<Long, AgvModel> AGV_ID_MODEL_CACHE = new ConcurrentHashMap<>();
+    public static final Map<String, AgvModel> AGV_NO_MODEL_CACHE = new ConcurrentHashMap<>();
 
     @Autowired
     private AgvService agvService;
@@ -27,8 +29,7 @@
     public void init() {
         for (Agv agv : agvService.list()) {
             AgvModel agvModel = this.getById(agv.getAgvModel());
-            AGV_ID_MODEL_CACHE.put(agv.getId(), agvModel);
-            AGV_NO_MODEL_CACHE.put(agv.getUuid(), agvModel);
+            this.cacheAgvModel(agv, agvModel);
         }
     }
 
@@ -39,28 +40,75 @@
 
     @Override
     public AgvModel getByAgvId(Long agvId) {
+        if (agvId == null) {
+            return null;
+        }
         AgvModel agvModel = AGV_ID_MODEL_CACHE.get(agvId);
         if (agvModel == null) {
             Agv agv = agvService.getById(agvId);
+            if (agv == null || agv.getAgvModel() == null) {
+                return null;
+            }
             agvModel = this.getById(agv.getAgvModel());
-            if(agvModel != null) {
-                AGV_ID_MODEL_CACHE.put(agv.getId(), agvModel);
+            if (agvModel != null) {
+                this.cacheAgvModel(agv, agvModel);
             }
         }
-        return agvModel;
+        return this.copyModel(agvModel);
     }
 
     @Override
     public AgvModel getByAgvNo(String agvNo) {
+        if (agvNo == null) {
+            return null;
+        }
         AgvModel agvModel = AGV_NO_MODEL_CACHE.get(agvNo);
         if (agvModel == null) {
             Agv agv = agvService.selectByUuid(agvNo);
+            if (agv == null || agv.getAgvModel() == null) {
+                return null;
+            }
             agvModel = this.getById(agv.getAgvModel());
-            if(agvModel != null) {
-                AGV_NO_MODEL_CACHE.put(agvNo, agvModel);
+            if (agvModel != null) {
+                this.cacheAgvModel(agv, agvModel);
             }
         }
-        return agvModel;
+        return this.copyModel(agvModel);
+    }
+
+    @Override
+    public void refreshCacheByModelId(Long modelId) {
+        if (modelId == null) {
+            return;
+        }
+        AgvModel latestModel = this.getById(modelId);
+        if (latestModel == null) {
+            AGV_ID_MODEL_CACHE.entrySet().removeIf(entry -> this.hitModel(entry.getValue(), modelId));
+            AGV_NO_MODEL_CACHE.entrySet().removeIf(entry -> this.hitModel(entry.getValue(), modelId));
+            return;
+        }
+        for (Map.Entry<Long, AgvModel> entry : AGV_ID_MODEL_CACHE.entrySet()) {
+            AgvModel cachedModel = entry.getValue();
+            if (this.hitModel(cachedModel, modelId)) {
+                AGV_ID_MODEL_CACHE.put(entry.getKey(), this.copyModel(latestModel));
+            }
+        }
+        for (Map.Entry<String, AgvModel> entry : AGV_NO_MODEL_CACHE.entrySet()) {
+            AgvModel cachedModel = entry.getValue();
+            if (this.hitModel(cachedModel, modelId)) {
+                AGV_NO_MODEL_CACHE.put(entry.getKey(), this.copyModel(latestModel));
+            }
+        }
+    }
+
+    @Override
+    public void evictCacheByAgv(Long agvId, String agvNo) {
+        if (agvId != null) {
+            AGV_ID_MODEL_CACHE.remove(agvId);
+        }
+        if (agvNo != null) {
+            AGV_NO_MODEL_CACHE.remove(agvNo);
+        }
     }
 
     @Override
@@ -69,4 +117,25 @@
         return model.getBackpack() <= 1;
     }
 
+    private void cacheAgvModel(Agv agv, AgvModel agvModel) {
+        if (agv == null || agvModel == null) {
+            return;
+        }
+        AGV_ID_MODEL_CACHE.put(agv.getId(), this.copyModel(agvModel));
+        AGV_NO_MODEL_CACHE.put(agv.getUuid(), this.copyModel(agvModel));
+    }
+
+    private boolean hitModel(AgvModel agvModel, Long modelId) {
+        return agvModel != null && Objects.equals(agvModel.getId(), modelId);
+    }
+
+    private AgvModel copyModel(AgvModel agvModel) {
+        if (agvModel == null) {
+            return null;
+        }
+        AgvModel target = new AgvModel();
+        BeanUtils.copyProperties(agvModel, target);
+        return target;
+    }
+
 }

--
Gitblit v1.9.1