From fd6ce04219ee2341b01ac5b4018b0815bcbef371 Mon Sep 17 00:00:00 2001
From: LSH
Date: 星期五, 31 三月 2023 11:21:12 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 13 +++----------
1 files changed, 3 insertions(+), 10 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..5ddaadc 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -88,14 +88,7 @@
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 = remainder == 1 ? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -114,9 +107,9 @@
int row = getRow(shallowLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int targetRow;
- if (row == 10 || row == 16) {
+ if (remainder == 2) {
targetRow = row - 1;
- } else if (row == 11 || row == 17) {
+ } else if (remainder == 3) {
targetRow = row + 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
--
Gitblit v1.9.1