From f4afec78b16219f00bd9aee594e1676e3adb14e0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 30 十月 2024 13:53:43 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 51 ++++++++++++++++++++++++++++++++++-----------------
1 files changed, 34 insertions(+), 17 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 6f8f67f..c8ea055 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
@@ -2,6 +2,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.zy.acs.common.enums.AgvStatusType;
+import com.zy.acs.framework.common.DateUtils;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
@@ -17,7 +18,7 @@
import java.util.Objects;
/**
- * to judgement agv idle status when generate action !!!
+ * judge whether agv go to funcSta which be charging or standby
* Created by vincent on 2023/9/9
*/
@Slf4j
@@ -81,9 +82,10 @@
// @Scheduled(cron = "0/30 * * * * ? ")
@Scheduled(cron = "0 */2 * * * ? ")
- private void autoStandby(){
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ private synchronized void autoStandby(){
+ if (!configService.getVal("automaticStandbyPosition", 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());
AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
@@ -117,6 +119,15 @@
})) > 0) {
continue;
}
+ // the time between the latest task and now that be must more that 20 minutes
+ Integer intervalOfAutoStandby = configService.getVal("intervalOfAutoStandby", Integer.class);
+ if (null != intervalOfAutoStandby && intervalOfAutoStandby > 0) {
+ Task latestTask = taskService.findLatestTask(agv.getId(), TaskStsType.COMPLETE);
+ if (null != latestTask && !latestTask.getTaskType().equals(TaskTypeType.TO_CHARGE.val())) {
+ long minutes = DateUtils.diffToMinute(latestTask.getUpdateTime(), new Date());
+ if (minutes < intervalOfAutoStandby) { continue; }
+ }
+ }
mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
}
@@ -126,40 +137,46 @@
private synchronized void releaseFuncSta(){
List<FuncSta> funcStaList = funcStaService.list(new LambdaQueryWrapper<FuncSta>().eq(FuncSta::getState, FuncStaStateType.OCCUPIED.toString()));
for (FuncSta funcSta : funcStaList) {
- Agv agv = agvService.getById(funcSta.getAgvId());
boolean beIdle = true;
+ Agv agv = agvService.findByPosition(funcSta.getCode());
switch (Objects.requireNonNull(FuncStaType.query(funcSta.getType()))) {
- case CHARGE: // 鍏呯數
- for (AgvDetail agvDetail : agvDetailService.list(new LambdaQueryWrapper<AgvDetail>().eq(AgvDetail::getLastCode, funcSta.getCode()))) {
- if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
+ case CHARGE:
+ AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
+ 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())
+ ) {
beIdle = false;
- break;
}
}
if (taskService.count(new LambdaQueryWrapper<Task>()
.eq(Task::getTaskType, TaskTypeType.TO_CHARGE.val())
.eq(Task::getDestCode, funcSta.getCode())
- .eq(Task::getAgvId, agv.getId())
.and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.INIT.val()).or()
- .eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
+ i.eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
.eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
.eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
})) > 0) {
beIdle = false;
}
break;
- case STANDBY: // 寰呮満
- if (agvDetailService.count(new LambdaQueryWrapper<AgvDetail>().eq(AgvDetail::getCode, funcSta.getCode())) > 0) {
+ 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 (taskService.count(new LambdaQueryWrapper<Task>()
.eq(Task::getTaskType, TaskTypeType.TO_STANDBY.val())
.eq(Task::getDestCode, funcSta.getCode())
- .eq(Task::getAgvId, agv.getId())
.and(i -> {
- i.eq(Task::getTaskSts, TaskStsType.INIT.val()).or()
- .eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
+ i.eq(Task::getTaskSts, TaskStsType.WAITING.val()).or()
.eq(Task::getTaskSts, TaskStsType.ASSIGN.val()).or()
.eq(Task::getTaskSts, TaskStsType.PROGRESS.val());
})) > 0) {
@@ -173,7 +190,7 @@
funcSta.setState(FuncStaStateType.IDLE.toString());
funcSta.setUpdateTime(new Date());
if (!funcStaService.updateById(funcSta)) {
- log.error("FuncSta [{}] 鏇存柊鐘舵�佸け璐� 锛侊紒锛�", funcSta.getName());
+ log.error("FuncSta [{}] failed to be idle 锛侊紒锛�", funcSta.getName());
}
}
}
--
Gitblit v1.9.1