From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 77 ++++++--------------------------------
1 files changed, 13 insertions(+), 64 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
index 239ff50..d5b5c73 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java
+++ b/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.*;
@@ -16,7 +17,6 @@
import java.util.Date;
import java.util.List;
-import java.util.Objects;
import java.util.Optional;
/**
@@ -38,6 +38,8 @@
@Autowired
private MainService mainService;
@Autowired
+ private MainLockWrapService mainLockWrapService;
+ @Autowired
private TaskService taskService;
@Autowired
private ConfigService configService;
@@ -51,7 +53,7 @@
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus()) {
continue;
}
@@ -79,7 +81,7 @@
continue;
}
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
+ mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_CHARGE, null, null);
}
}
}
@@ -93,14 +95,14 @@
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus() || null == agvDetail.getRecentCode()) {
continue;
}
// low battery status, that need to go to charge
- if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
- continue;
- }
+// if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
+// continue;
+// }
// is charging ?
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
if (agvDetail.getVol() < agvModel.getQuaBattery()) {
@@ -137,10 +139,12 @@
);
if (seconds < intervalOfAutoStandby) { continue; }
}
+ } else {
+ continue;
}
// }
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
+ mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_STANDBY, null, null);
}
}
@@ -148,62 +152,7 @@
private synchronized void releaseFuncSta(){
List<FuncSta> funcStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>().eq(FuncSta::getState, FuncStaStateType.OCCUPIED.toString()));
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:
- if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
- beIdle = false;
- } else {
- Task latestTask = taskService.findLatestTask(agv.getId(), null);
- if (null != latestTask
- && latestTask.getTaskType().equals(TaskTypeType.TO_CHARGE.val())
- && latestTask.getDestCode().equals(funcSta.getCode())
- ) {
- // avoid the agv already be full battery but there was no task assign to it, so that not in charge status and battery had down
- if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
- beIdle = false;
- }
- }
- }
- if (0 < taskService.count(new LambdaQueryWrapper<Task>()
- .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());
- })
- )) {
- beIdle = false;
- }
- break;
- case STANDBY:
- Task latestTask = taskService.findLatestTask(agv.getId(), null);
- if (null != latestTask
- && latestTask.getTaskType().equals(TaskTypeType.TO_STANDBY.val())
- && latestTask.getDestCode().equals(funcSta.getCode())
- ) {
- beIdle = false;
- }
- if (0 < taskService.count(new LambdaQueryWrapper<Task>()
- .eq(Task::getTaskType, TaskTypeType.TO_STANDBY.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());
- })
- )) {
- beIdle = false;
- }
- break;
- default:
- break;
- }
+ boolean beIdle = funcStaService.isCanBeIdle(funcSta);
if (beIdle) {
funcSta.setState(FuncStaStateType.IDLE.toString());
funcSta.setUpdateTime(new Date());
--
Gitblit v1.9.1