#path similarity

Junjie

2024-12-10 87a21cec642bf10bc92333dd5ee02b27560b3065

#path similarity

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/service/impl/MainServiceImpl.java

@@ -462,6 +462,7 @@

                //将地图数据存入redis
                redisUtil.set(DeviceRedisConstant.MAP + lev, JSON.toJSONString(map));
                redisUtil.set(DeviceRedisConstant.BASE_MAP + lev, JSON.toJSONString(map));
            }
        } catch (Exception e) {
            e.printStackTrace();

 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/core/utils/NavigateMapData.java

@@ -56,21 +56,19 @@
     * 尝试从redis获取数据
     */
    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);
    }


 zy-asrs-wcs/src/main/java/com/zy/asrs/wcs/rcs/constant/DeviceRedisConstant.java

@@ -15,6 +15,8 @@

    public static final String MAP = "realtimeBasMap_";

    public static final String BASE_MAP = "BaseMap_";

    public static final String LOCK_PATH = "mapLockPath_";

    public static final String COMMAND_TMP = "command_tmp_";