部分代码移到单独的类

zhang

2 天以前 98670de02fde18c0aedaf349c0e165c59f57685b

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

@@ -7,7 +7,6 @@
import com.zy.acs.framework.common.DateUtils;
import com.zy.acs.manager.common.config.UplinkProperties;
import com.zy.acs.manager.core.integrate.wms.TaskReportService;
import com.zy.acs.manager.core.integrate.wms.FaultReportService;
import com.zy.acs.manager.core.service.MainLockWrapService;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
@@ -18,7 +17,6 @@
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;

import java.time.Instant;
import java.util.Date;
import java.util.List;
import java.util.Optional;
@@ -53,10 +51,6 @@
    private SegmentService segmentService;
    @Autowired
    private TaskReportService taskReportService;
    @Autowired
    private VehFaultRecService vehFaultRecService;
    @Autowired
    private FaultReportService faultReportService;

    @Scheduled(cron = "0/5 * * * * ? ")
    private synchronized void autoCharge(){
@@ -75,19 +69,19 @@
                if (0 < taskService.count(new LambdaQueryWrapper<Task>()
                        .eq(Task::getAgvId, agv.getId())
                        .and(i -> {
                                i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
                                .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
                                .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                            i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
                                    .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
                                    .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                        })
                )) {
                    continue;
                }
                if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
                        .eq(Segment::getAgvId, agv.getId())
                        .and( i -> {
                                .eq(Segment::getAgvId, agv.getId())
                                .and( i -> {
//                                i.eq(Segment::getState, SegmentStateType.WAITING.toString()).or()
                                i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
                        })
                                    i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
                                })
                )) {
                    continue;
                }
@@ -132,28 +126,28 @@
            if (0 < taskService.count(new LambdaQueryWrapper<Task>()
                    .eq(Task::getAgvId, agv.getId())
                    .and(i -> {
                            i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
                            .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
                            .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                        i.eq(Task::getTaskSts, TaskStsType.WAITING.val())
                                .or().eq(Task::getTaskSts, TaskStsType.ASSIGN.val())
                                .or().eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                    })
            )) {
                continue;
            }
            // the time between the latest task and now that be must more that @{param} seconds
//            if (!Optional.ofNullable((Boolean) redis.getObject(RedisConstant.AGV_TO_STANDBY_FLAG, agv.getUuid())).orElse(false)) {
                Integer intervalOfAutoStandby = configService.getVal("intervalOfAutoStandby", Integer.class);
                if (null != intervalOfAutoStandby && intervalOfAutoStandby > 0) {
                    Task latestTask = taskService.findLatestTask(agv.getId(), null);
                    if (null != latestTask) {
                        long seconds = DateUtils.diffToSeconds(
                                Optional.ofNullable(latestTask.getEndTime()).orElse(latestTask.getUpdateTime())
                                , new Date()
                        );
                        if (seconds < intervalOfAutoStandby) { continue; }
                    }
                } else {
                    continue;
            Integer intervalOfAutoStandby = configService.getVal("intervalOfAutoStandby", Integer.class);
            if (null != intervalOfAutoStandby && intervalOfAutoStandby > 0) {
                Task latestTask = taskService.findLatestTask(agv.getId(), null);
                if (null != latestTask) {
                    long seconds = DateUtils.diffToSeconds(
                            Optional.ofNullable(latestTask.getEndTime()).orElse(latestTask.getUpdateTime())
                            , new Date()
                    );
                    if (seconds < intervalOfAutoStandby) { continue; }
                }
            } else {
                continue;
            }
//            }

            mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_STANDBY, null, null);
@@ -197,23 +191,4 @@
        }
    }


    @Scheduled(cron = "0/3 * * * * ? ")
    private void reportFault() {
        String reportFaultUrl = configService.getVal("reportFaultUrl", String.class);
        if (Cools.isEmpty(reportFaultUrl)) { return; }
        List<VehFaultRec> vehFaultRecList = vehFaultRecService.list((new LambdaQueryWrapper<VehFaultRec>().eq(VehFaultRec::getState, VehFaultRecStateType.PENDING).ge(VehFaultRec::getHappenTime, Instant.now().minusSeconds(3))));
        if (Cools.isEmpty(vehFaultRecList)) { return; }
        for (VehFaultRec vehFaultRec : vehFaultRecList) {
            boolean finished = faultReportService.reportFinished(vehFaultRec,reportFaultUrl);
            if (finished) {
                vehFaultRec.setState(VehFaultRecStateType.REPORT_SUCCESS.name());
            } else {
                log.error("failed to report vehFaultRec to uplink");
                vehFaultRec.setState(VehFaultRecStateType.REPORT_FAILED.name());
            }
            vehFaultRecService.updateById(vehFaultRec);
        }

    }
}