From 0628aaf9aa7c172cd5288f553ef045f8077ea9e4 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 12 十一月 2024 10:16:37 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 10 ++++++++--
1 files changed, 8 insertions(+), 2 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..26ddb08 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
@@ -17,6 +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
@@ -124,15 +125,20 @@
)) {
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;
}
// }
--
Gitblit v1.9.1