From 5270e2368d6561b32720b4f712cca132ae87300f Mon Sep 17 00:00:00 2001
From: 野心家 <1051256694@qq.com>
Date: 星期六, 04 十一月 2023 10:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/tzskwcs_3' into tzskwcs_3
---
src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java | 25 +++++++++++++++++++++++--
1 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java
index d7f5d6a..552b933 100644
--- a/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java
+++ b/src/main/java/com/zy/common/utils/NyShuttleOperaUtils.java
@@ -114,7 +114,10 @@
allNode.addAll(nodes);
}
- navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startPoint), allNode, true);//閿佸畾璺緞
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startPoint), allNode, true);//閿佸畾璺緞
+ if (!result) {
+ return null;//璺緞閿佸畾澶辫触
+ }
return result(commands, calc);
}
@@ -149,7 +152,25 @@
allNode.addAll(nodes);
}
- navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startPoint), allNode, true);//閿佸畾璺緞
+ //閿佸畾璺緞鏃跺墧闄ょ櫧鍚嶅崟鑺傜偣
+ ArrayList<NavigateNode> nodes = new ArrayList<>();
+ for (NavigateNode node : allNode) {
+ boolean flag = false;
+ for (int[] white : whites) {
+ if (node.getX() == white[0] && node.getY() == white[1]) {
+ flag = true;//瀛樺湪鐧藉悕鍗曡妭鐐�
+ break;//璺宠繃鐧藉悕鍗曡妭鐐�
+ }
+ }
+
+ if (!flag) {
+ nodes.add(node);
+ }
+ }
+ boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(startPoint), nodes, true);//閿佸畾璺緞
+ if (!result) {
+ return null;//璺緞閿佸畾澶辫触
+ }
return result(commands, calc);
}
--
Gitblit v1.9.1