From adcfd92279f68d2353e2caa5522f71282f6e0943 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期三, 16 十月 2024 08:18:51 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 22 +++++++++-------------
1 files changed, 9 insertions(+), 13 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index ef6014f..03cb782 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -88,13 +88,13 @@
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow;
- if (row==9 || row==15){
- shallowRow=row+1;
- }else if (row==12 || row==18){
- shallowRow=row-1;
- }else {
- throw new RuntimeException(row + "涓嶆槸娣卞簱浣嶏紝绯荤粺绻佸繖");
+ int shallowRow ;
+ if (row == 15 || row == 9) {
+ shallowRow = row + 1;
+ } else if (row == 12 || row==18) {
+ shallowRow = row - 1;
+ } else {
+ throw new RuntimeException(row + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -119,7 +119,7 @@
} else if (row == 11 || row == 17) {
targetRow = row + 1;
} else {
- throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ throw new RuntimeException(row + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
}
return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
}
@@ -130,11 +130,7 @@
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 2) {
- targetRow = shallowRow - 1;
- } else if (remainder == 3) {
- targetRow = shallowRow + 1;
- } else if (shallowRow == 10 || shallowRow == 16) {
+ if (shallowRow == 10 || shallowRow == 16) {
targetRow = shallowRow - 1;
} else if (shallowRow == 11 || shallowRow == 17) {
targetRow = shallowRow + 1;
--
Gitblit v1.9.1