From 70930071a49190f414c8d8bc9c9e9795a4096739 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 23 三月 2026 16:08:27 +0800
Subject: [PATCH] Merge branch 'refs/heads/rcs_master' into jdxaj
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/GuaranteeRuntimeService.java | 38 +++++++++++++++++---------------------
1 files changed, 17 insertions(+), 21 deletions(-)
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 c140426..ba553f3 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
@@ -12,6 +12,7 @@
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import com.zy.acs.common.utils.News;
import java.time.LocalDateTime;
import java.util.ArrayList;
@@ -25,26 +26,19 @@
@Autowired
private SegmentService segmentService;
-
- private final AgvService agvService;
- private final AgvDetailService agvDetailService;
- private final TaskService taskService;
- private final MainLockWrapService mainLockWrapService;
-
- public GuaranteeRuntimeService(AgvService agvService,
- AgvDetailService agvDetailService,
- TaskService taskService,
- MainLockWrapService mainLockWrapService) {
- this.agvService = agvService;
- this.agvDetailService = agvDetailService;
- this.taskService = taskService;
- this.mainLockWrapService = mainLockWrapService;
- }
+ @Autowired
+ private AgvService agvService;
+ @Autowired
+ private AgvDetailService agvDetailService;
+ @Autowired
+ private TaskService taskService;
+ @Autowired
+ private MainLockWrapService mainLockWrapService;
public void prepare(Guarantee plan, LocalDateTime targetTime) {
int requiredCount = plan.getRequiredCount() == null ? 0 : plan.getRequiredCount();
if (requiredCount <= 0) {
- log.warn("Guarantee[{}] requiredCount is not configured, skip", plan.getName());
+ News.warn("Guarantee[{}] requiredCount is not configured, skip", plan.getName());
return;
}
int minSoc = plan.getMinSoc();
@@ -70,7 +64,6 @@
}
}
if (available >= requiredCount) {
-// log.debug("Guarantee[{}] already has {} vehicles >= {}% SOC for {}", plan.getName(), available, minSoc, targetTime);
return;
}
int shortage = requiredCount - available; // 杩樺樊澶氬皯杈�
@@ -80,13 +73,13 @@
if (scheduled >= shortage) {
break;
}
- log.info("Guarantee[{}] schedule AGV {} charging (soc={}%) for target {}",
+ News.info("Guarantee[{}] schedule AGV {} charging (soc={}%) for target {}",
plan.getName(), candidate.getAgv().getName(), candidate.getSoc(), targetTime);
mainLockWrapService.buildMinorTask(candidate.getAgv().getId(), TaskTypeType.TO_CHARGE, null, null);
scheduled++;
}
if (scheduled < shortage) {
- log.warn("Guarantee[{}] still short of {} vehicles for {} (only {} idle low-soc AGVs)",
+ News.warn("Guarantee[{}] still short of {} vehicles for {} (only {} idle low-soc AGVs)",
plan.getName(), shortage - scheduled, targetTime, candidates.size());
}
}
@@ -96,6 +89,9 @@
return false;
}
if (detail.getAgvStatus() != null && detail.getAgvStatus().equals(AgvStatusType.CHARGE)) {
+ return false;
+ }
+ if (!agvService.judgeOnline(agv.getId())) {
return false;
}
@@ -132,7 +128,7 @@
try {
wrapper.eq(Agv::getAgvModel, Long.valueOf(plan.getScopeValue()));
} catch (NumberFormatException ignore) {
- log.warn("Guarantee[{}] invalid scopeValue {}", plan.getName(), plan.getScopeValue());
+ News.warn("Guarantee[{}] invalid scopeValue {}", plan.getName(), plan.getScopeValue());
}
}
return agvService.list(wrapper);
@@ -149,4 +145,4 @@
}
}
-}
+}
\ No newline at end of file
--
Gitblit v1.9.1