From ba8d5c8630cf85ced6b4615466140956f1f70764 Mon Sep 17 00:00:00 2001
From: lfdMem <1>
Date: 星期一, 10 三月 2025 08:12:55 +0800
Subject: [PATCH] #
---
license.lic | 0
src/main/java/com/zy/asrs/utils/Utils.java | 43 +++++++++++++++++++++++++++++++++----------
src/main/java/com/zy/asrs/controller/MobileController.java | 5 +++--
src/main/resources/license.lic | 0
src/main/resources/application.yml | 6 +++---
5 files changed, 39 insertions(+), 15 deletions(-)
diff --git a/license.lic b/license.lic
index 22364dc..a50d7bf 100644
--- a/license.lic
+++ b/license.lic
Binary files differ
diff --git a/src/main/java/com/zy/asrs/controller/MobileController.java b/src/main/java/com/zy/asrs/controller/MobileController.java
index 6a9a1e9..aabf195 100644
--- a/src/main/java/com/zy/asrs/controller/MobileController.java
+++ b/src/main/java/com/zy/asrs/controller/MobileController.java
@@ -213,9 +213,10 @@
}
@RequestMapping("/comb/auth")
- @ManagerAuth(memo = "缁勬墭")
+// @ManagerAuth(memo = "缁勬墭")
public R comb(@RequestBody CombParam combParam){
- mobileService.comb(combParam, getUserId());
+// mobileService.comb(combParam, getUserId());
+ mobileService.comb(combParam, 9999L);
return R.ok("缁勬墭鎴愬姛");
}
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;
}
diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
index a878258..f15ea57 100644
--- a/src/main/resources/application.yml
+++ b/src/main/resources/application.yml
@@ -10,10 +10,10 @@
enabled: false
datasource:
driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-# url: jdbc:sqlserver://192.168.4.191:1433;databasename=integrationasrs
+# url: jdbc:sqlserver://127.0.0.1:1433;databasename=lfdasrsMem
# username: sa
# password: sa@123
- url: jdbc:sqlserver://192.168.4.191:50948;databasename=source
+ url: jdbc:sqlserver://192.168.0.17:1433;databasename=lfdasrsMem
username: sa
password: sa@123
# url: jdbc:sqlserver://127.0.0.1:51433;databasename=source
@@ -45,7 +45,7 @@
#License鐩稿叧閰嶇疆
license:
- subject: integrationasrs
+ subject: lfdasrsMem
publicAlias: publicCert
storePass: public_zhongyang_123456789
licensePath: license.lic
diff --git a/src/main/resources/license.lic b/src/main/resources/license.lic
index 22364dc..a50d7bf 100644
--- a/src/main/resources/license.lic
+++ b/src/main/resources/license.lic
Binary files differ
--
Gitblit v1.9.1