From 0dab5a05ed6e734a83c43f8e6e5ef1b07115f48d Mon Sep 17 00:00:00 2001
From: Junjie <540245094@qq.com>
Date: 星期二, 10 十二月 2024 10:50:54 +0800
Subject: [PATCH] #path similarity
---
zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 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..445644e 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,22 @@
* 灏濊瘯浠巖edis鑾峰彇鏁版嵁
*/
public int[][] getDataFromRedis(Integer mapType, List<int[]> whitePoints, List<int[]> shuttlePoints) {
- RedisUtil redisUtil = SpringUtils.getBean(RedisUtil.class);
- Object o = redisUtil.get(DeviceRedisConstant.MAP + lev);
- if (o == null) {
- return null;
+ String mapData = null;
+ 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();
}
- BasMapDto basMap = JSON.parseObject(o.toString(), BasMapDto.class);
- return this.getDataFormString(basMap.getData(), mapType, whitePoints, shuttlePoints);
+ return this.getDataFormString(mapData, mapType, whitePoints, shuttlePoints);
}
/**
@@ -319,7 +329,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