From 1e400eaffd9de4dc13c6b45cf6b805a3b26da3c0 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 11 十二月 2024 16:47:50 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 75 +++++++------------------------------
1 files changed, 14 insertions(+), 61 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 a0769c3..59dae6c 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,7 @@
import java.util.Date;
import java.util.List;
-import java.util.Objects;
+import java.util.Optional;
/**
* judge whether agv go to funcSta which be charging or standby
@@ -36,6 +37,8 @@
private FuncStaService funcStaService;
@Autowired
private MainService mainService;
+ @Autowired
+ private MainLockWrapService mainLockWrapService;
@Autowired
private TaskService taskService;
@Autowired
@@ -78,7 +81,7 @@
continue;
}
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
+ mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_CHARGE, null, null);
}
}
}
@@ -124,19 +127,24 @@
)) {
continue;
}
- // the time between the latest task and now that be must more that 10 seconds
+ // 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(latestTask.getUpdateTime(), new Date());
+ long seconds = DateUtils.diffToSeconds(
+ Optional.ofNullable(latestTask.getEndTime()).orElse(latestTask.getUpdateTime())
+ , new Date()
+ );
if (seconds < intervalOfAutoStandby) { continue; }
}
+ } else {
+ continue;
}
// }
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
+ mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_STANDBY, null, null);
}
}
@@ -144,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