From cc42d79563a119ffb37302092c445e73ab76e274 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 28 十二月 2023 15:08:17 +0800
Subject: [PATCH] #小车锁路径载入其他小车节点
---
src/main/java/com/zy/common/utils/NavigateMapUtils.java | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapUtils.java b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
index 325da95..ca1b96b 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapUtils.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapUtils.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSON;
import com.core.common.SpringUtils;
import com.zy.asrs.entity.BasMap;
+import com.zy.asrs.utils.Utils;
import com.zy.common.model.MapNode;
import com.zy.common.model.NavigateNode;
import com.zy.common.model.enums.NavigationMapType;
@@ -20,9 +21,13 @@
* 鍐欏叆璺緞鑺傜偣鏁版嵁鍒皉edis鍦板浘涓�
* lock涓簍rue 绂佺敤搴撲綅锛宭ock涓篺alse鎭㈠搴撲綅
*/
- public synchronized boolean writeNavigateNodeToRedisMap(Integer lev, List<NavigateNode> nodes, boolean lock) {
+ public synchronized boolean writeNavigateNodeToRedisMap(Integer lev, Integer shuttleNo, List<NavigateNode> nodes, boolean lock) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
try {
+ if (nodes.isEmpty()) {
+ return true;
+ }
+
NavigateMapData navigateMapData = new NavigateMapData(lev);
Object o = redisUtil.get(RedisKeyType.MAP.key + lev);
@@ -30,9 +35,12 @@
return false;
}
+ //鑾峰彇灏忚溅鑺傜偣
+ 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>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, null);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
+ List<List<MapNode>> lists = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, shuttlePoints);//鑾峰彇鍏ㄩ儴鍦板浘鏁版嵁
//妫�娴嬭矾寰勬槸鍚﹁閿佸畾
if (lock) {
@@ -42,6 +50,9 @@
if (mapNode.getValue() == -999) {
return false;//璺緞琚攣瀹氳繃锛岀姝㈠啀娆￠攣瀹�
}
+ if (mapNode.getValue() == 66) {
+ return false;//璺緞瀛樺湪灏忚溅锛岀姝㈤攣瀹�
+ }
}
}
--
Gitblit v1.9.1