From 5bcf86d0b2793dfebe53c575853725e49fb3d230 Mon Sep 17 00:00:00 2001
From: lsh <lsh@163.com>
Date: 星期四, 24 十月 2024 11:18:47 +0800
Subject: [PATCH] *
---
src/main/java/com/zy/asrs/utils/Utils.java | 107 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 74 insertions(+), 33 deletions(-)
diff --git a/src/main/java/com/zy/asrs/utils/Utils.java b/src/main/java/com/zy/asrs/utils/Utils.java
index b8b092e..07f4084 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -60,26 +60,36 @@
}
/**
- * 鍒ゆ柇鏄惁涓烘祬搴撲綅
+ * 鍒ゆ柇鏄惁涓烘祬搴撲綅 骞跺瓨鍦ㄦ繁搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, String locNo) {
if (slaveProperties.isDoubleDeep()) {
int row = getRow(locNo);
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
+ if (!slaveProperties.getDoubleLocs().contains(row)){
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ if (deepLocLeft){
+ return true;
+ }
+ return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
+ }
}
+ return false;
}
/**
* 鍒ゆ柇鏄惁涓烘祬搴撲綅
*/
- public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row){
+ public static boolean isShallowLoc(SlaveProperties slaveProperties, Integer row) {
if (slaveProperties.isDoubleDeep()) {
- return !slaveProperties.getDoubleLocs().contains(row);
- } else {
- return false;
+ if (!slaveProperties.getDoubleLocs().contains(row)){
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ if (deepLocLeft){
+ return true;
+ }
+ return isDeepLocRight(slaveProperties, row+1);//鍒ゆ柇鏄惁涓哄彸娴呭簱浣�
+ }
}
+ return false;
}
/**
@@ -87,8 +97,8 @@
*/
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);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+ int shallowRow = deepLocLeft? (row + 1) : (row - 1);
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -96,41 +106,72 @@
* 鑾峰彇 娣卞簱浣嶆帓瀵瑰簲鐨勬祬搴撲綅鎺�
*/
public static Integer getShallowRow(SlaveProperties slaveProperties, Integer deepRow) {
- int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
- return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
+// int remainder = (int) Arith.remainder(deepRow, slaveProperties.getGroupCount());
+// return remainder == 1 ? (deepRow + 1) : (deepRow - 1);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, deepRow);//鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+ return deepLocLeft ? (deepRow + 1) : (deepRow - 1);
+ }
+
+ /**
+ * 鍒ゆ柇鏄惁涓哄乏娣卞簱浣�
+ */
+ public static boolean isDeepLocLeft(SlaveProperties slaveProperties, Integer row) {
+ if (slaveProperties.isDoubleDeep()) {
+ return slaveProperties.getDoubleLocsLeft().contains(row);
+ } else {
+ return false;
+ }
+ }
+
+
+ /**
+ * 鍒ゆ柇鏄惁涓哄彸娣卞簱浣�
+ */
+ public static boolean isDeepLocRight(SlaveProperties slaveProperties, Integer row) {
+ if (slaveProperties.isDoubleDeep()) {
+ return slaveProperties.getDoubleLocsRight().contains(row);
+ } else {
+ return false;
+ }
}
/**
* 鑾峰彇 娴呭簱浣嶅搴旂殑娣卞簱浣嶅彿
*/
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);
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);
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, row-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ int shallowRow = deepLocLeft? (row - 1) : (row + 1);
+ return zerofill(String.valueOf(shallowRow), 2) + shallowLoc.substring(2);
}
/**
* 鑾峰彇 娴呭簱浣嶆帓瀵瑰簲鐨勬繁搴撲綅鎺�
*/
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 {
- throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
- }
- return targetRow;
+// int remainder = (int) Arith.remainder(shallowRow, slaveProperties.getGroupCount());
+// int targetRow;
+// if (remainder == 2) {
+// targetRow = shallowRow - 1;
+// } else if (remainder == 3) {
+// targetRow = shallowRow + 1;
+// } else {
+// throw new RuntimeException(shallowRow + "涓嶆槸娴呭簱浣嶆帓锛岀郴缁熺箒蹇�");
+// }
+// return targetRow;
+ boolean deepLocLeft = isDeepLocLeft(slaveProperties, shallowRow-1);//鍒ゆ柇鏄惁涓哄乏娴呭簱浣�
+ return deepLocLeft? (shallowRow - 1) : (shallowRow + 1);
}
/**
--
Gitblit v1.9.1