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, 10 insertions(+), 113 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 33b65bc..826b77e 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,95 +78,15 @@
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 (bay % 6 == 0) {
- bay=bay+1;
- }else{
- if (bay>6){
- bay=bay+locMast.getCrnNo();
- }else {
- bay=bay+locMast.getCrnNo()-1;
- }
- }
- break;
- case 4:
- 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 (bay % 7 == 0) {
- bay=bay+1;
- }else{
- if (bay>7){
- bay=bay+locMast.getCrnNo();
- }else {
- bay=bay+locMast.getCrnNo()-1;
- }
- }
- break;
-
-
-
- }
-
- 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);
- }
-
-
+ 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);
}
--
Gitblit v1.9.1