From 459f341454ad32660d79ec59d5db08cba3588696 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十月 2024 16:18:42 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java | 85 +++++++++++++++++++++++++++---------------
1 files changed, 54 insertions(+), 31 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
index 708d4fb..0726ce5 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java
@@ -54,33 +54,23 @@
if (adjacencyCodeMap.getOrDefault(codeData, Collections.emptyList()).size() != 2) {
List<String> neighbors = adjacencyCodeMap.getOrDefault(codeData, Collections.emptyList());
for (String neighbor : neighbors) {
- // 浠呴亶鍘嗗害鏁颁负2涓旀湭琚闂殑閭诲眳
if (adjacencyCodeMap.getOrDefault(neighbor, Collections.emptyList()).size() == 2 && !visited.contains(neighbor)) {
Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- dfsCalc(neighbor, codeData, lane, visited, adjacencyCodeMap);
+ lane.getCodes().add(codeData); // 鍖呭惈璧风偣
+ dfsCalcIncludingEnd(codeData, neighbor, lane, visited, adjacencyCodeMap);
lanes.add(lane);
}
}
}
}
- // 澶勭悊搴︽暟涓�2涓旇繛鎺ヤ袱涓嫄寮偣鐨勮妭鐐癸紙鐙珛宸烽亾锛�
+ // 澶勭悊鐙珛鐨勫害鏁颁负2鐨勭幆璺垨鏈繛鎺ュ埌搴︽暟涓嶇瓑浜�2鐨勮妭鐐圭殑閮ㄥ垎
for (String codeData : codeDataList) {
if (adjacencyCodeMap.getOrDefault(codeData, Collections.emptyList()).size() == 2 && !visited.contains(codeData)) {
- List<String> neighbors = adjacencyCodeMap.getOrDefault(codeData, Collections.emptyList());
- boolean connectedToTwoTurningPoints = true;
- for (String neighbor : neighbors) {
- if (adjacencyCodeMap.getOrDefault(neighbor, Collections.emptyList()).size() == 2) {
- connectedToTwoTurningPoints = false;
- break;
- }
- }
- if (connectedToTwoTurningPoints) {
- Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- lane.getCodes().add(codeData);
- lanes.add(lane);
- visited.add(codeData);
- }
+ // 妫�鏌ユ槸鍚︿负鐜矾鐨勪竴閮ㄥ垎
+ Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ dfsCalcForLoop(codeData, null, lane, visited, adjacencyCodeMap);
+ lanes.add(lane);
}
}
@@ -89,19 +79,40 @@
return R.ok().add(lanes);
}
+ private void dfsCalcIncludingEnd(String start, String current, Lane lane, Set<String> visited, Map<String, List<String>> adjacencyCodeMap) {
+ // 娣诲姞褰撳墠鑺傜偣
+ lane.getCodes().add(current);
+ visited.add(current);
- private void dfsCalc(String code, String parent, Lane lane, Set<String> visited, Map<String, List<String>> adjacencyCodeMap) {
- // 妫�鏌ュ綋鍓嶈妭鐐圭殑搴︽暟鏄惁涓�2
- if (adjacencyCodeMap.getOrDefault(code, Collections.emptyList()).size() != 2) {
- // 涓嶅寘鍚嫄寮偣
+ List<String> neighbors = adjacencyCodeMap.getOrDefault(current, Collections.emptyList());
+ if (neighbors == null || neighbors.isEmpty()) {
return;
}
- // 鏍囪涓哄凡璁块棶骞跺姞鍏ュ贩閬�
- visited.add(code);
- lane.getCodes().add(code);
+ for (String neighbor : neighbors) {
+ if (neighbor.equals(start)) {
+ continue;
+ }
- List<String> neighbors = adjacencyCodeMap.get(code);
+ if (!visited.contains(neighbor)) {
+ int degree = adjacencyCodeMap.getOrDefault(neighbor, Collections.emptyList()).size();
+ if (degree == 2) {
+ if (isSameDirection(current, neighbor, start)) {
+ dfsCalcIncludingEnd(current, neighbor, lane, visited, adjacencyCodeMap);
+ }
+ } else {
+ // 缁堢偣鎴栨嫄寮偣锛屽寘鍚苟鍋滄
+ lane.getCodes().add(neighbor);
+ visited.add(neighbor);
+ }
+ }
+ }
+ }
+ private void dfsCalcForLoop(String current, String parent, Lane lane, Set<String> visited, Map<String, List<String>> adjacencyCodeMap) {
+ lane.getCodes().add(current);
+ visited.add(current);
+
+ List<String> neighbors = adjacencyCodeMap.getOrDefault(current, Collections.emptyList());
if (neighbors == null || neighbors.isEmpty()) {
return;
}
@@ -111,22 +122,27 @@
continue;
}
- if (adjacencyCodeMap.getOrDefault(neighbor, Collections.emptyList()).size() == 2 && !visited.contains(neighbor)) {
- // 妫�鏌ユ柟鍚戞槸鍚︿竴鑷�
- if (isSameDirection(code, neighbor, parent)) {
- dfsCalc(neighbor, code, lane, visited, adjacencyCodeMap);
+ if (!visited.contains(neighbor)) {
+ int degree = adjacencyCodeMap.getOrDefault(neighbor, Collections.emptyList()).size();
+ if (degree == 2) {
+ if (isSameDirection(current, neighbor, parent)) {
+ dfsCalcForLoop(current, neighbor, lane, visited, adjacencyCodeMap);
+ }
+ } else {
+ lane.getCodes().add(neighbor);
+ visited.add(neighbor);
}
}
}
}
- public boolean isSameDirection(String code, String neighbor, String parent) {
+ public boolean isSameDirection(String current, String neighbor, String parent) {
if (parent == null) {
return true;
}
Code parentCode = codeService.selectByData(parent);
- Code currentCode = codeService.selectByData(code);
+ Code currentCode = codeService.selectByData(current);
Code neighborCode = codeService.selectByData(neighbor);
double direction1 = calculateDirection(parentCode, currentCode);
@@ -140,6 +156,13 @@
return angleDifference < Math.toRadians(3);
}
+ /**
+ * 璁＄畻涓や釜鐐逛箣闂寸殑鏂瑰悜瑙�
+ *
+ * @param from 璧风偣
+ * @param to 缁堢偣
+ * @return 鏂瑰悜瑙掞紙寮у害锛�
+ */
public double calculateDirection(Code from, Code to) {
double deltaX = to.getX() - from.getX();
double deltaY = to.getY() - from.getY();
--
Gitblit v1.9.1