From 690dd92493026305c7aa12dfe34251e008317ac4 Mon Sep 17 00:00:00 2001
From: zjj <3272660260@qq.com>
Date: 星期二, 06 六月 2023 14:47:47 +0800
Subject: [PATCH] #平库地图完成
---
src/main/java/com/zy/asrs/controller/MapController.java | 43 +++++++++++++++++++++++++++++++++++++++++++
1 files changed, 43 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/asrs/controller/MapController.java b/src/main/java/com/zy/asrs/controller/MapController.java
index 3eb373d..7c47302 100644
--- a/src/main/java/com/zy/asrs/controller/MapController.java
+++ b/src/main/java/com/zy/asrs/controller/MapController.java
@@ -44,6 +44,9 @@
break;
case 2:
case 3:
+ mapFilename = "DTBnode.json";
+ locMasts = locMastService.selectNodeBLocByLev(lev);
+ break;
case 4:
mapFilename = "DTCnode.json";
locMasts = locMastService.selectNodeCLocByLev(lev);
@@ -52,6 +55,19 @@
mapFilename = "DTDnode.json";
locMasts = locMastService.selectNodeDLocByLev(lev);
break;
+ case 32:
+ mapFilename = "DTBnode.json";
+ locMasts = locMastService.selectNodeB2LocByLev(lev);
+ break;
+ case 42:
+ mapFilename = "DTCnode.json";
+ locMasts = locMastService.selectNodeC2LocByLev(lev);
+ break;
+ case 52:
+ mapFilename = "DTDnode.json";
+ locMasts = locMastService.selectNodeD2LocByLev(lev);
+ break;
+
}
String fileName = this.getClass().getClassLoader().getResource(mapFilename).getPath();//鑾峰彇鏂囦欢璺緞
// File file = new File("D:\\workspace\\zy-asrs\\src\\main\\resources\\map.json");
@@ -102,8 +118,35 @@
break;
case 2:
case 3:
+ case 32:
+ 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:
+ case 42:
+ case 52:
if (row<=11){
if (row%2==0){
row=row+(row/2)-1;
--
Gitblit v1.9.1