From 1809dba25f489ea01c07a9ecc977d9f408545310 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期一, 05 一月 2026 09:41:49 +0800
Subject: [PATCH] 电压改电量
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java | 30 ++++++++++++++++++++++++------
1 files changed, 24 insertions(+), 6 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
index 8f6a78e..7f210e5 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/HandlerController.java
@@ -13,6 +13,7 @@
import com.zy.acs.manager.common.exception.BusinessException;
import com.zy.acs.manager.core.service.*;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
+import com.zy.acs.manager.core.service.astart.domain.DynamicNode;
import com.zy.acs.manager.manager.entity.*;
import com.zy.acs.manager.manager.enums.*;
import com.zy.acs.manager.manager.service.*;
@@ -87,10 +88,27 @@
@PostMapping("/patrol/batch/startup")
public synchronized R patrolBatchStartup() {
List<Agv> list = agvService.list(new LambdaQueryWrapper<Agv>().eq(Agv::getStatus, StatusType.ENABLE.val));
+ DynamicNode[][] dynamicMatrix = mapDataDispatcher.getDynamicMatrix(MapDataDispatcher.MAP_DEFAULT_LEV);
int result = 0;
for (Agv agv : list) {
- patrolService.startupPatrol(agv.getUuid());
- result++;
+ String agvNo = agv.getUuid();
+
+ boolean inMap = false;
+ label: for (int i = 0; i < dynamicMatrix.length; i++) {
+ for (int j = 0; j < dynamicMatrix[i].length; j++) {
+ DynamicNode dynamicNode = dynamicMatrix[i][j];
+ String vehicle = dynamicNode.getVehicle();
+ if (agvNo.equals(vehicle)) {
+ inMap = true;
+ break label;
+ }
+ }
+ }
+
+ if (inMap) {
+ patrolService.startupPatrol(agvNo);
+ result++;
+ }
}
return R.ok().add(result);
}
@@ -173,7 +191,7 @@
oriLoc = locService.getById(param.getStartLocNo());
}
if (!Cools.isEmpty(param.getStartLocNoStr())) {
- oriLoc = locService.selecatByLocNo(param.getStartLocNoStr());
+ oriLoc = locService.selectByLocNo(param.getStartLocNoStr());
}
if (null == oriLoc) {
return R.error();
@@ -192,7 +210,7 @@
destLoc = locService.getById(param.getEndLocNo());
}
if (!Cools.isEmpty(param.getEndLocNoStr())) {
- destLoc = locService.selecatByLocNo(param.getEndLocNoStr());
+ destLoc = locService.selectByLocNo(param.getEndLocNoStr());
}
if (null == destLoc) {
return R.error();
@@ -220,7 +238,7 @@
oriLoc = locService.getById(param.getStartLocNo());
}
if (!Cools.isEmpty(param.getStartLocNoStr())) {
- oriLoc = locService.selecatByLocNo(param.getStartLocNoStr());
+ oriLoc = locService.selectByLocNo(param.getStartLocNoStr());
}
if (null == oriLoc) {
return R.error();
@@ -286,7 +304,7 @@
destLoc = locService.getById(param.getEndLocNo());
}
if (!Cools.isEmpty(param.getEndLocNoStr())) {
- destLoc = locService.selecatByLocNo(param.getEndLocNoStr());
+ destLoc = locService.selectByLocNo(param.getEndLocNoStr());
}
if (null == destLoc) {
return R.error();
--
Gitblit v1.9.1