From 7f70cb15d035f0c233b9e62b9e43aa985317c908 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期一, 04 十一月 2024 10:22:45 +0800
Subject: [PATCH] #

---
 zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 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..53943f5 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
@@ -81,8 +81,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,13 +121,13 @@
             )) {
                 continue;
             }
-            // the time between the latest task and now that be must more that 20 minutes
+            // the time between the latest task and now that be must more that 10 seconds
             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; }
+                Task latestTask = taskService.findLatestTask(agv.getId(), null);
+                if (null != latestTask) {
+                    long seconds = DateUtils.diffToSeconds(latestTask.getUpdateTime(), new Date());
+                    if (seconds < intervalOfAutoStandby) { continue; }
                 }
             }
 

--
Gitblit v1.9.1