From 9a516a0f650c3192071a20431789ea3942fbba8d Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 06 二月 2025 16:52:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 13 +++++++------
1 files changed, 7 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..308cd55 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;
@@ -42,7 +43,11 @@
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) {
@@ -59,7 +64,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 +74,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