From 98670de02fde18c0aedaf349c0e165c59f57685b Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 05 五月 2026 10:42:43 +0800
Subject: [PATCH] 部分代码移到单独的类
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 44 ++++++++++++++++++++++----------------------
1 files changed, 22 insertions(+), 22 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 e63e83b..95337d9 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
@@ -69,19 +69,19 @@
if (0 < taskService.count(new LambdaQueryWrapper<Task>()
.eq(Task::getAgvId, agv.getId())
.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());
})
)) {
continue;
}
if (0 < segmentService.count(new LambdaQueryWrapper<Segment>()
- .eq(Segment::getAgvId, agv.getId())
- .and( i -> {
+ .eq(Segment::getAgvId, agv.getId())
+ .and( i -> {
// i.eq(Segment::getState, SegmentStateType.WAITING.toString()).or()
- i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
- })
+ i.eq(Segment::getState, SegmentStateType.RUNNING.toString());
+ })
)) {
continue;
}
@@ -126,28 +126,28 @@
if (0 < taskService.count(new LambdaQueryWrapper<Task>()
.eq(Task::getAgvId, agv.getId())
.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());
})
)) {
continue;
}
// 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(
- Optional.ofNullable(latestTask.getEndTime()).orElse(latestTask.getUpdateTime())
- , new Date()
- );
- if (seconds < intervalOfAutoStandby) { continue; }
- }
- } else {
- continue;
+ 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(
+ Optional.ofNullable(latestTask.getEndTime()).orElse(latestTask.getUpdateTime())
+ , new Date()
+ );
+ if (seconds < intervalOfAutoStandby) { continue; }
}
+ } else {
+ continue;
+ }
// }
mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_STANDBY, null, null);
--
Gitblit v1.9.1