1
zhang
2025-06-18 ee5046d151a858339aa137790bc830efe7f55980
1
3个文件已修改
31 ■■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvCompleteSubscriber.java 4 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java 20 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvCompleteSubscriber.java
@@ -38,13 +38,13 @@
                    // 间隔
                    Thread.sleep(30);
                    if (configService.getVal("stopDownData", Boolean.class)) { return; }
                    if (!configService.getVal("stopDownData", Boolean.class)) {
                    AgvProtocol protocol = redis.pop(RedisConstant.AGV_COMPLETE_FLAG);
                    if (null != protocol){
                        mainService.upDataSubscribe(protocol);
                    }
                    }
                } catch (Exception e) {
                    log.error("AgvCompleteSubscriber mainService.upDataSubscribe fail", e);
zy-acs-manager/src/main/java/com/zy/acs/manager/core/listen/AgvDataSubscriber.java
@@ -39,15 +39,16 @@
                    // 间隔
                    Thread.sleep(10);
                    if (configService.getVal("stopDownData", Boolean.class)) { return; }
                    if (!configService.getVal("stopDownData", Boolean.class)) {
                    AgvProtocol protocol = redis.pop(RedisConstant.AGV_DATA_FLAG);
                    if (null != protocol){
                        agvDataService.dataProcess(protocol);
                    }
                    }
                } catch (Exception ignore) {}
                } catch (Exception ignore) {
                }
            }
        });
        thread.start();
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -73,7 +73,9 @@
    @Scheduled(cron = "0/1 * * * * ? ")
    private void startupBus() throws InterruptedException {
//        if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
        if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) { return; }
        if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) {
            return;
        }
        List<Bus> busList = busService.selectBySts(BusStsType.RECEIVE);
        for (Bus bus : busList) {
            mainService.allocateTask(bus);
@@ -83,7 +85,9 @@
    @Scheduled(cron = "0/1 * * * * ? ")
    private void calculateSeg() throws InterruptedException {
        if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) { return; }
        if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) {
            return;
        }
        List<Task> taskList = taskService.selectBySts(TaskStsType.WAITING);
        List<AgvTaskDto> taskDtoList = new ArrayList<>();
@@ -106,15 +110,15 @@
    @EventListener(ApplicationReadyEvent.class)
    public void init() {
        try { Thread.sleep(1200); } catch (InterruptedException ignore) {}
        try {
            Thread.sleep(1200);
        } catch (InterruptedException ignore) {
        }
        // traffic calculate
        this.trafficCalcThread = new Thread(() -> {
            while (!Thread.currentThread().isInterrupted()) {
                try {
                    Thread.sleep(CORE_SCAN_FREQUENCY_MILLISECOND);
                    if (configService.getVal("stopDownData", Boolean.class)) { return; }
                    List<Segment> segments = segmentService.list(new LambdaQueryWrapper<Segment>()
                            .eq(Segment::getState, SegmentStateType.WAITING.toString())
@@ -137,12 +141,12 @@
                try {
                    Thread.sleep(CORE_SCAN_FREQUENCY_MILLISECOND);
                    if (configService.getVal("stopDownData", Boolean.class)) { return; }
                    if (!configService.getVal("stopDownData", Boolean.class)) {
                    List<String> actionGroupIds = actionService.selectGroupNo(ActionStsType.PREPARE);
                    for (String actionGroupId : actionGroupIds) {
                        mainService.publishAction(actionGroupId);
                    }
                    }
                } catch (Exception e) {
                    log.error("KernelScheduler.actionPublicThread fail", e);