From 638392144f32a2346f513c671c4a3bf88a954479 Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期三, 17 四月 2024 23:29:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 55 +++++++++++++++++++++++--------------------------------
1 files changed, 23 insertions(+), 32 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index c05f34a..bc2d9d3 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -49,6 +49,10 @@
@GetMapping("/map/getData/{floor}/{lev}/auth")
@ManagerAuth
public String getMapData(@PathVariable("floor") Integer floor, @PathVariable("lev") Integer lev) {
+
+ //to do
+ floor = 2;
+
BasMap basMap = agvBasMapService.selectLatestMap(1,floor);
//瑙ｆ瀽json鍦板浘鏁版嵁
List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
@@ -63,16 +67,16 @@
int x = bay;
int y = row;
- //1妤�
- if(floor == 1){
- x = generateMap1Row(row);
- y = generateMap1Bay(bay);
+ //2妤�
+ if(floor == 2){
+ y = generateMap2Row(row);
+ //y = generateMap2Bay(bay);
}
- //3妤�
- if(floor == 3){
- y = generateMap3Row(row);
- x = generateMap3Bay(bay);
- }
+ ////3妤�
+ //if(floor == 3){
+ // y = generateMap3Row(row);
+ // x = generateMap3Bay(bay);
+ //}
ArrayList rowData = arrayLists.get(x);
Object o = rowData.get(y);
@@ -90,34 +94,21 @@
return JSONObject.toJSONString(arrayLists);
}
- private Integer generateMap1Row(int row){
- int x = 21-row;
- if(row > 1){
- 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};
+ for(int i=0; i<rowAdd.length; i++){
+ if(row > rowAdd[i]){
+ x ++;
+ }
}
- if(row > 3){
- x --;
- }
- if(row > 5){
- x --;
- }
- if(row > 7){
- x --;
- }
- if(row > 9){
- x --;
- }
- if(row > 10){
- x --;
- }
- if(row > 12){
- x --;
- }
+ if(row >20) x += 9;
+
return x;
}
- private Integer generateMap1Bay(int bay){
+ private Integer generateMap2Bay(int bay){
int y = bay;
if(y > 28){
y ++;
--
Gitblit v1.9.1