From 20b6f2ff40273e35431de96c2a30884de7bd1e86 Mon Sep 17 00:00:00 2001
From: Junjie <xjj@123>
Date: 星期四, 05 六月 2025 10:29:28 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/utils/Utils.java | 36 ++++++++++++++++++++++++------------
1 files changed, 24 insertions(+), 12 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index 36a0324..b5cf43c 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -87,8 +87,15 @@
*/
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);
+// int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+ int shallowRow ;
+ if(row==31){
+ shallowRow = row + 1;
+ }else if(row==34){
+ shallowRow = row - 1;
+ }else {
+ return null;
+ }
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -105,14 +112,16 @@
*/
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 + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
+ switch (row){
+ case 32:
+ targetRow = 31;
+ break;
+ case 33:
+ targetRow = 34;
+ break;
+ default:
+ throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
return zerofill(String.valueOf(targetRow), 2) + shallowLoc.substring(2);
}
@@ -121,11 +130,11 @@
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
public static Integer getDeepRow(SlaveProperties slaveProperties, Integer shallowRow) {
- int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
+// int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
int targetRow;
- if (remainder == 2) {
+ if (shallowRow == 32) {
targetRow = shallowRow - 1;
- } else if (remainder == 3) {
+ } else if (shallowRow == 33) {
targetRow = shallowRow + 1;
} else {
throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
@@ -164,6 +173,9 @@
public static void main(String[] args) {
SlaveProperties slaveProperties = new SlaveProperties();
slaveProperties.setDoubleDeep(true);
+
+ String aa = getDeepLoc(slaveProperties,"1604402");
+
List<Integer> list = new ArrayList<>();
list.add(1);list.add(4);list.add(5);list.add(8);list.add(9);list.add(12);
slaveProperties.setDoubleLocs(list);
--
Gitblit v1.9.1