#

Junjie

5 天以前 e2cbfe96c6dea03c15bbb8ea8c7af320242a5d19

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

@@ -6,8 +6,8 @@
import com.zy.asrs.entity.BasShuttle;
import com.zy.asrs.service.BasShuttleService;
import com.zy.asrs.utils.Utils;
import com.zy.common.model.MapNode;
import com.zy.common.model.NavigateNode;
import com.zy.common.model.enums.NavigationMapType;
import com.zy.core.News;
import com.zy.core.cache.SlaveConnection;
import com.zy.core.dispatcher.ShuttleDispatchUtils;
@@ -260,19 +260,30 @@
                continue;
            }

            int nextInt = new Random().nextInt(outerNodes.size());
            NavigateNode randomNode = outerNodes.get(nextInt);
            String randomLocNo = NavigatePositionConvert.nodeToLocNo(randomNode);
            shuttleDispatchUtils.dispatchShuttle(null, randomLocNo, shuttleNo);
            String targetLocNo = null;
            for (NavigateNode node : outerNodes) {
                String dispatchLocNo = NavigatePositionConvert.nodeToLocNo(node);
                //获取内圈节点
                List<NavigateNode> avoidInnerNodes = getInnerNodes(dispatchLocNo, innerCircle, new ArrayList<>());
                //计算内圈是否有小车
                List<Integer> avoidNodesCar = findNodesCar(avoidInnerNodes);
                if(!avoidNodesCar.isEmpty()) {
                   continue;
                }
                targetLocNo = dispatchLocNo;
                break;
            }

            if(targetLocNo == null) {
                continue;
            }
            shuttleDispatchUtils.dispatchShuttle(null, targetLocNo, shuttleNo);
        }

        return true;//内圈中有车
    }

    //搜索节点内的小车编号
    private List<Integer> findNodesCar(List<NavigateNode> nodes) {
        List<Integer> list = new ArrayList<>();

    private HashMap<String, Integer> findCarMap() {
        HashMap<String, Integer> carMap = new HashMap<>();
        for (ShuttleSlave slave : slaveProperties.getShuttle()) {
            ShuttleThread shuttleThread = (ShuttleThread) SlaveConnection.get(SlaveType.Shuttle, slave.getId());
@@ -290,7 +301,13 @@

            carMap.put(currentLocNo, slave.getId());
        }
        return carMap;
    }

    //搜索节点内的小车编号
    private List<Integer> findNodesCar(List<NavigateNode> nodes) {
        List<Integer> list = new ArrayList<>();
        HashMap<String, Integer> carMap = findCarMap();
        for (NavigateNode node : nodes) {
            String locNo = NavigatePositionConvert.nodeToLocNo(node);
            if (carMap.containsKey(locNo)) {
@@ -307,8 +324,10 @@
        int lev = Utils.getLev(locNo);
        int[] pointArr = NavigatePositionConvert.positionToXY(locNo);
        NavigateNode currentNode = new NavigateNode(pointArr[0], pointArr[1]);
        currentNode.setZ(lev);

        int[][] map = navigateMapData.getDataFromRedis(lev, NavigationMapType.NORMAL.id, null, whiteShuttlePointList);
        List<List<MapNode>> lists = navigateMapData.getJsonData(lev, -1, null, null);//获取完整地图
        int[][] map = navigateMapData.parseJsonDataArr(lists);
        int nodeValue = map[pointArr[0]][pointArr[1]];
        currentNode.setNodeValue(nodeValue);

@@ -348,7 +367,8 @@
        currentNode.setZ(lev);
        innerNodes.add(currentNode);

        int[][] map = navigateMapData.getDataFromRedis(lev, NavigationMapType.NORMAL.id, null, whiteShuttlePointList);
        List<List<MapNode>> lists = navigateMapData.getJsonData(lev, -1, null, null);//获取完整地图
        int[][] map = navigateMapData.parseJsonDataArr(lists);
        int nodeValue = map[pointArr[0]][pointArr[1]];
        currentNode.setNodeValue(nodeValue);

@@ -358,7 +378,20 @@
            if (list.isEmpty()) {
                continue;
            }
            innerNodes.addAll(list);

            for (NavigateNode node : list) {
                boolean flag = false;
                for (int[] shuttlePoint : whiteShuttlePointList) {
                    if(node.getX() == shuttlePoint[0] && node.getY() == shuttlePoint[1]) {
                        flag = true;
                        break;
                    }
                }
                if(flag) {
                    continue;
                }
                innerNodes.add(node);
            }
        }

        return innerNodes;
@@ -389,13 +422,17 @@
                    NavigateNode node = new NavigateNode(x + innerCircleIdx, y);
                    node.setNodeValue(map[x + innerCircleIdx][y]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }
                if (is_valid(map, x - innerCircleIdx, y)) {
                    NavigateNode node = new NavigateNode(x - innerCircleIdx, y);
                    node.setNodeValue(map[x - innerCircleIdx][y]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }
            }

@@ -405,14 +442,18 @@
                    NavigateNode node = new NavigateNode(x, y + innerCircleIdx);
                    node.setNodeValue(map[x][y + innerCircleIdx]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }

                if (is_valid(map, x, y - innerCircleIdx)) {
                    NavigateNode node = new NavigateNode(x, y - innerCircleIdx);
                    node.setNodeValue(map[x][y - innerCircleIdx]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }
            }
        }else if (mapDirection.equals("y")) {//母轨y方向
@@ -422,14 +463,18 @@
                    NavigateNode node = new NavigateNode(x, y + innerCircleIdx);
                    node.setNodeValue(map[x][y + innerCircleIdx]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }

                if (is_valid(map, x, y - innerCircleIdx)) {
                    NavigateNode node = new NavigateNode(x, y - innerCircleIdx);
                    node.setNodeValue(map[x][y - innerCircleIdx]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }
            }

@@ -439,13 +484,17 @@
                    NavigateNode node = new NavigateNode(x + innerCircleIdx, y);
                    node.setNodeValue(map[x + innerCircleIdx][y]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }
                if (is_valid(map, x - innerCircleIdx, y)) {
                    NavigateNode node = new NavigateNode(x - innerCircleIdx, y);
                    node.setNodeValue(map[x - innerCircleIdx][y]);
                    node.setZ(z);
                    nodes.add(node);
                    if (node.getNodeValue().equals(startNode.getNodeValue())) {
                        nodes.add(node);
                    }
                }
            }
        }else {