From ba8d5c8630cf85ced6b4615466140956f1f70764 Mon Sep 17 00:00:00 2001
From: lfdMem <1>
Date: 星期一, 10 三月 2025 08:12:55 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 43 +++++++++++++++++++++++++++++++++----------
1 files changed, 33 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 4ead5ce..816a012 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -123,9 +123,17 @@
*/
public static String getShallowLoc(SlaveProperties slaveProperties, String deepLoc) {
int row = getRow(deepLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
- int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
- return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, row);
+ int targetRow;
+ if (deepLocLeft) {
+ targetRow = row + 1;
+ } else if (deepLocRight) {
+ targetRow = row - 1;
+ } else {
+ throw new RuntimeException(deepLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ }
+ return zerofill(String.valueOf(targetRow), 2) + deepLoc.substring(2);
}
/**
@@ -141,30 +149,45 @@
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, row+1);
int targetRow;
- if (remainder == 2) {
+ if (deepLocLeft) {
targetRow = row - 1;
- } else if (remainder == 3) {
+ } else if (deepLocRight) {
targetRow = row + 1;
} else {
throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
}
+// public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
+// int row = getRow(shallowLoc);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+// int targetRow;
+// if (remainder == 2) {
+// targetRow = row - 1;
+// } else if (remainder == 3) {
+// targetRow = row + 1;
+// } else {
+// throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+// }
+// return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
+// }
/**
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);
+ boolean deepLocRight = isDeepLocRight(slaveProperties, shallowRow+1);
int targetRow;
- if (remainder == 2) {
+ if (deepLocLeft) {
targetRow = shallowRow - 1;
- } else if (remainder == 3) {
+ } else if (deepLocRight) {
targetRow = shallowRow + 1;
} else {
- throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
+ throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
return targetRow;
}
--
Gitblit v1.9.1