From 62b1f39e60f64ec4e05b21d11af3e36f5891a91a Mon Sep 17 00:00:00 2001
From: zc <zc@123>
Date: 星期二, 29 四月 2025 20:10:27 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 24 ++++++++++++++++++------
1 files changed, 18 insertions(+), 6 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..59fbc88 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -2,6 +2,7 @@
import com.alibaba.fastjson.JSON;
import com.core.common.SpringUtils;
+import com.core.exception.CoolException;
import com.zy.asrs.entity.BasMap;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.MapNode;
@@ -36,17 +37,32 @@
}
//鑾峰彇灏忚溅鑺傜偣
+ int[] shuttlePoint = Utils.getShuttlePoint(shuttleNo);
+ if (shuttlePoint == null) {
+ return false;
+ }
+
+ //鑾峰彇灏忚溅鑺傜偣-鑾峰彇闄ょ櫧鍚嶅崟澶栫殑鎸囧畾妤煎眰鍏ㄩ儴绌挎杞y鍧愭爣鐐�
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);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+
+ //鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+ List<List<MapNode>> lists = navigateMapData.rebuildData(arrayList);
+ //杞藉叆搴撲綅淇℃伅
+ lists = navigateMapData.loadLocMast(NavigationMapType.NONE.id, lists, lev, null);
//妫�娴嬭矾寰勬槸鍚﹁閿佸畾
if (lock) {
for (NavigateNode node : nodes) {
+ //鍒ゆ柇鏄惁涓哄綋鍓嶅皬杞�
+ if(shuttlePoint[0] == node.getX() && shuttlePoint[1] == node.getY()) {
+ continue;
+ }
+
List<MapNode> listX = listsHasShuttle.get(node.getX());
MapNode mapNode = listX.get(node.getY());
if (mapNode.getValue() == MapNodeType.LOCK.id) {
@@ -59,7 +75,6 @@
}
//灏濊瘯閿佸畾/瑙ｉ攣璺緞
- List<List<MapNode>> realMap = navigateMapData.getJsonData(nodes.get(0).getZ(), -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
for (NavigateNode node : nodes) {
if (node.getZ() != lev) {
continue;
@@ -70,10 +85,7 @@
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());//鎭㈠搴撲綅
+ mapNode.setValue(node.getNodeValue());//鎭㈠鍘熷鑺傜偣鏁版嵁
}
listX.set(node.getY(), mapNode);
--
Gitblit v1.9.1