From 6c7c48a3aae8c15499fc087f8732c6964b857716 Mon Sep 17 00:00:00 2001
From: pang.jiabao <pang_jiabao@163.com>
Date: 星期四, 10 四月 2025 15:55:18 +0800
Subject: [PATCH] 界面翻译为俄语
---
src/main/java/com/zy/asrs/utils/Utils.java | 40 +++++++++++++++++++++++++++++++++-------
1 files changed, 33 insertions(+), 7 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..fa440ef 100644
--- a/src/main/java/com/zy/asrs/utils/Utils.java
+++ b/src/main/java/com/zy/asrs/utils/Utils.java
@@ -89,6 +89,13 @@
int row = getRow(deepLoc);
int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
int shallowRow = remainder == 1 ? (row + 1) : (row - 1);
+ if(row==9 || row==15 ){
+ shallowRow = row + 1;
+ }else if(row==12 || row==18 ){
+ shallowRow = row - 1;
+ }else {
+ return null;
+ }
return zerofill(String.valueOf(shallowRow), 2) + deepLoc.substring(2);
}
@@ -105,15 +112,31 @@
*/
public static String getDeepLoc(SlaveProperties slaveProperties, String shallowLoc) {
int row = getRow(shallowLoc);
- int remainder = (int) Arith.remainder(row, slaveProperties.getGroupCount());
+// 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 10:
+ targetRow = 9;
+ break;
+ case 11:
+ targetRow = 12;
+ break;
+ case 16:
+ targetRow = 15;
+ break;
+ case 17:
+ targetRow = 18;
+ break;
+ default:
+ throw new RuntimeException(shallowLoc + "涓嶆槸娴呭簱浣嶏紝绯荤粺绻佸繖");
}
+// 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);
}
@@ -164,6 +187,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