From 7ad79ee463adbdbc51e37c12ae025fb8598ab670 Mon Sep 17 00:00:00 2001
From: zyx <zyx123456>
Date: 星期日, 07 四月 2024 14:25:36 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MapController.java | 123 ----------------------------------------
1 files changed, 2 insertions(+), 121 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 8f10ea8..826b77e 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -34,10 +34,10 @@
@ManagerAuth
public String getMapData(@RequestParam Integer lev,@RequestParam Integer area) {
try {
- String mapFilename = "AMap.json";
+ String mapFilename = "map.json";
// String fileName ="file:" + new ClassPathResource(mapFilename).getPath();
//鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
- List<LocMast> locMasts = locMastService.selectNodeCLocByLev(lev);
+ List<LocMast> locMasts = locMastService.selectNodeLocByLev(lev);
String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
// File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
@@ -78,99 +78,6 @@
Integer row = locMast.getRow1();
Integer bay = locMast.getBay1();
-// switch (area){
-// case 1:
-// if (row % 4 == 0 || (row+1) % 4 == 0) {
-// row=row+locMast.getCrnNo();
-// }else{
-// row=row+locMast.getCrnNo()-1;
-// }
-// bay=32-bay;
-// break;
-// case 2:
-// case 3:
-//// 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 (row>7){
-// row=row+locMast.getCrnNo()+1;
-// }else {
-// row=row+locMast.getCrnNo()-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;
-//
-//
-//
-// }
-
ArrayList rowData = arrayLists.get(row);
Object o = rowData.get(bay);
JSONObject jsonObject = JSON.parseObject(o.toString());
@@ -180,32 +87,6 @@
//鏇存柊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