From 69869a21a127d2951f83421dbb6315f2997187e3 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期四, 24 十月 2024 16:33:13 +0800
Subject: [PATCH] #
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/DispatcherTestController.java | 93 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 79 insertions(+), 14 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 cef313a..cf46e47 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
@@ -49,60 +49,125 @@
Set<String> visited = new HashSet<>();
+ // 閬嶅巻鎵�鏈夎妭鐐癸紝瀵绘壘搴︽暟涓嶇瓑浜�2鐨勮妭鐐逛綔涓鸿捣鐐�
for (String codeData : codeDataList) {
if (adjacencyCodeMap.get(codeData).size() != 2) {
- if (!visited.contains(codeData)) {
- Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
- dfsCalc(codeData, null, lane, visited, adjacencyCodeMap);
- lanes.add(lane);
+ List<String> neighbors = adjacencyCodeMap.get(codeData);
+ for (String neighbor : neighbors) {
+ if (adjacencyCodeMap.get(neighbor).size() == 2 && !visited.contains(neighbor)) {
+ Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ lane.getCodes().add(codeData); // 鍖呭惈璧风偣
+ dfsCalcIncludingEnd(codeData, neighbor, lane, visited, adjacencyCodeMap);
+ lanes.add(lane);
+ }
}
}
}
+
+ // 澶勭悊鐙珛鐨勫害鏁颁负2鐨勭幆璺垨鏈繛鎺ュ埌搴︽暟涓嶇瓑浜�2鐨勮妭鐐圭殑閮ㄥ垎
+ for (String codeData : codeDataList) {
+ if (adjacencyCodeMap.get(codeData).size() == 2 && !visited.contains(codeData)) {
+ // 妫�鏌ユ槸鍚︿负鐜矾鐨勪竴閮ㄥ垎
+ Lane lane = new Lane(String.valueOf(snowflakeIdWorker.nextId()).substring(3));
+ dfsCalcForLoop(codeData, null, lane, visited, adjacencyCodeMap);
+ lanes.add(lane);
+ }
+ }
+
+
System.out.println(GsonUtils.toJson(lanes));
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) {
- visited.add(code);
- lane.getCodes().add(code);
-
- List<String> neighbors = adjacencyCodeMap.get(code);
+ List<String> neighbors = adjacencyCodeMap.get(current);
if (neighbors == null || neighbors.isEmpty()) {
return;
}
for (String neighbor : neighbors) {
- if (parent != null && neighbor.equals(parent)) {
+ if (neighbor.equals(start)) {
continue;
}
- if (!visited.contains(neighbor) && isSameDirection(code, neighbor, parent)) {
- dfsCalc(neighbor, code, lane, visited, adjacencyCodeMap);
+
+ if (!visited.contains(neighbor)) {
+ int degree = adjacencyCodeMap.get(neighbor).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.get(current);
+ if (neighbors == null || neighbors.isEmpty()) {
+ return;
+ }
+
+ for (String neighbor : neighbors) {
+ if (neighbor.equals(parent)) {
+ continue;
+ }
+
+ if (!visited.contains(neighbor)) {
+ int degree = adjacencyCodeMap.get(neighbor).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);
double direction2 = calculateDirection(currentCode, neighborCode);
double angleDifference = Math.abs(direction1 - direction2);
+ // 瑙勮寖鍖栬搴﹀樊
angleDifference = Math.min(angleDifference, 2 * Math.PI - angleDifference);
+ // 璁剧疆瑙掑害宸槇鍊间负3搴�
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();
return Math.atan2(deltaY, deltaX);
}
+
}
--
Gitblit v1.9.1