From 6828e790d254dd44162ff245025f7903def395be Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 十一月 2024 13:52:02 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 105 +++++++++++++++++++++++++++-------------------------
1 files changed, 55 insertions(+), 50 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 277b7de..1095e24 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
@@ -155,60 +155,65 @@
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());
+ if (null == agv) {
+ beIdle = false;
+ } else {
+ 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;
+ 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;
+ 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;
+ }
}
+
if (beIdle) {
funcSta.setState(FuncStaStateType.IDLE.toString());
funcSta.setUpdateTime(new Date());
--
Gitblit v1.9.1