From 5b238809dea2d47fd10670322977262934055fd9 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期五, 27 二月 2026 16:10:51 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/GuaranteeRuntimeService.java | 13 +++++++------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/GuaranteeScheduler.java | 2 +-
zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/GuaranteeScopeType.java | 10 ++++++++++
3 files changed, 18 insertions(+), 7 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/GuaranteeScheduler.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/GuaranteeScheduler.java
index 7440d7f..f260c14 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/GuaranteeScheduler.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/scheduler/GuaranteeScheduler.java
@@ -32,7 +32,7 @@
this.guaranteeRuntimeService = guaranteeRuntimeService;
}
- @Scheduled(cron = "0/1 * * * * ?")
+ @Scheduled(cron = "0/15 * * * * ?")
public void drive() {
if (!enabled) {
return;
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/GuaranteeRuntimeService.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/GuaranteeRuntimeService.java
index 1817ed4..4d3ca15 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/GuaranteeRuntimeService.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/GuaranteeRuntimeService.java
@@ -6,6 +6,7 @@
import com.zy.acs.manager.manager.entity.AgvDetail;
import com.zy.acs.manager.manager.entity.Guarantee;
import com.zy.acs.manager.manager.entity.Task;
+import com.zy.acs.manager.manager.enums.GuaranteeScopeType;
import com.zy.acs.manager.manager.enums.StatusType;
import com.zy.acs.manager.manager.enums.TaskStsType;
import com.zy.acs.manager.manager.enums.TaskTypeType;
@@ -46,12 +47,12 @@
log.warn("Guarantee[{}] requiredCount is not configured, skip", plan.getName());
return;
}
- int minSoc = plan.getMinSoc() == null ? 50 : plan.getMinSoc();
- List<Agv> scopedAgvs = findScopedAgvs(plan);
+ int minSoc = plan.getMinSoc();
+ List<Agv> scopedAgvList = findScopedAgvList(plan);
int available = 0;
List<ChargeCandidate> candidates = new ArrayList<>();
- for (Agv agv : scopedAgvs) {
- AgvDetail detail = agvDetailService.selectByAgvId(agv.getId());
+ for (Agv agv : scopedAgvList) {
+ AgvDetail detail = agvDetailService.selectMajorByAgvId(agv.getId());
if (detail == null || detail.getSoc() == null) {
continue;
}
@@ -103,10 +104,10 @@
return busyCount == 0;
}
- private List<Agv> findScopedAgvs(Guarantee plan) {
+ private List<Agv> findScopedAgvList(Guarantee plan) {
LambdaQueryWrapper<Agv> wrapper = new LambdaQueryWrapper<Agv>()
.eq(Agv::getStatus, StatusType.ENABLE.val);
- if ("MODEL".equalsIgnoreCase(plan.getScopeType()) && plan.getScopeValue() != null) {
+ if (GuaranteeScopeType.MODEL.toString().equalsIgnoreCase(plan.getScopeType()) && plan.getScopeValue() != null) {
try {
wrapper.eq(Agv::getAgvModel, Long.valueOf(plan.getScopeValue()));
} catch (NumberFormatException ignore) {
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/GuaranteeScopeType.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/GuaranteeScopeType.java
new file mode 100644
index 0000000..d8b01de
--- /dev/null
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/manager/enums/GuaranteeScopeType.java
@@ -0,0 +1,10 @@
+package com.zy.acs.manager.manager.enums;
+
+public enum GuaranteeScopeType {
+
+ NONE,
+ GLOBAL,
+ MODEL,
+ ;
+
+}
--
Gitblit v1.9.1