From bc64b3b45cf00885696aea4cfa97230390717012 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期二, 17 六月 2025 15:38:59 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 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 8927b6d..cd4cd7f 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
@@ -5,7 +5,7 @@
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.core.service.MainLxtService;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
@@ -36,7 +36,7 @@
@Autowired
private FuncStaService funcStaService;
@Autowired
- private MainService mainService;
+ private MainLxtService mainService;
@Autowired
private MainLockWrapService mainLockWrapService;
@Autowired
@@ -48,7 +48,7 @@
@Autowired
private SegmentService segmentService;
- @Scheduled(cron = "0/5 * * * * ? ")
+// @Scheduled(cron = "0/5 * * * * ? ")
private synchronized void autoCharge(){
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
for (Agv agv : agvList) {
@@ -81,13 +81,13 @@
continue;
}
- mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_CHARGE, null, null);
+ mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_CHARGE, null, null);
}
}
}
- @Scheduled(cron = "0/1 * * * * ? ")
+// @Scheduled(cron = "0/1 * * * * ? ")
// @Scheduled(cron = "0 */2 * * * ? ")
private synchronized void autoStandby(){
if (!configService.getVal("automaticStandbyPosition", Boolean.class)) { return; }
@@ -100,9 +100,9 @@
continue;
}
// low battery status, that need to go to charge
- if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
- continue;
- }
+// if (agvDetailService.isPowerLoss(agv, agvDetail, agvModel)) {
+// continue;
+// }
// is charging ?
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
if (agvDetail.getVol() < agvModel.getQuaBattery()) {
@@ -144,7 +144,7 @@
}
// }
- mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_STANDBY, null, null);
+ mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_STANDBY, null, null);
}
}
--
Gitblit v1.9.1