From 2f150bb974c99666228a9f443e84241c238db3e0 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期四, 14 九月 2023 16:37:19 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MapController.java | 179 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 118 insertions(+), 61 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 5bcad57..95a542e 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -44,11 +44,23 @@
break;
case 2:
case 3:
+ mapFilename = "DTBnode.json";
+ locMasts = locMastService.selectNodeBLocByLev(lev);
+ break;
case 4:
+ mapFilename = "DTCnode.json";
+ locMasts = locMastService.selectNodeCLocByLev(lev);
+ break;
case 5:
mapFilename = "DTDnode.json";
- locMasts = locMastService.selectNodeLocByLev(lev);
+ locMasts = locMastService.selectNodeDLocByLev(lev);
break;
+ case 6:
+ mapFilename = "DTEnode.json";
+ locMasts = locMastService.selectNodeELocByLev(lev);
+ break;
+
+
}
String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
// File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
@@ -85,6 +97,7 @@
for (LocMast locMast : locMasts) {
+
Integer row = locMast.getRow1();
Integer bay = locMast.getBay1();
@@ -99,77 +112,121 @@
break;
case 2:
case 3:
- case 4:
- case 5:
- if (bay % 7 == 0) {
- bay=bay+1;
+// if (row<=3 || row>=5){
+// if (row%1==0){
+// row=row+(row/1)-1;
+// }else {
+// row=row+((row+1)/1)-1;
+// }
+// }else {
+// if (row%2==0){
+// row=row+(row/2);
+// }else {
+// row=row+((row-1)/2);
+// }
+// }
+// if (row == 9){
+// row= row -1;
+// }
+
+ if (row ==7) {
+ row=row+2;
}else{
- if (bay>7){
- bay=bay+locMast.getCrnNo();
+ if (row>7){
+ row=row+locMast.getCrnNo()+1;
}else {
- bay=bay+locMast.getCrnNo()-1;
+ row=row+locMast.getCrnNo()-1;
}
}
- if (row == 3){
- row = row +1;
- } else if (row == 5) {
- row = row+2;
- } else if (row ==8) {
- row = row+3;
- }
- else if (row ==10) {
- row = row+4;
- }
- else if (row ==13) {
- row = row+5;
- }else if (row ==14) {
- row = row+6;
- }else {
- if (row >3){
- row = row +1;
- }
- if (row > 5){
- row = row +1;
- }
- if (row > 8){
- row = row +1;
- }
- if (row > 10){
- row = row +1;
- }
- if (row > 13){
- row = row +1;
- }
- if (row > 14){
- row = row +1;
+ break;
+ case 4:
+// if (row<=11){
+//// if (row%2==0){
+//// row=row+(row/2)-1;
+//// }else {
+//// row=row+((row+1)/2)-1;
+//// }
+//// }else {
+//// if (row%2==0){
+//// row=row+(row/2);
+//// }else {
+//// row=row+((row-1)/2);
+//// }
+//// }
+
+ if (row % 10 == 0) {
+ row=row+2;
+ }else{
+ if (row>10){
+ row=row+locMast.getCrnNo()+1;
+ }else {
+ row=row+locMast.getCrnNo()-1;
}
}
+ break;
+ case 5:
+// if (row<=11){
+// if (row%2==0){
+// row=row+(row/2)-1;
+// }else {
+// row=row+((row+1)/2)-1;
+// }
+// }else {
+// if (row%2==0){
+// row=row+(row/2);
+// }else {
+// row=row+((row-1)/2);
+// }
+// }
+
+ if (row % 7 == 0) {
+ row=row+2;
+ }else{
+ if (row>7){
+ row=row+locMast.getCrnNo()+1;
+ }else {
+ row=row+locMast.getCrnNo()-1;
+ }
+ }
+ break;
}
- if (area == 1){
- ArrayList rowData = arrayLists.get(row);
- Object o = rowData.get(bay);
- JSONObject jsonObject = JSON.parseObject(o.toString());
- jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
- jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
- //jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
- //鏇存柊list
- rowData.set(bay, jsonObject);
- arrayLists.set(row, rowData);
- }else {
- ArrayList rowData = arrayLists.get(bay);
- Object o = rowData.get(row);
- JSONObject jsonObject = JSON.parseObject(o.toString());
- jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
- jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
- //jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
- //鏇存柊list
- rowData.set(row, jsonObject);
- arrayLists.set(bay, rowData);
- }
+ ArrayList rowData = arrayLists.get(row);
+ Object o = rowData.get(bay);
+ JSONObject jsonObject = JSON.parseObject(o.toString());
+ jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
+ jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
+ //jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
+ //鏇存柊list
+ rowData.set(bay, jsonObject);
+ arrayLists.set(row, rowData);
+
+
+
+// if (area == 1 || area == 6){
+// ArrayList rowData = arrayLists.get(row);
+// Object o = rowData.get(bay);
+// JSONObject jsonObject = JSON.parseObject(o.toString());
+// jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
+// jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
+// //jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
+// //鏇存柊list
+// rowData.set(bay, jsonObject);
+// arrayLists.set(row, rowData);
+// }else {
+// ArrayList rowData = arrayLists.get(bay);
+// Object o = rowData.get(row);
+// JSONObject jsonObject = JSON.parseObject(o.toString());
+// jsonObject.put("locNo", locMast.getLocNo());//璁剧疆搴撲綅鍙�
+// jsonObject.put("locSts", locMast.getLocSts());//搴撲綅鐘舵��
+// //jsonObject.put("locSts$", locMast.getLocSts$());//搴撲綅鐘舵��
+// //鏇存柊list
+// rowData.set(row, jsonObject);
+// arrayLists.set(bay, rowData);
+// }
--
Gitblit v1.9.1