From 8254197b29064846c3eafc916e340b74434fde6a Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 19 九月 2023 11:17:57 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/common/utils/NavigateMapData.java |   11 ++++++-----
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 3db31d9..2ce2ea4 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -245,6 +245,8 @@
         ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
         List<List<MapNode>> lists = filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
 
+        NavigateMapData mapData = new NavigateMapData(nodes.get(0).getZ());
+        List<List<MapNode>> realMap = mapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
         for (NavigateNode node : nodes) {
             if (node.getZ() != lev) {
                 continue;
@@ -255,11 +257,10 @@
             if (lock) {
                 mapNode.setValue(-999);//绂佺敤搴撲綅
             }else {
-                if (node.getX() == 11 || node.getX() == 19) {
-                    mapNode.setValue(3);//鎭㈠搴撲綅锛屾瘝杞ㄩ亾
-                }else {
-                    mapNode.setValue(0);//鎭㈠搴撲綅锛屾櫘閫氬簱浣�
-                }
+                //鑾峰彇鍘熷鑺傜偣鏁版嵁
+                List<MapNode> rows = realMap.get(node.getX());
+                MapNode col = rows.get(node.getY());
+                mapNode.setValue(col.getValue());//鎭㈠搴撲綅
             }
 
             listX.set(node.getY(), mapNode);

--
Gitblit v1.9.1