From 019a83b893a4d6c6f939f7162b96b188470202bf Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期一, 17 二月 2025 13:49:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jxgtwcs' into jxgtwcs
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java | 14 +++++++++++---
1 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java
index c3139be..d527847 100644
--- a/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java
+++ b/zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java
@@ -31,6 +31,8 @@
private LocService locService;
@Autowired
private DictService dictService;
+ @Autowired
+ private NavigateMapData navigateMapData;
private Integer lev;//鍦板浘妤煎眰
@@ -54,14 +56,20 @@
* 灏濊瘯浠巖edis鑾峰彇鏁版嵁
*/
public int[][] getDataFromRedis(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
+ String constantMap = DeviceRedisConstant.MAP;
+ if(mapType == NavigationMapType.NONE_LOCK.id){
+ constantMap = DeviceRedisConstant.BASE_MAP;
+ }
+
RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- Object o = redisUtil.get(DeviceRedisConstant.MAP + lev);
+ Object o = redisUtil.get(constantMap + lev);
if (o == null) {
return null;
}
BasMapDto basMap = JSON.parseObject(o.toString(), BasMapDto.class);
- return this.getDataFormString(basMap.getData(), mapType, whitePoints, shuttlePoints);
+ String mapData = basMap.getData();
+ return this.getDataFormString(mapData, mapType, whitePoints, shuttlePoints);
}
/**
@@ -319,7 +327,7 @@
) {
mapNode.setValue(MapNodeType.DISABLE.id);//绂佺敤鑺傜偣
}
- } else if (mapType == NavigationMapType.NORMAL.id) {
+ } else if (mapType == NavigationMapType.NORMAL.id || mapType == NavigationMapType.NONE_LOCK.id) {
//杩囨护搴撲綅鐘舵�乆
if (loc.getLocStsFlag().equals("X")) {
mapNode.setValue(MapNodeType.DISABLE.id);//绂佺敤鑺傜偣
--
Gitblit v1.9.1