From 2d6cdc6d4a4feac22724b516ffbaec629896255c Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期四, 19 九月 2024 20:30:56 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 38 +++++++++++++++++++++++++++++++++++---
1 files changed, 35 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index 2ef1a0e..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);
@@ -67,6 +67,13 @@
int x = bay;
int y = row;
+ //2妤�
+ if(floor == 1 && lev == 1){
+ x = generateMap1Bay(bay);
+ }
+ if(floor == 1 && lev == 2){
+ y = generateMap4Row(row);
+ }
//2妤�
if(floor == 2){
y = generateMap2Row(row);
@@ -92,6 +99,31 @@
}
return JSONObject.toJSONString(arrayLists);
+ }
+ private Integer generateMap1Bay(int bay){
+ int y = bay;
+ Integer[] bayAdd = {1,3,5,7,9,11,13,15,17,19};
+ for(int i=0; i<bayAdd.length; i++){
+ if(bay > bayAdd[i]){
+ y ++;
+ }
+ }
+
+ return y;
+
+ }
+
+ 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){
@@ -121,13 +153,13 @@
private Integer generateMap3Row(int row){
int x = row;
- Integer[] rowAdd = {2,4,6,7,8,10,12,13,15,17,19,21,23,24,26,28,30,32};
+ Integer[] rowAdd = {2,4,6,8,10,12,14,15,17,19,21,22,24,26,28,30,32};
for(int i=0; i<rowAdd.length; i++){
if(row >= rowAdd[i]){
x ++;
}
}
- if(row >9) x += 9;
+ if(row >8) x += 9;
return x;
}
--
Gitblit v1.9.1