#

luxiaotao1123

2024-11-12 f7a68273c9ae23eb81e90eb0349c8314ccd8927c

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java

@@ -57,9 +57,12 @@
    private MapService mapService;

    @PostConstruct
    @SuppressWarnings("all")
    public void execute() {
        this.singleThreadExecutor = Executors.newSingleThreadExecutor();
        this.singleThreadExecutor.execute(() -> {

            try { Thread.sleep(200); } catch (InterruptedException ignore) {}

            this.calcDynamicNodeWhenBoot();

@@ -67,9 +70,7 @@

                this.calcWaveScope();

                try {
                    Thread.sleep(500);
                } catch (InterruptedException ignore) {}
                try { Thread.sleep(500); } catch (InterruptedException ignore) {}
            }

        });
@@ -97,7 +98,7 @@
//                AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
//                Code code = codeService.getById(agvDetail.getRecentCode());
//
//                Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModel.getDiameter(), MapDataConstant.IDLE_DISTANCE_COE);
//                Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModel.getDiameter(), MapDataConstant.MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR);
//                List<NavigateNode> includeList = mapService.getWaveScopeByCode(lev, code.getData(), avoidDistance);
//
//                for (NavigateNode navigateNode : includeList) {
@@ -114,13 +115,13 @@
                    DynamicNode dynamicNode = dynamicMatrix[i][j];
                    String vehicle = dynamicNode.getVehicle();
                    if (!DynamicNodeType.ACCESS.val.equals(vehicle) && !DynamicNodeType.BLOCK.val.equals(vehicle)) {
                        AgvModel agvModel = agvModelService.getById(agvService.selectByUuid(vehicle).getAgvModel());
                        AgvModel agvModel = agvModelService.getById(agvService.selectByUuid(vehicle).getAgvModel());    // can be optimized

                        Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModel.getDiameter(), MapDataConstant.IDLE_DISTANCE_COE);
                        Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModel.getDiameter(), MapDataConstant.MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR);
                        List<NavigateNode> includeList = mapService.getWaveScopeByCode(lev, codeMatrix[i][j], avoidDistance);

                        for (NavigateNode navigateNode : includeList) {
                            String waveNode = waveMatrix[navigateNode.getX()][navigateNode.getY()];
                            String waveNode = waveMatrix[navigateNode.getX()][navigateNode.getY()]; // overlay
                            waveMatrix[navigateNode.getX()][navigateNode.getY()] = MapDataUtils.generateWaveNode(waveNode, vehicle);
                        }
                    }
@@ -163,7 +164,7 @@

            Agv agv = agvService.selectByUuid(agvNo);
            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
            Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModel.getDiameter(), MapDataConstant.IDLE_DISTANCE_COE);
            Double avoidDistance = MapDataUtils.getVehicleWaveSafeDistance(agvModel.getDiameter(), MapDataConstant.MAX_DISTANCE_BETWEEN_ADJACENT_AGV_FACTOR);

            String[][] waveMatrix = mapDataDispatcher.getWaveMatrix(lev);