#

Junjie

2023-10-24 925b834a3341dbe9f486964a7ad5d1affd7a404d

 src/main/java/com/zy/asrs/service/impl/MainServiceImpl.java

@@ -108,6 +108,8 @@
    private BasLiftOptService basLiftOptService;
    @Autowired
    private ConfigService configService;
    @Autowired
    private NavigateMapUtils navigateMapUtils;


    /**
@@ -2701,9 +2703,8 @@
            if (!checkPathIsAvailable) {
                return false;//检测目标站点路径是否未被占用
            }
            NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(wrkMast.getLocNo()));
            //尝试锁定目标站路径
            boolean result2 = navigateMapData.writeNavigateNodeToRedisMap(targetNodes, true);//所使用的路径进行锁定禁用
            boolean result2 = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(wrkMast.getLocNo()), targetNodes, true);//所使用的路径进行锁定禁用
            if (!result2) {
                return false;//路径锁定失败
            }
@@ -3078,13 +3079,12 @@
            }

            //*************尝试解锁目标站路径***************
            NavigateMapData navigateMapData = new NavigateMapData(Utils.getLev(wrkMast.getLocNo()));
            List<NavigateNode> targetNodes = NyLiftUtils.getLiftStaNodes(liftSta.getStaNo());
            if (targetNodes == null) {
                return false;//未获取到节点
            }
            //尝试解锁目标站路径
            boolean result = navigateMapData.writeNavigateNodeToRedisMap(targetNodes, false);//所使用的路径进行解锁
            boolean result = navigateMapUtils.writeNavigateNodeToRedisMap(Utils.getLev(wrkMast.getLocNo()), targetNodes, false);//所使用的路径进行解锁
            if (!result) {
                return false;//路径解锁失败
            }