From 3977a00d2934317e9ed9add9714adc959a514790 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期三, 13 十一月 2024 08:13:35 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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..277b7de 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.*;
@@ -17,6 +18,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 +38,8 @@
private FuncStaService funcStaService;
@Autowired
private MainService mainService;
+ @Autowired
+ private MainLockWrapService mainLockWrapService;
@Autowired
private TaskService taskService;
@Autowired
@@ -78,7 +82,7 @@
continue;
}
- mainService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
+ mainLockWrapService.buildMinorTask(agv, agvDetail, TaskTypeType.TO_CHARGE, null);
}
}
}
@@ -124,19 +128,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, agvDetail, TaskTypeType.TO_STANDBY, null);
}
}
--
Gitblit v1.9.1