From 80f5003a640db7795d69c5e3a73caa685c289b80 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期三, 14 一月 2026 16:27:38 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/MaintainScheduler.java | 20 ++++++++++----------
1 files changed, 10 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 59dae6c..4ee2c04 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
@@ -53,8 +53,8 @@
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus()) {
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
+ if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus()) {
continue;
}
if (agvDetail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
@@ -81,7 +81,7 @@
continue;
}
- mainLockWrapService.buildMinorTask(agv, TaskTypeType.TO_CHARGE, null, null);
+ mainLockWrapService.buildMinorTask(agv.getId(), TaskTypeType.TO_CHARGE, null, null);
}
}
}
@@ -95,17 +95,17 @@
List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
for (Agv agv : agvList) {
AgvDetail agvDetail = agvDetailService.selectByAgvId(agv.getId());
- AgvModel agvModel = agvModelService.getById(agv.getAgvModel());
- if (null == agvDetail || null == agvDetail.getVol() || null == agvDetail.getAgvStatus() || null == agvDetail.getRecentCode()) {
+ AgvModel agvModel = agvModelService.getByAgvId(agv.getId());
+ if (null == agvDetail || null == agvDetail.getSoc() || null == agvDetail.getAgvStatus() || null == agvDetail.getRecentCode()) {
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()) {
+ if (agvDetail.getSoc() < agvModel.getQuaBattery()) {
continue;
}
}
@@ -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