Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

12 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/KernelScheduler.java

@@ -77,7 +77,7 @@

    @Scheduled(cron = "0/1 * * * * ? ")
    private void startupBus() throws InterruptedException {
//        if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
        if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
        if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) { return; }
        List<Bus> busList = busService.selectInSts(BusStsType.RECEIVE, BusStsType.PROGRESS);
        for (Bus bus : busList) {
@@ -88,6 +88,7 @@

    @Scheduled(cron = "0/1 * * * * ? ")
    private void calculateSeg() throws InterruptedException {
        if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
        if (!this.lock.tryLock(LOCK_TIMEOUT, TimeUnit.SECONDS)) { return; }
        List<Task> taskList = taskService.selectBySts(TaskStsType.WAITING);