From 16f5e8d67c29b726bf07e790da3214d72eb0e053 Mon Sep 17 00:00:00 2001
From: gtsxc <3272660260@qq.com>
Date: 星期五, 28 二月 2025 08:26:23 +0800
Subject: [PATCH] #搜索空闲小车地图改为DFX，增加车辆有没有被任务绑定判断
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 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 445644e..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
@@ -56,21 +56,19 @@
* 灏濊瘯浠巖edis鑾峰彇鏁版嵁
*/
public int[][] getDataFromRedis(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
- String mapData = null;
+ String constantMap = DeviceRedisConstant.MAP;
if(mapType == NavigationMapType.NONE_LOCK.id){
- List<List<MapNode>> realMap = navigateMapData.getJsonDataFromDict(-1, null, null);//鑾峰彇瀹屾暣鍦板浘
- mapData = JSON.toJSONString(realMap);
- }else {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- Object o = redisUtil.get(DeviceRedisConstant.MAP + lev);
- if (o == null) {
- return null;
- }
-
- BasMapDto basMap = JSON.parseObject(o.toString(), BasMapDto.class);
- mapData = basMap.getData();
+ constantMap = DeviceRedisConstant.BASE_MAP;
}
+ RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
+ Object o = redisUtil.get(constantMap + lev);
+ if (o == null) {
+ return null;
+ }
+
+ BasMapDto basMap = JSON.parseObject(o.toString(), BasMapDto.class);
+ String mapData = basMap.getData();
return this.getDataFormString(mapData, mapType, whitePoints, shuttlePoints);
}
--
Gitblit v1.9.1