tian/QAUP_Management
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

升级 spring boot 到 3.5.6，修改一些语法错误

Browse Source
This commit is contained in:
Tian jianyong 2025-10-17 10:37:27 +08:00
parent fbd7e5e7ad
commit b3fbdba4e1
12 changed files with 344 additions and 354 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

648
pom.xml
View File

@ -1,331 +1,331 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.qaup</groupId>
<artifactId>qaup-management</artifactId>
<version>1.0.1</version>
<properties>
<qaup.version>1.0.1</qaup.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>21</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<mybatis-spring-boot.version>3.0.4</mybatis-spring-boot.version>
<druid.version>1.2.25</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>2.1.0</pagehelper.boot.version>
<fastjson.version>2.0.57</fastjson.version>
<oshi.version>6.8.1</oshi.version>
<commons.io.version>2.19.0</commons.io.version>
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jakarta.version>6.0.0</jakarta.version>
<springdoc.version>2.8.9</springdoc.version>
<!-- 空间计算库版本管理 -->
<geotools.version>28.5</geotools.version>
<jts.version>1.20.0</jts.version>
<postgis.version>2021.1.0</postgis.version>
<!-- Lombok版本管理 -->
<lombok.version>1.18.38</lombok.version>
<!-- Flyway版本管理 -->
<flyway.version>11.10.5</flyway.version>
<!-- override dependency version -->
<logback.version>1.5.18</logback.version>
</properties>
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
<!-- SpringBoot的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.5.3</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- 覆盖logback的依赖配置-->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- 阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-3-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
</dependency>
<!-- SpringDoc OpenAPI UI 依赖 -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<!-- velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!-- Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
<!-- 定时任务-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-quartz</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-generator</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-framework</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-system</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-common</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 碰撞避免模块-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-collision</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 空间计算库版本管理 -->
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>${jts.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-referencing</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-epsg-hsql</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>${postgis.version}</version>
</dependency>
<!-- Lombok支持 -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<!-- 新增四个配置依赖 -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.version}</version>
</dependency>
<!-- 统一管理 Netty -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.2.2.Final</version>
</dependency>
<!-- Flyway数据库迁移工具 -->
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>${flyway.version}</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<version>${flyway.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>qaup-admin</module>
<module>qaup-framework</module>
<module>qaup-system</module>
<module>qaup-quartz</module>
<module>qaup-generator</module>
<module>qaup-common</module>
<module>qaup-collision</module>
</modules>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<release>${java.version}</release>
<encoding>${project.build.sourceEncoding}</encoding>
<parameters>true</parameters>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
</configuration>
</plugin>
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>com.qaup</groupId>
<artifactId>qaup-management</artifactId>
<version>1.0.1</version>
<properties>
<qaup.version>1.0.1</qaup.version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
<java.version>21</java.version>
<maven-jar-plugin.version>3.1.1</maven-jar-plugin.version>
<mybatis-spring-boot.version>3.0.4</mybatis-spring-boot.version>
<druid.version>1.2.25</druid.version>
<bitwalker.version>1.21</bitwalker.version>
<swagger.version>3.0.0</swagger.version>
<kaptcha.version>2.3.3</kaptcha.version>
<pagehelper.boot.version>2.1.0</pagehelper.boot.version>
<fastjson.version>2.0.57</fastjson.version>
<oshi.version>6.8.1</oshi.version>
<commons.io.version>2.19.0</commons.io.version>
<poi.version>4.1.2</poi.version>
<velocity.version>2.3</velocity.version>
<jwt.version>0.9.1</jwt.version>
<jaxb-api.version>2.3.1</jaxb-api.version>
<jakarta.version>6.0.0</jakarta.version>
<springdoc.version>2.8.9</springdoc.version>
<!-- 空间计算库版本管理 -->
<geotools.version>28.5</geotools.version>
<jts.version>1.20.0</jts.version>
<postgis.version>2021.1.0</postgis.version>
<!-- Lombok版本管理 -->
<lombok.version>1.18.38</lombok.version>
<!-- Flyway版本管理 -->
<flyway.version>11.10.5</flyway.version>
<!-- override dependency version -->
<logback.version>1.5.18</logback.version>
</properties>
<!-- 依赖声明 -->
<dependencyManagement>
<dependencies>
<!-- SpringBoot的依赖配置-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>3.5.6</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<!-- 覆盖logback的依赖配置-->
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-core</artifactId>
<version>${logback.version}</version>
</dependency>
<dependency>
<groupId>ch.qos.logback</groupId>
<artifactId>logback-classic</artifactId>
<version>${logback.version}</version>
</dependency>
<!-- 阿里数据库连接池 -->
<dependency>
<groupId>com.alibaba</groupId>
<artifactId>druid-spring-boot-3-starter</artifactId>
<version>${druid.version}</version>
</dependency>
<!-- 解析客户端操作系统、浏览器等 -->
<dependency>
<groupId>eu.bitwalker</groupId>
<artifactId>UserAgentUtils</artifactId>
<version>${bitwalker.version}</version>
</dependency>
<!-- pagehelper 分页插件 -->
<dependency>
<groupId>com.github.pagehelper</groupId>
<artifactId>pagehelper-spring-boot-starter</artifactId>
<version>${pagehelper.boot.version}</version>
</dependency>
<!-- 获取系统信息 -->
<dependency>
<groupId>com.github.oshi</groupId>
<artifactId>oshi-core</artifactId>
<version>${oshi.version}</version>
</dependency>
<!-- SpringDoc OpenAPI UI 依赖 -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
<version>${springdoc.version}</version>
</dependency>
<!-- io常用工具类 -->
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>${commons.io.version}</version>
</dependency>
<!-- excel工具 -->
<dependency>
<groupId>org.apache.poi</groupId>
<artifactId>poi-ooxml</artifactId>
<version>${poi.version}</version>
</dependency>
<!-- velocity代码生成使用模板 -->
<dependency>
<groupId>org.apache.velocity</groupId>
<artifactId>velocity-engine-core</artifactId>
<version>${velocity.version}</version>
</dependency>
<!-- 阿里JSON解析器 -->
<dependency>
<groupId>com.alibaba.fastjson2</groupId>
<artifactId>fastjson2</artifactId>
<version>${fastjson.version}</version>
</dependency>
<!-- Token生成与解析-->
<dependency>
<groupId>io.jsonwebtoken</groupId>
<artifactId>jjwt</artifactId>
<version>${jwt.version}</version>
</dependency>
<!-- 验证码 -->
<dependency>
<groupId>pro.fessional</groupId>
<artifactId>kaptcha</artifactId>
<version>${kaptcha.version}</version>
</dependency>
<!-- 定时任务-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-quartz</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 代码生成-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-generator</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 核心模块-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-framework</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 系统模块-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-system</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 通用工具-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-common</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 碰撞避免模块-->
<dependency>
<groupId>com.qaup</groupId>
<artifactId>qaup-collision</artifactId>
<version>${qaup.version}</version>
</dependency>
<!-- 空间计算库版本管理 -->
<dependency>
<groupId>org.locationtech.jts</groupId>
<artifactId>jts-core</artifactId>
<version>${jts.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-main</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-referencing</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>org.geotools</groupId>
<artifactId>gt-epsg-hsql</artifactId>
<version>${geotools.version}</version>
</dependency>
<dependency>
<groupId>net.postgis</groupId>
<artifactId>postgis-jdbc</artifactId>
<version>${postgis.version}</version>
</dependency>
<!-- Lombok支持 -->
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>${lombok.version}</version>
<scope>provided</scope>
</dependency>
<!-- 新增四个配置依赖 -->
<dependency>
<groupId>org.mybatis.spring.boot</groupId>
<artifactId>mybatis-spring-boot-starter</artifactId>
<version>${mybatis-spring-boot.version}</version>
</dependency>
<dependency>
<groupId>javax.xml.bind</groupId>
<artifactId>jaxb-api</artifactId>
<version>${jaxb-api.version}</version>
</dependency>
<dependency>
<groupId>jakarta.servlet</groupId>
<artifactId>jakarta.servlet-api</artifactId>
<version>${jakarta.version}</version>
</dependency>
<!-- 统一管理 Netty -->
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-all</artifactId>
<version>4.2.2.Final</version>
</dependency>
<!-- Flyway数据库迁移工具 -->
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-core</artifactId>
<version>${flyway.version}</version>
</dependency>
<dependency>
<groupId>org.flywaydb</groupId>
<artifactId>flyway-database-postgresql</artifactId>
<version>${flyway.version}</version>
</dependency>
</dependencies>
</dependencyManagement>
<modules>
<module>qaup-admin</module>
<module>qaup-framework</module>
<module>qaup-system</module>
<module>qaup-quartz</module>
<module>qaup-generator</module>
<module>qaup-common</module>
<module>qaup-collision</module>
</modules>
<packaging>pom</packaging>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.14.0</version>
<configuration>
<release>${java.version}</release>
<encoding>${project.build.sourceEncoding}</encoding>
<parameters>true</parameters>
<compilerArgs>
<arg>-parameters</arg>
</compilerArgs>
</configuration>
</plugin>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<version>3.5.3</version>
<version>3.5.6</version>
<configuration>
<jvmArguments>--enable-native-access=ALL-UNNAMED --enable-preview</jvmArguments>
</configuration>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</plugin>
</plugins>
</build>
<repositories>
<repository>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
</repository>
</repositories>
<pluginRepositories>
<pluginRepository>
<id>public</id>
<name>aliyun nexus</name>
<url>https://maven.aliyun.com/repository/public</url>
<releases>
<enabled>true</enabled>
</releases>
<snapshots>
<enabled>false</enabled>
</snapshots>
</pluginRepository>
</pluginRepositories>
</project>

2
qaup-collision/src/main/java/com/qaup/collision/common/service/AirportAreaCacheService.java
View File

@ -3,7 +3,6 @@ package com.qaup.collision.common.service;
import com.qaup.collision.common.model.spatial.AirportArea;
import com.qaup.collision.common.model.base.CacheConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@ -28,7 +27,6 @@ public class AirportAreaCacheService {
private final RedisTemplate<Object, Object> redisTemplate;
@Autowired
public AirportAreaCacheService(
@Qualifier("redisTemplate") RedisTemplate<Object, Object> redisTemplate) {
this.redisTemplate = redisTemplate;

2
qaup-collision/src/main/java/com/qaup/collision/common/service/SpatialQueryCacheService.java
View File

@ -3,7 +3,6 @@ package com.qaup.collision.common.service;
import com.qaup.collision.common.model.base.CacheConstants;
import com.qaup.collision.common.model.spatial.VehicleLocation;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@ -27,7 +26,6 @@ public class SpatialQueryCacheService {
private final RedisTemplate<Object, Object> redisTemplate;
@Autowired
public SpatialQueryCacheService(
@Qualifier("redisTemplate") RedisTemplate<Object, Object> redisTemplate) {
this.redisTemplate = redisTemplate;

2
qaup-collision/src/main/java/com/qaup/collision/common/service/VehicleLocationCacheService.java
View File

@ -3,7 +3,6 @@ package com.qaup.collision.common.service;
import com.qaup.collision.common.model.spatial.VehicleLocation;
import com.qaup.collision.common.model.base.CacheConstants;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@ -31,7 +30,6 @@ public class VehicleLocationCacheService {
private final RedisTemplate<Object, Object> redisTemplate;
@Autowired
public VehicleLocationCacheService(
@Qualifier("redisTemplate") RedisTemplate<Object, Object> redisTemplate) {
this.redisTemplate = redisTemplate;

3
qaup-collision/src/main/java/com/qaup/collision/datacollector/dao/DataCollectorDao.java
View File

@ -1,6 +1,5 @@
package com.qaup.collision.datacollector.dao;
import com.qaup.collision.common.model.Aircraft;
import com.qaup.collision.common.model.AirportVehicle;
import com.qaup.collision.common.model.dto.Response;
@ -16,7 +15,6 @@ import lombok.Data;
import lombok.NoArgsConstructor;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.HttpEntity;
@ -55,7 +53,6 @@ public class DataCollectorDao {
private final AuthService authService;
private final GeometryFactory geometryFactory;
@Autowired
public DataCollectorDao(RestTemplate restTemplate, AuthService authService) {
this.restTemplate = restTemplate;
this.authService = authService;

22
qaup-collision/src/main/java/com/qaup/collision/datacollector/sdk/AdxpFlightServiceHttpClient.java
View File

@ -1,11 +1,10 @@
package com.qaup.collision.datacollector.sdk;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.qaup.collision.datacollector.config.FlightSdkProperties;
import com.qaup.collision.datacollector.dto.FlightNotificationDTO;
import lombok.Data;
import lombok.extern.slf4j.Slf4j;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.core.ParameterizedTypeReference;
import org.springframework.http.*;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;
@ -41,7 +40,6 @@ public class AdxpFlightServiceHttpClient implements org.springframework.beans.fa
private final FlightSdkProperties properties;
private final RestTemplate restTemplate;
private final ObjectMapper objectMapper;
private final ReentrantLock sessionLock = new ReentrantLock();
private String sessionId;
@ -50,7 +48,6 @@ public class AdxpFlightServiceHttpClient implements org.springframework.beans.fa
public AdxpFlightServiceHttpClient(FlightSdkProperties properties) {
this.properties = properties;
this.restTemplate = new RestTemplate();
this.objectMapper = new ObjectMapper();
}
@Override
@ -91,10 +88,11 @@ public class AdxpFlightServiceHttpClient implements org.springframework.beans.fa
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<Map<String, Object>> entity = new HttpEntity<>(loginRequest, headers);
ResponseEntity<Map> response = restTemplate.postForEntity(
ResponseEntity<Map<String, Object>> response = restTemplate.exchange(
baseUrl + "/login",
HttpMethod.POST,
entity,
Map.class
new ParameterizedTypeReference<Map<String, Object>>() {}
);
Map<String, Object> body = response.getBody();
@ -125,10 +123,11 @@ public class AdxpFlightServiceHttpClient implements org.springframework.beans.fa
headers.setContentType(MediaType.APPLICATION_JSON);
HttpEntity<Map<String, String>> entity = new HttpEntity<>(logoutRequest, headers);
restTemplate.postForEntity(
restTemplate.exchange(
baseUrl + "/logout",
HttpMethod.POST,
entity,
Map.class
new ParameterizedTypeReference<Map<String, String>>() {}
);
log.info("已登出 ADXP 适配器服务");
@ -145,7 +144,12 @@ public class AdxpFlightServiceHttpClient implements org.springframework.beans.fa
sessionLock.lock();
try {
String url = baseUrl + "/messages?sessionId=" + sessionId;
ResponseEntity<Map> response = restTemplate.getForEntity(url, Map.class);
ResponseEntity<Map<String, Object>> response = restTemplate.exchange(
url,
HttpMethod.GET,
null,
new ParameterizedTypeReference<Map<String, Object>>() {}
);
Map<String, Object> body = response.getBody();
if (body == null || !Boolean.TRUE.equals(body.get("success"))) {

2
qaup-collision/src/main/java/com/qaup/collision/rule/repository/RuleViolationEventRepository.java
View File

@ -19,7 +19,7 @@ import java.util.List;
* @since 2025-01-17
*/
@Repository
public interface RuleViolationEventRepository extends JpaRepository<RuleViolationEvent, String> {
public interface RuleViolationEventRepository extends JpaRepository<RuleViolationEvent, Long> {
/**
* 根据车牌号查询违规事件（通过关联sys_vehicle_info表）

6
qaup-collision/src/main/java/com/qaup/collision/rule/service/RuleViolationProcessor.java
View File

@ -82,7 +82,7 @@ public interface RuleViolationProcessor {
* @param notes 确认备注
* @return 是否成功
*/
boolean acknowledgeViolation(String eventId, String acknowledgedBy, String notes);
boolean acknowledgeViolation(Long eventId, String acknowledgedBy, String notes);
/**
* 解决违规事件
@ -92,7 +92,7 @@ public interface RuleViolationProcessor {
* @param resolution 解决方案
* @return 是否成功
*/
boolean resolveViolation(String eventId, String resolvedBy, String resolution);
boolean resolveViolation(Long eventId, String resolvedBy, String resolution);
/**
* 忽略违规事件
@ -102,7 +102,7 @@ public interface RuleViolationProcessor {
* @param reason 忽略原因
* @return 是否成功
*/
boolean ignoreViolation(String eventId, String ignoredBy, String reason);
boolean ignoreViolation(Long eventId, String ignoredBy, String reason);
// ============================================
// 违规事件查询

6
qaup-collision/src/main/java/com/qaup/collision/rule/service/impl/RuleViolationProcessorImpl.java
View File

@ -170,7 +170,7 @@ public class RuleViolationProcessorImpl implements RuleViolationProcessor {
// ============================================
@Override
public boolean acknowledgeViolation(String eventId, String acknowledgedBy, String notes) {
public boolean acknowledgeViolation(Long eventId, String acknowledgedBy, String notes) {
try {
Optional<RuleViolationEvent> eventOpt = violationEventRepository.findById(eventId);
if (!eventOpt.isPresent()) {
@ -189,7 +189,7 @@ public class RuleViolationProcessorImpl implements RuleViolationProcessor {
}
@Override
public boolean resolveViolation(String eventId, String resolvedBy, String resolution) {
public boolean resolveViolation(Long eventId, String resolvedBy, String resolution) {
try {
Optional<RuleViolationEvent> eventOpt = violationEventRepository.findById(eventId);
if (!eventOpt.isPresent()) {
@ -208,7 +208,7 @@ public class RuleViolationProcessorImpl implements RuleViolationProcessor {
}
@Override
public boolean ignoreViolation(String eventId, String ignoredBy, String reason) {
public boolean ignoreViolation(Long eventId, String ignoredBy, String reason) {
try {
Optional<RuleViolationEvent> eventOpt = violationEventRepository.findById(eventId);
if (!eventOpt.isPresent()) {

2
qaup-collision/src/main/java/com/qaup/collision/websocket/broadcaster/WebSocketMessageBroadcaster.java
View File

@ -24,7 +24,6 @@ import com.qaup.collision.websocket.message.PathConflictAlertMessage;
import com.qaup.collision.websocket.handler.CollisionWebSocketHandler;
import org.springframework.stereotype.Component;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.context.event.EventListener;
import org.springframework.scheduling.annotation.Async;
@ -46,7 +45,6 @@ public class WebSocketMessageBroadcaster {
private final CollisionWebSocketHandler collisionWebSocketHandler; // 注入实例
private final ObjectMapper objectMapper; // JSON序列化器
@Autowired
public WebSocketMessageBroadcaster(MessageCacheService messageCacheService, CollisionWebSocketHandler collisionWebSocketHandler, @Qualifier("websocketObjectMapper") ObjectMapper objectMapper) {
this.messageCacheService = messageCacheService;
this.collisionWebSocketHandler = collisionWebSocketHandler;

2
qaup-collision/src/main/java/com/qaup/collision/websocket/cache/MessageCacheService.java vendored
View File

@ -1,6 +1,5 @@
package com.qaup.collision.websocket.cache;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.stereotype.Service;
@ -25,7 +24,6 @@ public class MessageCacheService {
private static final int MAX_CACHED_MESSAGES = 50; // 每类型最多缓存50条消息（优化内存占用）
private static final Duration CACHE_EXPIRY = Duration.ofMinutes(10); // 10分钟过期（从30分钟优化）
@Autowired
public MessageCacheService(@Qualifier("websocketRedisTemplate") RedisTemplate<String, Object> redisTemplate) {
this.redisTemplate = redisTemplate;
}

1
qaup-collision/src/test/java/com/qaup/collision/datacollector/service/VehicleStatusUpdateIntegrationTest.java
View File

@ -3,7 +3,6 @@ package com.qaup.collision.datacollector.service;
import com.qaup.collision.common.model.MovingObject;
import com.qaup.collision.common.model.MovingObject.MovingObjectType;
import com.qaup.collision.datacollector.dao.DataCollectorDao;
import com.qaup.collision.datacollector.model.dto.UniversalVehicleStatusDTO;
import com.qaup.collision.dataprocessing.service.DataProcessingService;
import com.qaup.collision.websocket.event.VehicleStatusUpdateEvent;
import org.junit.jupiter.api.BeforeEach;