#
vincentlu
2025-01-20 7477260314a234a516f333339fb26b4123a9255b
#
2个文件已修改
40 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java 38 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/MapService.java
@@ -183,8 +183,46 @@
    }
    public void unlockPath(String agvNo, String codeData) {
        if (Cools.isEmpty(agvNo, codeData)) {
            return;
        }
        try {
            unlockTaskQueue.offer(new UnlockPathTask(agvNo, codeData), 5, TimeUnit.SECONDS);
//            Integer lev = null;
//
//            String[][] codeMatrix = mapDataDispatcher.getCodeMatrix(null);
//            int[] codeMatrixIdx = mapDataDispatcher.getCodeMatrixIdx(lev, codeData);
//
//
//            DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(lev);
//
//            DynamicNode dynamicNode = dynamicMatrix[codeMatrixIdx[0]][codeMatrixIdx[1]];
//
//
//            int serial = dynamicNode.getSerial();
//
//            List<int[]> resetCodeIdxList = new ArrayList<>();
//
//            for (int i = 0; i < dynamicMatrix.length; i++) {
//                for (int j = 0; j < dynamicMatrix[i].length; j++) {
//
////                    if (i == codeMatrixIdx[0] && j == codeMatrixIdx[1]) { continue; }
//
//                    DynamicNode node = dynamicMatrix[i][j];
//                    if (node.getVehicle().equals(agvNo)) {
//                        if (node.getSerial() < serial) {
//                            resetCodeIdxList.add(new int[] {i, j});
//                        }
//                    }
//                }
//            }
//
//            if (!Cools.isEmpty(resetCodeIdxList)) {
//
//                mapDataDispatcher.clearDynamicMatrixByCodeList(lev, resetCodeIdxList);
//            }
        } catch (InterruptedException e) {
            log.error("unlockTaskQueue", e);
        }
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/PathQueueConsumer.java
@@ -37,7 +37,7 @@
        this.consumerExecutor.execute(() -> {
            while (!Thread.currentThread().isInterrupted()) {
                try {
                    Thread.sleep(50);
                    Thread.sleep(10);
                    List<UnlockPathTask> tasks = new ArrayList<>();
                    // if unlockTaskQueue was empty, then block
                    tasks.add(unlockTaskQueue.take());