From e80cb83c601a9a9a0b3db6d848ea605800d22bc7 Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期五, 01 十二月 2023 13:44:39 +0800
Subject: [PATCH] #盘点逻辑
---
src/main/java/com/zy/common/utils/NavigateMapData.java | 34 ++++++++++++++++++----------------
1 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index 62b43e6..7628bce 100644
--- a/src/main/java/com/zy/common/utils/NavigateMapData.java
+++ b/src/main/java/com/zy/common/utils/NavigateMapData.java
@@ -9,6 +9,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.RedisKeyType;
import com.zy.core.enums.ShuttleTaskModeType;
import org.springframework.stereotype.Component;
@@ -84,7 +85,7 @@
*/
public int[][] getDataFromRedis(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- Object o = redisUtil.get("realtimeBasMap_" + lev);
+ Object o = redisUtil.get(RedisKeyType.MAP.key + lev);
if (o == null) {
return null;
}
@@ -233,7 +234,7 @@
|| locMast.getLocSts().equals("D")
|| locMast.getLocSts().equals("X")
|| locMast.getLocSts().equals("R")
- || locMast.getLocSts().equals("P")
+// || locMast.getLocSts().equals("P")
) {
mapNode.setValue(-1);//绂佺敤鑺傜偣
}
@@ -264,23 +265,24 @@
}
//鍔犺浇鐧藉悕鍗曡妭鐐�
- List<List<MapNode>> realMap = getJsonData(lev, -1, null, null);//鑾峰彇瀹屾暣鍦板浘
- for (int[] points : whitePoints) {
- //鑾峰彇鍘熷鑺傜偣鏁版嵁
- int x = points[0];
- int y = points[1];
- List<MapNode> rows = realMap.get(x);
- MapNode col = rows.get(y);
+ if (whitePoints != null) {
+ List<List<MapNode>> realMap = getJsonData(lev, -1, null, null);//鑾峰彇瀹屾暣鍦板浘
+ for (int[] points : whitePoints) {
+ //鑾峰彇鍘熷鑺傜偣鏁版嵁
+ int x = points[0];
+ int y = points[1];
+ List<MapNode> rows = realMap.get(x);
+ MapNode col = rows.get(y);
- List<MapNode> list = lists.get(x);
- MapNode mapNode = list.get(y);
- mapNode.setValue(col.getValue());//鎭㈠鍘熷鑺傜偣
+ List<MapNode> list = lists.get(x);
+ MapNode mapNode = list.get(y);
+ mapNode.setValue(col.getValue());//鎭㈠鍘熷鑺傜偣
- //鏇存柊list
- list.set(y, mapNode);
- lists.set(x, list);
+ //鏇存柊list
+ list.set(y, mapNode);
+ lists.set(x, list);
+ }
}
-
return lists;
}
--
Gitblit v1.9.1