From 6cf4a3e2ba925e75b60f13bb8ebc5e92d37809b2 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 25 七月 2025 13:53:34 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/utils/NavigateMapUtils.java |  139 +++++++++++++++++++++++++---------------------
 1 files changed, 75 insertions(+), 64 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateMapUtils.java b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
index 1308af1..8b043c4 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -1,93 +1,104 @@
 package com.zy.common.utils;
 
-import com.alibaba.fastjson.JSON;
-import com.core.common.SpringUtils;
-import com.zy.asrs.entity.BasMap;
 import com.zy.asrs.utils.Utils;
-import com.zy.common.model.MapNode;
 import com.zy.common.model.NavigateNode;
-import com.zy.common.model.enums.NavigationMapType;
-import com.zy.core.enums.MapNodeType;
 import com.zy.core.enums.RedisKeyType;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 import java.util.ArrayList;
-import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 
 @Component
 public class NavigateMapUtils {
+
+    @Autowired
+    private RedisUtil redisUtil;
 
     /**
      * 鍐欏叆璺緞鑺傜偣鏁版嵁鍒皉edis鍦板浘涓�
      * lock涓簍rue 绂佺敤搴撲綅锛宭ock涓篺alse鎭㈠搴撲綅
      */
     public synchronized boolean writeNavigateNodeToRedisMap(Integer lev, Integer shuttleNo, List<NavigateNode> nodes, boolean lock) {
-        RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
-        NavigateMapData navigateMapData = SpringUtils.getBean(NavigateMapData.class);
-        try {
-            if (nodes.isEmpty()) {
-                return true;
-            }
+        if (lock) {
+            return lockNodes(lev, shuttleNo, nodes);
+        }else {
+            return unlockNodes(lev, shuttleNo, nodes);
+        }
+    }
 
-            Object o = redisUtil.get(RedisKeyType.MAP.key + lev);
-            if (o == null) {
+    public synchronized boolean lockNodes(Integer lev, Integer shuttleNo, List<NavigateNode> nodes) {
+        if (nodes.isEmpty()) {
+            return false;
+        }
+
+        HashMap<String, Object> lockMap = new HashMap<>();
+        Object o = redisUtil.get(RedisKeyType.LOCK_MAP_NODES.key + lev);
+        if (o != null) {
+            lockMap = (HashMap<String, Object>) o;
+        }
+
+        List<String> shuttleList = new ArrayList<>();
+        //鑾峰彇灏忚溅鑺傜偣-鑾峰彇闄ょ櫧鍚嶅崟澶栫殑鎸囧畾妤煎眰鍏ㄩ儴绌挎杞y鍧愭爣鐐�
+        List<int[]> shuttlePoints = Utils.getShuttlePoints(shuttleNo, lev);
+        for (int[] point : shuttlePoints) {
+            String key = Utils.getLocNo(point[0], point[1], lev);
+            shuttleList.add(key);
+        }
+
+        HashMap<String, Object> tmpMap = new HashMap<>();
+        for (NavigateNode node : nodes) {
+            String key = Utils.getLocNo(node.getX(), node.getY(), lev);
+
+            //鍒ゆ柇鑺傜偣鏄惁鏈夊皬杞�
+            if(shuttleList.contains(key)) {
                 return false;
             }
 
-            //鑾峰彇灏忚溅鑺傜偣
-            List<int[]> shuttlePoints = Utils.getShuttlePoints(shuttleNo, lev);
-
-            BasMap basMap = JSON.parseObject(o.toString(), BasMap.class);
-            ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
-            //甯﹀皬杞﹀湴鍥�
-            List<List<MapNode>> listsHasShuttle = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, shuttlePoints);//鑾峰彇甯﹀皬杞﹀湴鍥炬暟鎹�
-            List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
-
-            //妫�娴嬭矾寰勬槸鍚﹁閿佸畾
-            if (lock) {
-                for (NavigateNode node : nodes) {
-                    List<MapNode> listX = listsHasShuttle.get(node.getX());
-                    MapNode mapNode = listX.get(node.getY());
-                    if (mapNode.getValue() == MapNodeType.LOCK.id) {
-                        return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆¢攣瀹�
-                    }
-                    if (mapNode.getValue() == MapNodeType.CAR.id) {
-                        return false;//璺緞瀛樺湪灏忚溅锛岀姝㈤攣瀹�
-                    }
+            //鍒ゆ柇鑺傜偣鏄惁琚攣瀹�
+            if(lockMap.containsKey(key)) {
+                Integer deviceNo = (Integer) lockMap.get(key);
+                if (!shuttleNo.equals(deviceNo)) {//绛夊緟閿佸畾鐨勮妭鐐瑰凡琚綋鍓嶅皬杞﹂攣瀹氾紝璁ゅ畾閿佸畾鎴愬姛
+                    return false;
                 }
             }
 
-            //灏濊瘯閿佸畾/瑙i攣璺緞
-            List<List<MapNode>> realMap = navigateMapData.getJsonData(nodes.get(0).getZ(), -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
-            for (NavigateNode node : nodes) {
-                if (node.getZ() != lev) {
-                    continue;
-                }
-
-                List<MapNode> listX = lists.get(node.getX());
-                MapNode mapNode = listX.get(node.getY());
-                if (lock) {
-                    mapNode.setValue(MapNodeType.LOCK.id);//绂佺敤搴撲綅
-                } else {
-                    //鑾峰彇鍘熷鑺傜偣鏁版嵁
-                    List<MapNode> rows = realMap.get(node.getX());
-                    MapNode col = rows.get(node.getY());
-                    mapNode.setValue(col.getValue());//鎭㈠搴撲綅
-                }
-
-                listX.set(node.getY(), mapNode);
-                lists.set(node.getX(), listX);
-            }
-            basMap.setData(JSON.toJSONString(lists));
-            basMap.setUpdateTime(new Date());
-            //灏嗘暟鎹簱鍦板浘鏁版嵁瀛樺叆redis
-            redisUtil.set(RedisKeyType.MAP.key + lev, JSON.toJSONString(basMap));
-            return true;
-        } catch (Exception e) {
-            e.printStackTrace();
+            tmpMap.put(key, shuttleNo);
         }
-        return false;
+
+        lockMap.putAll(tmpMap);
+
+        redisUtil.set(RedisKeyType.LOCK_MAP_NODES.key + lev, lockMap);
+        return true;
+    }
+
+    public synchronized boolean unlockNodes(Integer lev, Integer shuttleNo, List<NavigateNode> nodes) {
+        if (nodes.isEmpty()) {
+            return false;
+        }
+
+        HashMap<String, Object> lockMap = new HashMap<>();
+        Object o = redisUtil.get(RedisKeyType.LOCK_MAP_NODES.key + lev);
+        if (o != null) {
+            lockMap = (HashMap<String, Object>) o;
+        }
+
+        for (NavigateNode node : nodes) {
+            String key = Utils.getLocNo(node.getX(), node.getY(), lev);
+
+            if(!lockMap.containsKey(key)) {
+                continue;
+            }
+
+            Integer deviceNo = (Integer) lockMap.get(key);
+            if(deviceNo.equals(shuttleNo)) {
+                lockMap.remove(key);
+            }
+        }
+        lockMap.putAll(lockMap);
+        redisUtil.set(RedisKeyType.LOCK_MAP_NODES.key + lev, lockMap);
+        return true;
     }
 
 }

--
Gitblit v1.9.1