From 1da336624f8928ecc382fc92dd9ada56fd932481 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 26 六月 2024 08:10:38 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index d5f4367..284fc10 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -53,7 +53,7 @@
//to do
// floor = 2;
- BasMap basMap = agvBasMapService.selectLatestMap(1,floor);
+ BasMap basMap = agvBasMapService.selectLatestMap(lev,floor);
//瑙ｆ瀽json鍦板浘鏁版嵁
List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
@@ -68,8 +68,11 @@
int x = bay;
int y = row;
//2妤�
- if(floor == 1){
+ if(floor == 1 && lev == 1){
x = generateMap1Bay(bay);
+ }
+ if(floor == 1 && lev == 2){
+ y = generateMap4Row(row);
}
//2妤�
if(floor == 2){
@@ -110,6 +113,19 @@
}
+ private Integer generateMap4Row(int row){
+ int x = row;
+ Integer[] rowAdd = {1,3,5,7,9,11,13,15,17,19,21};
+ for(int i=0; i<rowAdd.length; i++){
+ if(row > rowAdd[i]){
+ x ++;
+ }
+ }
+
+ return x;
+
+ }
+
private Integer generateMap2Row(int row){
int x = row;
Integer[] rowAdd = {2,4,6,7,8,10,12,13,15,17,19,20,22,24};
--
Gitblit v1.9.1