From 3b41d1fa6a657f4785ac03aab864da45b9ef274f Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期六, 09 九月 2023 15:06:01 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/controller/MapController.java | 173 +++++++++++++++++++++++++--------------------------------
1 files changed, 75 insertions(+), 98 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 95a542e..586b525 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -11,7 +11,6 @@
import com.zy.asrs.utils.Utils;
import com.zy.common.web.BaseController;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.core.io.ClassPathResource;
import org.springframework.web.bind.annotation.*;
import java.io.*;
@@ -38,30 +37,8 @@
String mapFilename = "map.json";
// String fileName ="file:" + new ClassPathResource(mapFilename).getPath();
//鑾峰彇褰撳墠妤煎眰搴撲綅鏁版嵁
- List<LocMast> locMasts = locMastService.selectLocByLev(lev);
- switch (area){
- case 1:
- 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.selectNodeDLocByLev(lev);
- break;
- case 6:
- mapFilename = "DTEnode.json";
- locMasts = locMastService.selectNodeELocByLev(lev);
- break;
+ 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");
File file = new File(fileName);
@@ -101,46 +78,71 @@
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;
+// 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+((row+1)/1)-1;
-// }
-// }else {
-// if (row%2==0){
-// row=row+(row/2);
-// }else {
-// row=row+((row-1)/2);
+// row=row+locMast.getCrnNo()-1;
// }
// }
-// 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){
+// 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 {
@@ -153,46 +155,21 @@
//// 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;
+//
+// if (row % 7 == 0) {
+// row=row+2;
+// }else{
+// if (row>7){
+// row=row+locMast.getCrnNo()+1;
// }else {
-// row=row+((row+1)/2)-1;
-// }
-// }else {
-// if (row%2==0){
-// row=row+(row/2);
-// }else {
-// row=row+((row-1)/2);
+// row=row+locMast.getCrnNo()-1;
// }
// }
-
- if (row % 7 == 0) {
- row=row+2;
- }else{
- if (row>7){
- row=row+locMast.getCrnNo()+1;
- }else {
- row=row+locMast.getCrnNo()-1;
- }
- }
- break;
-
-
-
- }
+// break;
+//
+//
+//
+// }
ArrayList rowData = arrayLists.get(row);
Object o = rowData.get(bay);
--
Gitblit v1.9.1