Merge branch 'refs/heads/rcs_master' into jdxaj

zhang

12 小时以前 70930071a49190f414c8d8bc9c9e9795a4096739

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

@@ -54,6 +54,7 @@

    @Scheduled(cron = "0/5 * * * * ? ")
    private synchronized void autoCharge(){
        if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
        for (Agv agv : agvList) {
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
@@ -94,6 +95,7 @@
    @Scheduled(cron = "0/1 * * * * ? ")
//    @Scheduled(cron = "0 */2 * * * ? ")
    private synchronized void autoStandby(){
        if (!configService.getVal("TaskAssignMode", Boolean.class)) { return; }
        if (!configService.getVal("automaticStandbyPosition", Boolean.class)) { return; }

        List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
@@ -153,28 +155,29 @@
    }

    @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())
                .isNotNull(Task::getBusId)
        );
        if (Cools.isEmpty(taskList)) { return; }
        for (Task task : taskList) {
            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);