From 442fce2fa9c6d8d4fe7b1f2a22d66c03b07975e5 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期二, 14 五月 2024 17:07:25 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 29 +++++++++++++++++++++++------
1 files changed, 23 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index bc2d9d3..d5f4367 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -51,7 +51,7 @@
public String getMapData(@PathVariable("floor") Integer floor, @PathVariable("lev") Integer lev) {
//to do
- floor = 2;
+// floor = 2;
BasMap basMap = agvBasMapService.selectLatestMap(1,floor);
//瑙ｆ瀽json鍦板浘鏁版嵁
@@ -68,15 +68,19 @@
int x = bay;
int y = row;
//2妤�
+ if(floor == 1){
+ x = generateMap1Bay(bay);
+ }
+ //2妤�
if(floor == 2){
y = generateMap2Row(row);
//y = generateMap2Bay(bay);
}
////3妤�
- //if(floor == 3){
- // y = generateMap3Row(row);
- // x = generateMap3Bay(bay);
- //}
+ if(floor == 3){
+ y = generateMap3Row(row);
+// x = generateMap3Bay(bay);
+ }
ArrayList rowData = arrayLists.get(x);
Object o = rowData.get(y);
@@ -92,6 +96,18 @@
}
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 generateMap2Row(int row){
@@ -121,12 +137,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 >8) x += 9;
return x;
}
--
Gitblit v1.9.1