From 7c46678401674f3ce4ec1c6bfe304f0d868aa643 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期五, 28 二月 2025 15:27:25 +0800
Subject: [PATCH] 四期
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 42 +++++++++++++++++++++++++++++-------------
1 files changed, 29 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 8aaff06..f945e1b 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -62,20 +62,36 @@
//鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
List<AgvLocMast> locMasts = agvLocMastService.selectLocByLevAndFloor(lev, floor);
- List<AgvLocMast> distinctRow = agvLocMastService.selectDistinctLocByLevAndFloor(lev, floor);
- List<Integer> integers = new ArrayList<>();
+ List<AgvLocMast> distinctRow = new ArrayList<>();
+ List<Integer> rowIntegers = new ArrayList<>();
int min = 0;
int i =1;
- for (AgvLocMast locMast : distinctRow) {
- if (min > locMast.getMapRow1()) {
- min = locMast.getMapRow1();
- }
- if (locMast.getRightSide() == 1) {
- integers.add(i);
- }
- i++;
+ if (lev == 1 && floor == 1) {
+ distinctRow = agvLocMastService.selectDistinctLocByLevAndFloorMapbay1(lev, floor);
+ for (AgvLocMast locMast : distinctRow) {
+ if (min > locMast.getMapBay1()) {
+ min = locMast.getMapBay1();
+ }
+ if (locMast.getRightSide() == 1) {
+ rowIntegers.add(i);
+ }
+ i++;
+ }
+ } else {
+ distinctRow = agvLocMastService.selectDistinctLocByLevAndFloorMaprow1(lev, floor);
+ for (AgvLocMast locMast : distinctRow) {
+ if (min > locMast.getMapRow1()) {
+ min = locMast.getMapRow1();
+ }
+ if (locMast.getRightSide() == 1) {
+ rowIntegers.add(i);
+ }
+ i++;
+
+ }
}
+
for (AgvLocMast locMast : locMasts) {
Integer row = locMast.getMapRow1();
if (row < 0) {
@@ -88,11 +104,11 @@
int x = bay;
int y = row;
if (floor == 3) {
- y = generateMap3Row(integers, row);
+ y = generateMap3Row(rowIntegers, row);
} else if (floor == 1 && lev == 1) {
- x = generateMap1Bay(integers, bay);
+ x = generateMap1Bay(rowIntegers, bay);
} else {
- y = generateMap4Row(integers, row);
+ y = generateMap4Row(rowIntegers, row);
}
ArrayList rowData = arrayLists.get(x);
--
Gitblit v1.9.1