From a6419abb1e5dc63f8957da5eb45c82d49b86cbc9 Mon Sep 17 00:00:00 2001
From: Junjie <fallin.jie@qq.com>
Date: 星期二, 07 一月 2025 16:38:47 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 11 +++++------
1 files changed, 5 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 6bfd954..1308af1 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -7,6 +7,7 @@
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.stereotype.Component;
@@ -29,7 +30,6 @@
return true;
}
- navigateMapData.setLev(lev);
Object o = redisUtil.get(RedisKeyType.MAP.key + lev);
if (o == null) {
return false;
@@ -49,18 +49,17 @@
for (NavigateNode node : nodes) {
List<MapNode> listX = listsHasShuttle.get(node.getX());
MapNode mapNode = listX.get(node.getY());
- if (mapNode.getValue() == -999) {
+ if (mapNode.getValue() == MapNodeType.LOCK.id) {
return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆￠攣瀹�
}
- if (mapNode.getValue() == 66) {
+ if (mapNode.getValue() == MapNodeType.CAR.id) {
return false;//璺緞瀛樺湪灏忚溅锛岀姝㈤攣瀹�
}
}
}
//灏濊瘯閿佸畾/瑙ｉ攣璺緞
- navigateMapData.setLev(nodes.get(0).getZ());
- List<List<MapNode>> realMap = navigateMapData.getJsonData(-1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
+ List<List<MapNode>> realMap = navigateMapData.getJsonData(nodes.get(0).getZ(), -1, null, null);//鑾峰彇瀹屾暣鍦板浘(鍖呮嫭鍏ュ簱鍑哄簱)
for (NavigateNode node : nodes) {
if (node.getZ() != lev) {
continue;
@@ -69,7 +68,7 @@
List<MapNode> listX = lists.get(node.getX());
MapNode mapNode = listX.get(node.getY());
if (lock) {
- mapNode.setValue(-999);//绂佺敤搴撲綅
+ mapNode.setValue(MapNodeType.LOCK.id);//绂佺敤搴撲綅
} else {
//鑾峰彇鍘熷鑺傜偣鏁版嵁
List<MapNode> rows = realMap.get(node.getX());
--
Gitblit v1.9.1