From 171206ad10f56e8ee795cc3d5ee7c5ad3980a105 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期五, 13 十月 2023 17:34:20 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 18 ++++++++++++------
1 files changed, 12 insertions(+), 6 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..9d550f2 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -198,7 +198,12 @@
} else if (mapType == NavigationMapType.DFX.id) {
//杞﹁締鏈夎揣
//璇诲彇瀵瑰簲搴撲綅鏁版嵁锛屽皢DFX搴撲綅鐘舵�佺殑鑺傜偣缃负-1(闅滅鐗�)
- if (locMast.getLocSts().equals("F") || locMast.getLocSts().equals("D") || locMast.getLocSts().equals("X")) {
+ if (locMast.getLocSts().equals("F")
+ || locMast.getLocSts().equals("D")
+ || locMast.getLocSts().equals("X")
+ || locMast.getLocSts().equals("R")
+ || locMast.getLocSts().equals("P")
+ ) {
mapNode.setValue(-1);//绂佺敤鑺傜偣
}
} else if (mapType == NavigationMapType.NORMAL.id) {
@@ -245,6 +250,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 +262,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