From 619b45d00468b35509f5138b2dfa5131e2963e34 Mon Sep 17 00:00:00 2001
From: whycq <10027870+whycq@user.noreply.gitee.com>
Date: 星期一, 25 三月 2024 13:16:39 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/AgvMapController.java | 46 ++++++++++++++++++++++------------------------
1 files changed, 22 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/AgvMapController.java b/src/main/java/com/zy/asrs/controller/AgvMapController.java
index defe628..b1f74bf 100644
--- a/src/main/java/com/zy/asrs/controller/AgvMapController.java
+++ b/src/main/java/com/zy/asrs/controller/AgvMapController.java
@@ -49,7 +49,7 @@
@GetMapping("/map/getData/{floor}/{lev}/auth")
@ManagerAuth
public String getMapData(@PathVariable("floor") Integer floor, @PathVariable("lev") Integer lev) {
- BasMap basMap = agvBasMapService.selectLatestMap(lev,floor);
+ BasMap basMap = agvBasMapService.selectLatestMap(1,floor);
//瑙ｆ瀽json鍦板浘鏁版嵁
List<ArrayList> arrayLists = JSON.parseArray(basMap.getData(), ArrayList.class);
@@ -58,31 +58,28 @@
List<AgvLocMast> locMasts = agvLocMastService.selectLocByLevAndFloor(lev,floor);
for (AgvLocMast locMast : locMasts) {
Integer row = locMast.getRow1();
- Integer bay = locMast.getBay1();
+ Integer bay = 34 - locMast.getBay1();
int x = bay;
int y = row;
- //1妤�
- if(floor == 1){
- x = generateMap1Row(row);
- y = generateMap1Bay(bay);
- }
- //3妤�
- if(floor == 3){
- y = generateMap3Row(row);
- x = generateMap3Bay(bay);
- }
-
+ ////1妤�
+ //if(floor == 1){
+ // x = generateMap1Row(row);
+ // y = generateMap1Bay(bay);
+ //}
+ ////3妤�
+ //if(floor == 3){
+ // y = generateMap3Row(row);
+ // x = generateMap3Bay(bay);
+ //}
ArrayList rowData = arrayLists.get(x);
Object o = rowData.get(y);
JSONObject jsonObject = JSON.parseObject(o.toString());
- if (DISABLE_LOC_NO.contains(locMast.getLocNo())) {
- //绂佹搴撲綅
- jsonObject.put("value", 10);//灏嗙鐢ㄥ簱浣嶈繘琛岃缃�
- }
+ jsonObject.put("value","0");
+
jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
//鏇存柊list
@@ -101,13 +98,13 @@
if(row > 3){
x --;
}
- if(row > 4){
+ if(row > 5){
x --;
}
- if(row > 6){
+ if(row > 7){
x --;
}
- if(row > 8){
+ if(row > 9){
x --;
}
if(row > 10){
@@ -133,7 +130,7 @@
private Integer generateMap3Row(int row){
int x = row;
- Integer[] rowAdd = {2,4,6,8,9,11,12,14,16,18,19,21,23,25,27,29,31,33};
+ Integer[] rowAdd = {2,4,6,7,8,10,12,13,15,17,19,21,23,24,26,28,30,32};
for(int i=0; i<rowAdd.length; i++){
if(row >= rowAdd[i]){
x ++;
@@ -143,9 +140,10 @@
}
private Integer generateMap3Bay(int bay){
- int y = 73-bay;
- if(bay >= 15) y --;
- if(bay >= 47) y --;
+ int y = 76-bay;
+ if(bay >= 18) y --;
+ if(bay >= 26) y --;
+ if(bay >= 50) y --;
return y;
}
--
Gitblit v1.9.1