From ebd2f4397a92c6a5096de1b86d59154363344720 Mon Sep 17 00:00:00 2001
From: vincentlu <t1341870251@gmail.com>
Date: 星期二, 13 五月 2025 08:48:15 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/utils/RouteGenerator.java | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/utils/RouteGenerator.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/utils/RouteGenerator.java
index 7bf09fb..fd590c9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/utils/RouteGenerator.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/utils/RouteGenerator.java
@@ -41,6 +41,17 @@
}
}
+ public static String generateRouteCdaKey(int[] code0Cda, int[] code1Cda) {
+ if (Cools.isEmpty(code0Cda, code1Cda)) {
+ return null;
+ }
+ if (code0Cda[0] < code1Cda[0] || (code0Cda[0] == code1Cda[0] && code0Cda[1] < code1Cda[1])) {
+ return code0Cda[0] + "," + code0Cda[1] + "-" + code1Cda[0] + "," + code1Cda[1];
+ } else {
+ return code1Cda[0] + "," + code1Cda[1] + "-" + code0Cda[0] + "," + code0Cda[1];
+ }
+ }
+
public List<String> generateRoutes(String[][] codeMatrix) {
List<String> list = new ArrayList<>();
@@ -56,13 +67,13 @@
if (currentCodeData == null || CodeNodeType.NONE.val.equals(currentCodeData)) {
continue;
}
- Code currCode = codeService.selectByData(currentCodeData);
+ Code currCode = codeService.getCacheByData(currentCodeData);
// 妫�鏌ュ彸杈圭浉閭绘潯鐮�
if (j + 1 < cols) {
String rightCodeData = codeMatrix[i][j + 1];
if (!Cools.isEmpty(rightCodeData) && !CodeNodeType.NONE.val.equals(rightCodeData)) {
- Code rightCode = codeService.selectByData(rightCodeData);
+ Code rightCode = codeService.getCacheByData(rightCodeData);
list.add(currCode.getData() + "-" + rightCode.getData());
routeService.createRouteByCode(currCode, rightCode, 0, null);
codeGapService.createCodeGapByCode(currCode, rightCode, null);
@@ -75,7 +86,7 @@
if (i + 1 < rows) {
String bottomCodeData = codeMatrix[i + 1][j];
if (!Cools.isEmpty(bottomCodeData) && !CodeNodeType.NONE.val.equals(bottomCodeData)) {
- Code bottomCode = codeService.selectByData(bottomCodeData);
+ Code bottomCode = codeService.getCacheByData(bottomCodeData);
list.add(currCode.getData() + "-" + bottomCode.getData());
routeService.createRouteByCode(currCode, bottomCode, 0, null);
codeGapService.createCodeGapByCode(currCode, bottomCode, null);
--
Gitblit v1.9.1