#

Junjie

2 天以前 73ce8bebcc5d14f3fb62a19ee677abfcdfc776b4

 src/main/java/com/zy/common/utils/NavigateMapUtils.java

@@ -37,12 +37,21 @@
            }

            //获取小车节点
            int[] shuttlePoint = Utils.getShuttlePoint(shuttleNo);
            if (shuttlePoint == null) {
                return false;
            }

            //获取小车节点-获取除白名单外的指定楼层全部穿梭车xy坐标点
            List<int[]> shuttlePoints = Utils.getShuttlePoints(shuttleNo, lev);

            BasMap basMap = JSON.parseObject(o.toString(), BasMap.class);
            ArrayList arrayList = JSON.parseObject(basMap.getData(), ArrayList.class);
            //带小车地图
            List<List<MapNode>> listsHasShuttle = navigateMapData.filterMap(NavigationMapType.NONE.id, arrayList, lev, null, shuttlePoints);//获取带小车地图数据
            List<NavigationMapType> mapTypes = new ArrayList<>();
            mapTypes.add(NavigationMapType.NONE);
            mapTypes.add(NavigationMapType.SHUTTLE);
            List<List<MapNode>> listsHasShuttle = navigateMapData.filterMap(mapTypes, arrayList, lev, null, shuttlePoints);//获取带小车地图数据

            //获取全部地图数据
            List<List<MapNode>> lists = navigateMapData.rebuildData(arrayList);
@@ -52,6 +61,11 @@
            //检测路径是否被锁定
            if (lock) {
                for (NavigateNode node : nodes) {
                    //判断是否为当前小车
                    if(shuttlePoint[0] == node.getX() && shuttlePoint[1] == node.getY()) {
                        continue;
                    }

                    List<MapNode> listX = listsHasShuttle.get(node.getX());
                    MapNode mapNode = listX.get(node.getY());
                    if (mapNode.getValue() == MapNodeType.LOCK.id) {