From 73ce8bebcc5d14f3fb62a19ee677abfcdfc776b4 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期六, 19 七月 2025 16:17:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapUtils.java b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
index 308cd55..6a43158 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -37,12 +37,21 @@
}
//鑾峰彇灏忚溅鑺傜偣
+ 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<NavigationMapType> mapTypes = new ArrayList<>();
+ mapTypes.add(NavigationMapType.NONE);
+ mapTypes.add(NavigationMapType.SHUTTLE);
+ List<List<MapNode>> listsHasShuttle = navigateMapData.filterMap(mapTypes, arrayList, lev, null, shuttlePoints);//鑾峰彇甯﹀皬杞﹀湴鍥炬暟鎹�
//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
List<List<MapNode>> lists = navigateMapData.rebuildData(arrayList);
@@ -52,6 +61,11 @@
//妫�娴嬭矾寰勬槸鍚﹁閿佸畾
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) {
--
Gitblit v1.9.1