#

vincentlu

4 天以前 d125cd985d5c09bbbc0b9b9757d7ee2f0d1ab56f

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

@@ -153,10 +153,10 @@
    }

    @Scheduled(cron = "0/3 * * * * ? ")
    private void reportTaskToUplink(){
    private void reportTaskToUplink() {
        if (!uplinkProperties.getEnabled()) { return; }
        List<Task> taskList = taskService.list(new LambdaQueryWrapper<Task>()
                .eq(Task::getUplinkSts, TaskUplinkStateType.PENDING.toString())
                .in(Task::getUplinkSts, TaskUplinkStateType.PENDING.toString(), TaskUplinkStateType.FAILED.toString())
                .eq(Task::getTaskSts, TaskStsType.COMPLETE.val())
        );
        if (Cools.isEmpty(taskList)) { return; }
@@ -164,17 +164,17 @@
            boolean finished = taskReportService.reportFinished(task);
            if (finished) {
                task.setUplinkSts(TaskUplinkStateType.SUCCESS.toString());

            } else {
                log.error("failed to report task to uplink: {}", task.getSeqNum());
                task.setUplinkSts(TaskUplinkStateType.FAILED.toString());

            }
            taskService.updateById(task);
        }

    }

    @Scheduled(cron = "0/5 * * * * ? ")
    private synchronized void releaseFuncSta(){
    private synchronized void releaseFuncSta() {
        List<FuncSta> funcStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>().eq(FuncSta::getState, FuncStaStateType.OCCUPIED.toString()));
        for (FuncSta funcSta : funcStaList) {
            boolean beIdle = funcStaService.isCanBeIdle(funcSta);