#
luxiaotao1123
2024-12-23 e5670f55e06ba0bc7a884b305738e7d9f678bc00
#
2个文件已修改
79 ■■■■ 已修改文件
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java 77 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java
@@ -18,6 +18,8 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
import javax.annotation.PreDestroy;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -35,6 +37,10 @@
    private static final int LOCK_TIMEOUT = 5;
    private final ReentrantLock lock = new ReentrantLock(Boolean.TRUE);
    private Thread trafficCalcThread;
    private Thread actionPublicThread;
    @Autowired
    private AgvService agvService;
@@ -61,7 +67,7 @@
    @Autowired
    private SnowflakeIdWorker snowflakeIdWorker;
    @Scheduled(cron = "0/3 * * * * ? ")
    @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; }
@@ -72,7 +78,7 @@
        this.lock.unlock();
    }
    @Scheduled(cron = "0/3 * * * * ? ")
    @Scheduled(cron = "0/1 * * * * ? ")
    private void calculateSeg() throws InterruptedException {
        if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) { return; }
        List<Task> taskList = taskService.selectBySts(TaskStsType.WAITING);
@@ -95,8 +101,15 @@
        this.lock.unlock();
    }
    @Scheduled(cron = "0/1 * * * * ? ")
    private void traffic() {
    @PostConstruct
    public void init() {
        try { Thread.sleep(1200); } catch (InterruptedException ignore) {}
        // traffic calculate
        this.trafficCalcThread = new Thread(() -> {
            while (!Thread.currentThread().isInterrupted()) {
                try {
                    Thread.sleep(100);
        List<Segment> segments = segmentService.list(new LambdaQueryWrapper<Segment>()
                .eq(Segment::getState, SegmentStateType.WAITING.toString())
        );
@@ -105,17 +118,57 @@
            trafficService.trigger(segment);
            log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
        }
    }
    @Scheduled(cron = "0/1 * * * * ? ")
    private void publishAction(){
                } catch (Exception e) {
                    log.error("KernelScheduler.trafficCalcThread fail", e);
                }
            }
        });
        this.trafficCalcThread.start();
        // public action
        this.actionPublicThread = new Thread(() -> {
            while (!Thread.currentThread().isInterrupted()) {
                try {
                    Thread.sleep(100);
        List<String> actionGroupIds = actionService.selectPrepareGroup();
        for (String actionGroupId : actionGroupIds) {
            long startTime = System.currentTimeMillis();
            mainService.publishAction(actionGroupId);
            log.info("publish action calculation spend {} ms", System.currentTimeMillis() - startTime);
        }
                } catch (Exception e) {
                    log.error("KernelScheduler.actionPublicThread fail", e);
    }
            }
        });
        this.actionPublicThread.start();
    }
//    @Scheduled(fixedRate = 500) // 500毫秒执行一次,不同步
//    @Scheduled(fixedDelay = 500) // 500毫秒执行一次,同步
//    @Scheduled(cron = "0/1 * * * * ? ")
//    private void traffic() {
//        List<Segment> segments = segmentService.list(new LambdaQueryWrapper<Segment>()
//                .eq(Segment::getState, SegmentStateType.WAITING.toString())
//        );
//        for (Segment segment : segments) {
//            long startTime = System.currentTimeMillis();
//            trafficService.trigger(segment);
//            log.info("traffic calculation spend {} ms", System.currentTimeMillis() - startTime);
//        }
//    }
//
//    @Scheduled(cron = "0/1 * * * * ? ")
//    private void publishAction(){
//        List<String> actionGroupIds = actionService.selectPrepareGroup();
//        for (String actionGroupId : actionGroupIds) {
//            long startTime = System.currentTimeMillis();
//            mainService.publishAction(actionGroupId);
//            log.info("publish action calculation spend {} ms", System.currentTimeMillis() - startTime);
//        }
//    }
    // patch ----------------------------------------------------------------------------------------------
@@ -151,7 +204,15 @@
    }
    @PreDestroy
    public void shutDown(){
        if (this.trafficCalcThread != null) {
            this.trafficCalcThread .interrupt();
        }
        if (this.actionPublicThread != null) {
            this.actionPublicThread .interrupt();
        }
    }
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MapDataWsScheduler.java
@@ -58,7 +58,7 @@
                    MapWsVo mapWsVo = new MapWsVo();
                    mapWsVo.setAgvVos(syncAgv());
                    MapWebSocket.broadcast(GsonUtils.toJson(mapWsVo));
                    Thread.sleep(WEBSOCKET_BROADCAST_INTERVAL / 2);
                    Thread.sleep(WEBSOCKET_BROADCAST_INTERVAL / 3);
                } catch (Exception e) {
                    log.error("MapDataWsScheduler.init", e);
                }