From f8c14df2d6ceb57d1e8a389b62d6996d90a073fd Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期四, 30 十一月 2023 19:35:37 +0800
Subject: [PATCH] #盘点逻辑修改

---
 src/main/java/com/zy/common/utils/NavigateMapData.java |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/zy/common/utils/NavigateMapData.java b/src/main/java/com/zy/common/utils/NavigateMapData.java
index eb2fe6a..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);//绂佺敤鑺傜偣
                 }

--
Gitblit v1.9.1