From 38e67bc036cbd9625bebd923c6754622c65f39fc Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期二, 18 三月 2025 10:46:25 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
index 3fc2bfb..09533ab 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DemoController.java
@@ -138,9 +138,11 @@
.eq(FuncSta::getType, FuncStaType.STANDBY.toString())
.orderByAsc(FuncSta::getId));
- List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().orderByAsc(Agv::getId));
+ List<Agv> agvList = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val).orderByAsc(Agv::getId));
- for (int i = 0; i < standbyFunStaList.size(); i++) {
+ int size = Math.min(standbyFunStaList.size(), agvList.size());
+
+ for (int i = 0; i < size; i++) {
FuncSta funcSta = standbyFunStaList.get(i);
Code code = codeService.getCacheById(funcSta.getCode());
@@ -200,9 +202,11 @@
// start
Collections.shuffle(list);
- List<Agv> agvs = list.subList(0, count);
+ if (list.size() > count) {
+ list = list.subList(0, count);
+ }
int result = 0;
- for (Agv agv : agvs) {
+ for (Agv agv : list) {
patrolService.startupPatrol(agv.getUuid());
result++;
}
--
Gitblit v1.9.1