#

luxiaotao1123

2024-11-13 566392943866d7cf90ded0d5a67660caf51af022

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

@@ -4,6 +4,7 @@
import com.zy.acs.common.enums.AgvStatusType;
import com.zy.acs.common.utils.RedisSupport;
import com.zy.acs.framework.common.DateUtils;
import com.zy.acs.manager.core.service.MainLockWrapService;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
@@ -37,6 +38,8 @@
    private FuncStaService funcStaService;
    @Autowired
    private MainService mainService;
    @Autowired
    private MainLockWrapService mainLockWrapService;
    @Autowired
    private TaskService taskService;
    @Autowired
@@ -79,7 +82,7 @@
                    continue;
                }

                mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
                mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
            }
        }
    }
@@ -142,7 +145,7 @@
                }
//            }

            mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
            mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
        }
    }

@@ -152,11 +155,11 @@
        for (FuncSta funcSta : funcStaList) {
            boolean beIdle = true;
            Agv agv = agvService.findByPosition(funcSta.getCode());
            AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
            AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());

            switch (Objects.requireNonNull(FuncStaType.query(funcSta.getType()))) {
                case CHARGE:
                    AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
                    AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
                    if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
                        beIdle = false;
                    } else {
@@ -175,9 +178,9 @@
                            .eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
                            .eq(Task::getDestCode, funcSta.getCode())
                            .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());
                            })
                    )) {
                        beIdle = false;
@@ -196,8 +199,8 @@
                            .eq(Task::getDestCode, funcSta.getCode())
                            .and(i -> {
                                i.eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
                                .eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
                                .eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                                        .eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
                                        .eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
                            })
                    )) {
                        beIdle = false;
@@ -206,6 +209,7 @@
                default:
                    break;
            }

            if (beIdle) {
                funcSta.setState(FuncStaStateType.IDLE.toString());
                funcSta.setUpdateTime(new Date());