From 60edff747d52eb42aadb036e3fbd580252de4c05 Mon Sep 17 00:00:00 2001
From: zhang <zc857179121@qq.com>
Date: 星期四, 28 八月 2025 08:15:54 +0800
Subject: [PATCH] 1
---
zy-acs-manager/src/main/java/com/zy/acs/manager/core/service/astart/MapDataDispatcher.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
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 31944fe..b1323c5 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
@@ -16,10 +16,9 @@
import com.zy.acs.manager.manager.service.RouteService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.event.EventListener;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
import org.springframework.stereotype.Service;
+import javax.annotation.PostConstruct;
import java.util.*;
/**
@@ -52,7 +51,7 @@
@Autowired
private RouteService routeService;
- @EventListener(ApplicationReadyEvent.class)
+ @PostConstruct
public void init() {
String[][] codeMatrix = this.getCodeMatrix(null);
this.initRouteMap(null);
@@ -308,11 +307,20 @@
turnMatrix[i][j] = TurnNodeType.STRAIGHT.val;
break;
case 2:
- String firstCode = neighborCodeList.get(0); assert !Cools.isEmpty(firstCode);
- String secondCode = neighborCodeList.get(1); assert !Cools.isEmpty(secondCode);
+ String firstCode = neighborCodeList.get(0);
+ assert !Cools.isEmpty(firstCode);
+ String secondCode = neighborCodeList.get(1);
+ assert !Cools.isEmpty(secondCode);
int[] firstIdx = this.getCodeMatrixIdx(lev, firstCode);
int[] secondIdx = this.getCodeMatrixIdx(lev, secondCode);
+
+ if (firstIdx == null) {
+ throw new CoolException("涓嶅瓨鍦ㄧ偣浣�:" + firstCode);
+ }
+ if (secondIdx == null) {
+ throw new CoolException("涓嶅瓨鍦ㄧ偣浣�:" + secondCode);
+ }
if (firstIdx[0] != secondIdx[0] && firstIdx[1] != secondIdx[1]) {
turnMatrix[i][j] = TurnNodeType.TURN.val;
@@ -334,7 +342,7 @@
return turnMatrix;
}
-
+
public synchronized int[][] initMapMatrix(Integer lev) {
log.info("There is initializing Map Matrix......");
@@ -417,7 +425,9 @@
for (Code code : codeList) {
Double x = code.getX();
Double y = code.getY();
- if (null == x || null == y) { continue; }
+ if (null == x || null == y) {
+ continue;
+ }
if (!xIdxList.contains(x)) {
xIdxList.add(x);
}
--
Gitblit v1.9.1