From 6224398d6ac2db27c33fb5a950cdab2b8e189814 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 10 十二月 2024 15:21:23 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/utils/RouteGenerator.java | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 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 f2c9b62..c3cad61 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
@@ -4,10 +4,10 @@
import com.zy.acs.manager.core.service.astart.CodeNodeType;
import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
import com.zy.acs.manager.manager.entity.Code;
-import com.zy.acs.manager.manager.entity.Route;
import com.zy.acs.manager.manager.service.CodeGapService;
import com.zy.acs.manager.manager.service.CodeService;
import com.zy.acs.manager.manager.service.RouteService;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
@@ -17,6 +17,7 @@
/**
* Created by vincent on 12/9/2024
*/
+@Slf4j
@Component
public class RouteGenerator {
@@ -29,8 +30,8 @@
@Autowired
private CodeGapService codeGapService;
- public List<Route> generateRoutes(String[][] codeMatrix) {
- List<Route> routes = new ArrayList<>();
+ public List<String> generateRoutes(String[][] codeMatrix) {
+ List<String> list = new ArrayList<>();
int rows = codeMatrix.length;
int cols = codeMatrix[0].length;
@@ -51,7 +52,11 @@
String rightCodeData = codeMatrix[i][j + 1];
if (!Cools.isEmpty(rightCodeData) && !CodeNodeType.NONE.val.equals(rightCodeData)) {
Code rightCode = codeService.selectByData(rightCodeData);
+ list.add(currCode.getData() + "-" + rightCode.getData());
routeService.createRouteByCode(currCode, rightCode, 0, null);
+ codeGapService.createCodeGapByCode(currCode, rightCode, null);
+
+ log.info(currCode.getData() + "-" + rightCode.getData() + " [finished]");
}
}
@@ -60,13 +65,17 @@
String bottomCodeData = codeMatrix[i + 1][j];
if (!Cools.isEmpty(bottomCodeData) && !CodeNodeType.NONE.val.equals(bottomCodeData)) {
Code bottomCode = codeService.selectByData(bottomCodeData);
+ list.add(currCode.getData() + "-" + bottomCode.getData());
routeService.createRouteByCode(currCode, bottomCode, 0, null);
+ codeGapService.createCodeGapByCode(currCode, bottomCode, null);
+
+ log.info(currCode.getData() + "-" + bottomCode.getData() + " [finished]");
}
}
}
}
- return routes;
+ return list;
}
--
Gitblit v1.9.1