From ce3ebd9298709be8038cdc09c60d76983424f576 Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@gmail.com>
Date: 星期六, 22 三月 2025 10:19:09 +0800
Subject: [PATCH] #
---
/dev/null | 42 ---------------------
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 23 +++++++++--
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java | 2
3 files changed, 19 insertions(+), 48 deletions(-)
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/config/BootConfig.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/config/BootConfig.java
deleted file mode 100644
index bff1ec5..0000000
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/config/BootConfig.java
+++ /dev/null
@@ -1,42 +0,0 @@
-package com.zy.acs.manager.core.config;
-
-import com.zy.acs.manager.core.service.astart.MapDataDispatcher;
-import com.zy.acs.manager.manager.service.CodeService;
-import com.zy.acs.manager.manager.service.RouteService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-import java.util.concurrent.atomic.AtomicBoolean;
-
-@Configuration
-public class BootConfig {
-
- public static final AtomicBoolean FULLY_LOADED = new AtomicBoolean(false);
-
- @Autowired
- private CodeService codeService;
- @Autowired
- private RouteService routeService;
-
- @Bean
- public MapDataDispatcher getMapDataDispatcher() {
- MapDataDispatcher dispatcher = new MapDataDispatcher(codeService, routeService);
- String[][] codeMatrix = dispatcher.getCodeMatrix(null);
- dispatcher.initRouteMap(null);
- if (codeMatrix.length > 0) {
- dispatcher.getMapMatrix(null, null);
- dispatcher.getTurnMatrix(null);
- dispatcher.getCdaMatrix(null);
- dispatcher.getDynamicMatrix(null);
- }
- FULLY_LOADED.set(true);
- return dispatcher;
- }
-
- public static boolean isFullyLoaded() {
- return FULLY_LOADED.get();
- }
-
-
-}
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
index 70f2661..4a11335 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/AvoidWaveCalculator.java
@@ -45,7 +45,7 @@
*/
@Slf4j
@Component
-@DependsOn("getMapDataDispatcher")
+@DependsOn("mapDataDispatcher")
public class AvoidWaveCalculator {
private static final ReentrantLock lock = new ReentrantLock(Boolean.TRUE);
diff --git a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
index ea0becc..b2da3e9 100644
--- a/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
+++ b/zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java
@@ -15,6 +15,9 @@
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.boot.context.event.ApplicationReadyEvent;
+import org.springframework.stereotype.Service;
import java.util.*;
@@ -22,6 +25,7 @@
* Created by vincent on 6/6/2024
*/
@Slf4j
+@Service
public class MapDataDispatcher {
public static final Integer MAP_DEFAULT_LEV = 1;
@@ -41,13 +45,22 @@
public Map<String, Boolean> routeCdaMap = new HashMap<>();
- private final CodeService codeService;
+ @Autowired
+ private CodeService codeService;
- private final RouteService routeService;
+ @Autowired
+ private RouteService routeService;
- public MapDataDispatcher(CodeService codeService, RouteService routeService) {
- this.codeService = codeService;
- this.routeService = routeService;
+ @EventListener(ApplicationReadyEvent.class)
+ public void init() {
+ String[][] codeMatrix = this.getCodeMatrix(null);
+ this.initRouteMap(null);
+ if (codeMatrix.length > 0) {
+ this.getMapMatrix(null, null);
+ this.getTurnMatrix(null);
+ this.getCdaMatrix(null);
+ this.getDynamicMatrix(null);
+ }
}
public String[][] getWaveMatrix(Integer lev) {
--
Gitblit v1.9.1