From 20aa51767d2bcc0baf30e1eee5ccce05ace9a6fe Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期六, 09 十一月 2024 14:07:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 29 +++++++++++++++++++----------
1 files changed, 19 insertions(+), 10 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 d8a2e0d..239ff50 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.common.utils.RedisSupport;
import com.zy.acs.framework.common.DateUtils;
import com.zy.acs.manager.core.service.MainService;
import com.zy.acs.manager.manager.entity.*;
@@ -16,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
@@ -24,6 +26,8 @@
@Slf4j
@Component
public class MaintainScheduler {
+
+ private final RedisSupport redis = RedisSupport.defaultRedisSupport;
@Autowired
private AgvService agvService;
@@ -81,8 +85,8 @@
}
-// @Scheduled(cron = "0/30 * * * * ? ")
- @Scheduled(cron = "0 */2 * * * ? ")
+ @Scheduled(cron = "0/1 * * * * ? ")
+// @Scheduled(cron = "0 */2 * * * ? ")
private synchronized void autoStandby(){
if (!configService.getVal("automaticStandbyPosition", Boolean.class)) { return; }
@@ -121,15 +125,20 @@
)) {
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; }
+ // 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; }
+ }
}
- }
+// }
mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_STANDBY, null);
}
--
Gitblit v1.9.1