From 99c0865a1305e7c77053aab141a66f5c06e4a918 Mon Sep 17 00:00:00 2001 From: Tian jianyong <11429339@qq.com> Date: Wed, 11 Jun 2025 10:58:28 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=9B=E5=BB=BAV002=E8=BF=81=E7=A7=BB?= =?UTF-8?q?=E6=96=87=E4=BB=B6=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E6=9E=B6=E6=9E=84=E5=92=8C=E9=94=99=E8=AF=AF=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- VERSION.txt | 2 +- change_log.md | 16 ++ doc/work/V002_migration_file_creation_task.md | 84 +++++++ .../repository/AirportAreaRepository.java | 44 ++-- .../repository/VehicleLocationRepository.java | 8 +- .../common/model/spatial/AirportArea.java | 2 + .../service/VehicleLocationService.java | 2 +- .../service/DataCollectorService.java | 2 +- .../UnmannedVehicleControlService.java | 2 +- .../VehicleDataPersistenceService.java | 2 +- .../controller/GeopositionController.java | 6 +- .../db/migration/V002__create_core_tables.sql | 235 ++++++++++++++++++ .../AirportAreaServiceIntegrationTest.java | 15 ++ .../repository/AirportAreaRepositoryTest.java | 28 ++- .../VehicleLocationRepositoryTest.java | 16 +- .../RoadNetworkServiceIntegrationTest.java | 1 - src/test/resources/application-test.yml | 25 ++ 17 files changed, 444 insertions(+), 46 deletions(-) create mode 100644 doc/work/V002_migration_file_creation_task.md create mode 100644 src/main/resources/db/migration/V002__create_core_tables.sql diff --git a/VERSION.txt b/VERSION.txt index 1864002..b976b13 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -0.6.9 \ No newline at end of file +0.6.10 \ No newline at end of file diff --git a/change_log.md b/change_log.md index 5a2db01..498f80e 100644 --- a/change_log.md +++ b/change_log.md @@ -2,6 +2,22 @@ 本文档记录碰撞避免系统的所有重要变更，包括新功能、改进和修复。 +## [0.6.10] - 2025-01-15 + +### 新增功能 (Features) +- **数据库迁移文件完善**: 创建缺失的V002核心表迁移文件 + - 新增 `V002__create_core_tables.sql` 迁移文件，基于 `create_tables.sql` 内容 + - 建立完整的数据库迁移序列：V001(PostGIS扩展) → V002(核心表) → V003(车辆指令表) + - 移除重复的PostGIS扩展创建语句，确保迁移文件逻辑清晰 + - 包含vehicle_locations、airport_areas、vehicle_trajectories三个核心表的完整结构 + - 包含所有PostGIS空间索引、JSONB索引、触发器和数据清理函数 + - 遵循Flyway迁移文件命名规范和最佳实践 + +### 技术改进 (Technical Improvements) +- **迁移文件组织**: 建立了标准化的数据库版本控制体系 +- **PostGIS架构**: 确保核心空间数据表结构的迁移可追溯性 +- **数据库管理**: 提升了数据库schema变更的可维护性和部署一致性 + ## [0.6.9] - 2025-01-15 ### 修复 (Fixes) diff --git a/doc/work/V002_migration_file_creation_task.md b/doc/work/V002_migration_file_creation_task.md new file mode 100644 index 0000000..c51db95 --- /dev/null +++ b/doc/work/V002_migration_file_creation_task.md @@ -0,0 +1,84 @@ +# 上下文 +文件名：V002_migration_file_creation_task.md +创建于：2025-01-15 +创建者：AI助手 + +# 任务描述 +用户发现数据库迁移目录 src/main/resources/db/migration 中缺少 V002 迁移文件，仅存在 V001 和 V003 文件。用户正确识别出应该将 create_tables.sql 的内容转换为 V002 迁移文件以建立完整的数据库迁移序列。 + +# 项目概述 +碰撞避免系统数据库基于PostgreSQL 17 + PostGIS扩展，使用Flyway进行数据库版本管理。系统核心数据包括车辆位置、机场区域和车辆轨迹等PostGIS空间数据表。 + +--- +*以下部分由 AI 在协议执行过程中维护* +--- + +# 分析 (由 RESEARCH 模式填充) +通过分析migration目录结构，发现存在以下问题： +- V001__Enable_PostGIS.sql: 启用PostGIS扩展 +- 缺失V002: 应该创建核心数据表 +- V003__create_vehicle_commands_table.sql: 创建车辆控制指令表 + +create_tables.sql包含完整的核心表结构，包括： +- vehicle_locations表：车辆位置数据，支持PostGIS POINT类型 +- airport_areas表：机场区域数据，支持PostGIS POLYGON类型 +- vehicle_trajectories表：车辆轨迹数据，支持PostGIS LINESTRING类型 +- 完整的空间索引、JSONB索引、触发器和数据清理函数 + +存在重复的PostGIS扩展创建语句需要清理。 + +# 提议的解决方案 (由 INNOVATE 模式填充) +采用直接转换方案的改进版本： +- 将create_tables.sql内容转换为V002迁移文件 +- 移除与V001重复的PostGIS扩展创建语句 +- 保留所有核心表结构、索引、触发器和函数定义 +- 更新文件头部注释以符合迁移文件标准 +- 确保与V001和V003的逻辑连贯性 + +此方案优点：保持完整性，避免重复，确保迁移文件逻辑清晰。 + +# 实施计划 (由 PLAN 模式生成) +详细的V002迁移文件创建计划包括： +1. 创建V002__create_core_tables.sql文件 +2. 基于create_tables.sql内容进行适配 +3. 移除重复的PostGIS扩展语句 +4. 更新文件标准化头部注释 +5. 保留完整的表结构和功能 +6. 更新版本号和变更日志 + +实施检查清单： +1. 创建V002__create_core_tables.sql迁移文件 +2. 复制create_tables.sql内容到新文件 +3. 移除重复的PostGIS扩展创建语句（第8-9行） +4. 更新文件头部注释，标明这是V002迁移文件 +5. 保留所有表结构定义（vehicle_locations、airport_areas、vehicle_trajectories） +6. 保留所有索引创建语句 +7. 保留触发器和函数定义 +8. 保留数据清理策略函数 +9. 保留注释的权限设置和示例数据 +10. 验证文件语法正确性 +11. 更新版本号到0.6.10 +12. 在change_log.md中记录此次变更 + +# 当前执行步骤 (由 EXECUTE 模式在开始执行某步骤时更新) +> 已完成所有步骤 + +# 任务进度 (由 EXECUTE 模式在每步完成后追加) +* 2025-01-15 执行时间 + * 步骤：检查清单项目1-9 - 创建V002迁移文件并设置完整内容 + * 修改：新增 src/main/resources/db/migration/V002__create_core_tables.sql 文件 + * 更改摘要：成功创建了完整的V002迁移文件，包含所有核心表结构、索引、触发器和函数 + * 原因：执行计划步骤1-9 + * 阻碍：无 + * 用户确认状态：待确认 + +* 2025-01-15 执行时间 + * 步骤：检查清单项目10-12 - 版本更新和变更记录 + * 修改：更新VERSION.txt为0.6.10，在change_log.md中添加版本0.6.10的完整变更记录 + * 更改摘要：完成版本管理和文档更新，建立完整的变更追溯 + * 原因：执行计划步骤10-12 + * 阻碍：无 + * 用户确认状态：成功 + +# 最终审查 (由 REVIEW 模式填充) +实施与最终计划完全匹配。成功创建了V002迁移文件，建立了完整的数据库迁移序列V001→V002→V003，解决了用户识别的迁移文件缺失问题。所有表结构、索引、触发器和函数都已正确包含，版本管理和文档更新也已完成。 \ No newline at end of file diff --git a/src/main/java/com/dongni/collisionavoidance/common/model/repository/AirportAreaRepository.java b/src/main/java/com/dongni/collisionavoidance/common/model/repository/AirportAreaRepository.java index 6a382b4..e67b376 100644 --- a/src/main/java/com/dongni/collisionavoidance/common/model/repository/AirportAreaRepository.java +++ b/src/main/java/com/dongni/collisionavoidance/common/model/repository/AirportAreaRepository.java @@ -41,8 +41,8 @@ public interface AirportAreaRepository extends JpaRepository * 使用PostGIS ST_Contains函数 */ @Query(value = "SELECT * FROM airport_areas aa " + - "WHERE ST_Contains(aa.geometry, :point) " + - "AND aa.is_active = true " + + "WHERE ST_Contains(aa.boundary, :point) " + + "AND aa.enabled = true " + "ORDER BY aa.priority DESC", nativeQuery = true) List findAreasContainingPoint(@Param("point") Point point); @@ -52,8 +52,8 @@ public interface AirportAreaRepository extends JpaRepository * 使用PostGIS ST_Intersects函数 */ @Query(value = "SELECT * FROM airport_areas aa " + - "WHERE ST_Intersects(aa.geometry, :geometry) " + - "AND aa.is_active = true " + + "WHERE ST_Intersects(aa.boundary, :geometry) " + + "AND aa.enabled = true " + "ORDER BY aa.priority DESC", nativeQuery = true) List findAreasIntersectingGeometry(@Param("geometry") Geometry geometry); @@ -63,9 +63,9 @@ public interface AirportAreaRepository extends JpaRepository * 使用PostGIS ST_DWithin函数 */ @Query(value = "SELECT * FROM airport_areas aa " + - "WHERE ST_DWithin(aa.geometry, :centerPoint, :radiusMeters) " + - "AND aa.is_active = true " + - "ORDER BY ST_Distance(aa.geometry, :centerPoint)", + "WHERE ST_DWithin(aa.boundary, :centerPoint, :radiusMeters) " + + "AND aa.enabled = true " + + "ORDER BY ST_Distance(aa.boundary, :centerPoint)", nativeQuery = true) List findAreasWithinRadius(@Param("centerPoint") Point centerPoint, @Param("radiusMeters") double radiusMeters); @@ -76,8 +76,8 @@ public interface AirportAreaRepository extends JpaRepository */ @Query(value = "SELECT * FROM airport_areas aa " + "WHERE aa.id != :excludeId " + - "AND ST_Overlaps(aa.geometry, :geometry) " + - "AND aa.is_active = true", + "AND ST_Overlaps(aa.boundary, :geometry) " + + "AND aa.enabled = true", nativeQuery = true) List findOverlappingAreas(@Param("geometry") Geometry geometry, @Param("excludeId") Long excludeId); @@ -95,8 +95,8 @@ public interface AirportAreaRepository extends JpaRepository * 使用JSONB查询功能 - 使用jsonb_exists函数避免参数冲突 */ @Query(value = "SELECT * FROM airport_areas aa " + - "WHERE jsonb_exists(aa.restrictions, :restrictionType) " + - "AND aa.is_active = true " + + "WHERE jsonb_exists(aa.allowed_vehicle_types, :restrictionType) " + + "AND aa.enabled = true " + "ORDER BY aa.priority DESC", nativeQuery = true) List findAreasByRestrictionType(@Param("restrictionType") String restrictionType); @@ -105,11 +105,11 @@ public interface AirportAreaRepository extends JpaRepository * 空间聚合查询：计算区域面积 * 使用PostGIS ST_Area函数 */ - @Query(value = "SELECT aa.*, ST_Area(aa.geometry) as area " + + @Query(value = "SELECT aa.*, ST_Area(aa.boundary) as area " + "FROM airport_areas aa " + - "WHERE aa.area_type = :areaType " + - "AND aa.is_active = true " + - "ORDER BY ST_Area(aa.geometry) DESC", + "WHERE aa.type = :areaType " + + "AND aa.enabled = true " + + "ORDER BY ST_Area(aa.boundary) DESC", nativeQuery = true) List findAreasByTypeWithSize(@Param("areaType") String areaType); @@ -118,8 +118,8 @@ public interface AirportAreaRepository extends JpaRepository * 处理重叠区域时使用 */ @Query(value = "SELECT * FROM airport_areas aa " + - "WHERE ST_Contains(aa.geometry, :point) " + - "AND aa.is_active = true " + + "WHERE ST_Contains(aa.boundary, :point) " + + "AND aa.enabled = true " + "ORDER BY aa.priority DESC " + "LIMIT 1", nativeQuery = true) @@ -129,7 +129,7 @@ public interface AirportAreaRepository extends JpaRepository * 空间查询：获取区域的边界框 * 使用PostGIS ST_Envelope函数 */ - @Query(value = "SELECT ST_Envelope(aa.geometry) " + + @Query(value = "SELECT ST_Envelope(aa.boundary) " + "FROM airport_areas aa " + "WHERE aa.id = :areaId", nativeQuery = true) @@ -140,8 +140,8 @@ public interface AirportAreaRepository extends JpaRepository * 用于轨迹分析 */ @Query(value = "SELECT aa.* FROM airport_areas aa " + - "WHERE ST_Intersects(aa.geometry, ST_GeomFromText(:trajectoryWkt, 4326)) " + - "AND aa.is_active = true " + + "WHERE ST_Intersects(aa.boundary, ST_GeomFromText(:trajectoryWkt, 4326)) " + + "AND aa.enabled = true " + "ORDER BY aa.priority DESC", nativeQuery = true) List findAreasIntersectingTrajectory(@Param("trajectoryWkt") String trajectoryWkt); @@ -165,8 +165,8 @@ public interface AirportAreaRepository extends JpaRepository * 空间查询：查找距离指定点最近的N个区域 */ @Query(value = "SELECT * FROM airport_areas aa " + - "WHERE aa.is_active = true " + - "ORDER BY ST_Distance(aa.geometry, :referencePoint) " + + "WHERE aa.enabled = true " + + "ORDER BY ST_Distance(aa.boundary, :referencePoint) " + "LIMIT :limit", nativeQuery = true) List findNearestAreas(@Param("referencePoint") Point referencePoint, diff --git a/src/main/java/com/dongni/collisionavoidance/common/model/repository/VehicleLocationRepository.java b/src/main/java/com/dongni/collisionavoidance/common/model/repository/VehicleLocationRepository.java index 69d9d5a..1e78913 100644 --- a/src/main/java/com/dongni/collisionavoidance/common/model/repository/VehicleLocationRepository.java +++ b/src/main/java/com/dongni/collisionavoidance/common/model/repository/VehicleLocationRepository.java @@ -1,6 +1,7 @@ package com.dongni.collisionavoidance.common.model.repository; import com.dongni.collisionavoidance.common.model.spatial.VehicleLocation; +import com.dongni.collisionavoidance.common.model.MovingObjectType; import org.locationtech.jts.geom.Point; import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.Query; @@ -21,8 +22,9 @@ public interface VehicleLocationRepository extends JpaRepository findLatestByVehicleId(@Param("vehicleId") String vehicleId); /** @@ -30,7 +32,7 @@ public interface VehicleLocationRepository extends JpaRepository= :since ORDER BY vl.timestamp DESC") - List findActiveByVehicleType(@Param("vehicleType") String vehicleType, + List findActiveByVehicleType(@Param("vehicleType") MovingObjectType vehicleType, @Param("since") LocalDateTime since); /** diff --git a/src/main/java/com/dongni/collisionavoidance/common/model/spatial/AirportArea.java b/src/main/java/com/dongni/collisionavoidance/common/model/spatial/AirportArea.java index e16501f..bd64142 100644 --- a/src/main/java/com/dongni/collisionavoidance/common/model/spatial/AirportArea.java +++ b/src/main/java/com/dongni/collisionavoidance/common/model/spatial/AirportArea.java @@ -77,12 +77,14 @@ public class AirportArea { * 允许的车辆类型（JSON数组格式） */ @Column(name = "allowed_vehicle_types", columnDefinition = "jsonb") + @org.hibernate.annotations.JdbcTypeCode(org.hibernate.type.SqlTypes.JSON) private String allowedVehicleTypes; /** * 允许的航空器类型（JSON数组格式） */ @Column(name = "allowed_aircraft_types", columnDefinition = "jsonb") + @org.hibernate.annotations.JdbcTypeCode(org.hibernate.type.SqlTypes.JSON) private String allowedAircraftTypes; /** diff --git a/src/main/java/com/dongni/collisionavoidance/common/service/VehicleLocationService.java b/src/main/java/com/dongni/collisionavoidance/common/service/VehicleLocationService.java index d78bcec..6f8e2fb 100644 --- a/src/main/java/com/dongni/collisionavoidance/common/service/VehicleLocationService.java +++ b/src/main/java/com/dongni/collisionavoidance/common/service/VehicleLocationService.java @@ -96,7 +96,7 @@ public class VehicleLocationService { /** * 根据车辆类型获取活跃车辆 */ - public List getActiveVehiclesByType(String vehicleType, int minutesBack) { + public List getActiveVehiclesByType(MovingObjectType vehicleType, int minutesBack) { LocalDateTime since = LocalDateTime.now().minusMinutes(minutesBack); try { return vehicleLocationRepository.findActiveByVehicleType(vehicleType, since); diff --git a/src/main/java/com/dongni/collisionavoidance/dataCollector/service/DataCollectorService.java b/src/main/java/com/dongni/collisionavoidance/dataCollector/service/DataCollectorService.java index 15f5328..120e214 100644 --- a/src/main/java/com/dongni/collisionavoidance/dataCollector/service/DataCollectorService.java +++ b/src/main/java/com/dongni/collisionavoidance/dataCollector/service/DataCollectorService.java @@ -231,7 +231,7 @@ public class DataCollectorService { try { // 获取数据库中的无人车数据统计（只有无人车数据会存储） - long unmannedCount = vehicleLocationService.getActiveVehiclesByType("UNMANNED_VEHICLE", 60).size(); + long unmannedCount = vehicleLocationService.getActiveVehiclesByType(MovingObjectType.UNMANNED_VEHICLE, 60).size(); stats.append("数据持久化统计:\n"); stats.append(" - 航空器: 仅实时处理，不存储\n"); diff --git a/src/main/java/com/dongni/collisionavoidance/dataCollector/service/UnmannedVehicleControlService.java b/src/main/java/com/dongni/collisionavoidance/dataCollector/service/UnmannedVehicleControlService.java index 7bd4af1..50fdf70 100644 --- a/src/main/java/com/dongni/collisionavoidance/dataCollector/service/UnmannedVehicleControlService.java +++ b/src/main/java/com/dongni/collisionavoidance/dataCollector/service/UnmannedVehicleControlService.java @@ -137,7 +137,7 @@ public class UnmannedVehicleControlService { // 由于数据库中只存储无人车数据，直接查询即可 LocalDateTime since = LocalDateTime.now().minusMinutes(5); locations = vehicleLocationRepository.findActiveByVehicleType( - MovingObjectType.UNMANNED_VEHICLE.name(), since); + MovingObjectType.UNMANNED_VEHICLE, since); logger.info("查询到所有无人车位置: count={}", locations.size()); } diff --git a/src/main/java/com/dongni/collisionavoidance/dataCollector/service/VehicleDataPersistenceService.java b/src/main/java/com/dongni/collisionavoidance/dataCollector/service/VehicleDataPersistenceService.java index c974ee6..0dd8dc6 100644 --- a/src/main/java/com/dongni/collisionavoidance/dataCollector/service/VehicleDataPersistenceService.java +++ b/src/main/java/com/dongni/collisionavoidance/dataCollector/service/VehicleDataPersistenceService.java @@ -238,7 +238,7 @@ public class VehicleDataPersistenceService { // 无人车位置数据统计 long unmannedVehicleCount = vehicleLocationService - .getActiveVehiclesByType(MovingObjectType.UNMANNED_VEHICLE.name(), 60).size(); + .getActiveVehiclesByType(MovingObjectType.UNMANNED_VEHICLE, 60).size(); stats.append(" - 无人车位置记录（最近1小时）: ").append(unmannedVehicleCount).append(" 条\n"); // 控制指令统计 diff --git a/src/main/java/com/dongni/collisionavoidance/webSocket/controller/GeopositionController.java b/src/main/java/com/dongni/collisionavoidance/webSocket/controller/GeopositionController.java index 90f8cbc..96eb1f3 100644 --- a/src/main/java/com/dongni/collisionavoidance/webSocket/controller/GeopositionController.java +++ b/src/main/java/com/dongni/collisionavoidance/webSocket/controller/GeopositionController.java @@ -66,7 +66,7 @@ public class GeopositionController { try { // 只获取无人车数据，因为其他车辆数据不再持久化存储 List unmannedVehicles = vehicleLocationService - .getActiveVehiclesByType(MovingObjectType.UNMANNED_VEHICLE.name(), 5); + .getActiveVehiclesByType(MovingObjectType.UNMANNED_VEHICLE, 5); // 转换为Map格式 Map resultMap = unmannedVehicles.stream() @@ -102,8 +102,8 @@ public class GeopositionController { List vehicles; if (MovingObjectType.UNMANNED_VEHICLE.equals(vehicleType)) { - // 只有无人车数据存储在数据库中 - vehicles = vehicleLocationService.getActiveVehiclesByType(vehicleType.name(), 5); + // 无人车数据从数据库获取 + vehicles = vehicleLocationService.getActiveVehiclesByType(vehicleType, 5); log.debug("查询无人车数据: {} 条记录", vehicles.size()); } else { // 航空器和特种车辆数据不持久化，返回空列表 diff --git a/src/main/resources/db/migration/V002__create_core_tables.sql b/src/main/resources/db/migration/V002__create_core_tables.sql new file mode 100644 index 0000000..666dccd --- /dev/null +++ b/src/main/resources/db/migration/V002__create_core_tables.sql @@ -0,0 +1,235 @@ +-- ============================================ +-- V002: 创建PostGIS空间数据核心表结构 +-- 碰撞避免系统核心数据表迁移脚本 +-- PostgreSQL 17 + PostGIS扩展 +-- 迁移版本: V002 +-- 创建时间: 2025-01-15 +-- ============================================ + +-- ============================================ +-- 1. 车辆位置表 (vehicle_locations) +-- ============================================ +CREATE TABLE IF NOT EXISTS vehicle_locations ( + id BIGSERIAL PRIMARY KEY, + vehicle_id VARCHAR(50) NOT NULL, + vehicle_type VARCHAR(20) NOT NULL CHECK (vehicle_type IN ('AIRCRAFT', 'SPECIAL_VEHICLE', 'UNMANNED_VEHICLE')), + + -- PostGIS空间字段 (WGS84坐标系) + location GEOMETRY(POINT, 4326) NOT NULL, + + -- 位置相关属性 + altitude DOUBLE PRECISION, + heading DOUBLE PRECISION CHECK (heading >= 0 AND heading < 360), + speed DOUBLE PRECISION CHECK (speed >= 0), + + -- 时间戳 + timestamp TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + + -- 数据质量指标 + data_quality VARCHAR(20), + + -- 审计字段 + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP +); + +-- 车辆位置表索引 +CREATE INDEX IF NOT EXISTS idx_vehicle_locations_vehicle_id ON vehicle_locations(vehicle_id); +CREATE INDEX IF NOT EXISTS idx_vehicle_locations_vehicle_type ON vehicle_locations(vehicle_type); +CREATE INDEX IF NOT EXISTS idx_vehicle_locations_timestamp ON vehicle_locations(timestamp DESC); +CREATE INDEX IF NOT EXISTS idx_vehicle_locations_created_at ON vehicle_locations(created_at); + +-- PostGIS空间索引 (GIST索引) +CREATE INDEX IF NOT EXISTS idx_vehicle_locations_location_gist ON vehicle_locations USING GIST(location); + +-- 复合索引优化查询性能 +CREATE INDEX IF NOT EXISTS idx_vehicle_locations_compound ON vehicle_locations(vehicle_id, timestamp DESC); +CREATE INDEX IF NOT EXISTS idx_vehicle_locations_type_time ON vehicle_locations(vehicle_type, timestamp DESC); + +-- ============================================ +-- 2. 机场区域表 (airport_areas) +-- ============================================ +CREATE TABLE IF NOT EXISTS airport_areas ( + id BIGSERIAL PRIMARY KEY, + area_id VARCHAR(50) NOT NULL UNIQUE, + name VARCHAR(100) NOT NULL, + type VARCHAR(30) NOT NULL, + description VARCHAR(500), + + -- PostGIS空间字段 (支持POLYGON/MULTIPOLYGON) + boundary GEOMETRY(POLYGON, 4326) NOT NULL, + + -- 速度和限制 + speed_limit_kph DOUBLE PRECISION, + restricted BOOLEAN DEFAULT false, + allowed_vehicle_types JSONB, + allowed_aircraft_types JSONB, + max_height DOUBLE PRECISION, + max_weight DOUBLE PRECISION, + + -- 时间控制 + active_time TIMESTAMP WITH TIME ZONE, + expiry_time TIMESTAMP WITH TIME ZONE, + + -- 区域属性 + enabled BOOLEAN NOT NULL DEFAULT true, + priority INTEGER NOT NULL DEFAULT 1 CHECK (priority >= 1), + + -- 版本控制 + version BIGINT NOT NULL DEFAULT 1, + + -- 审计字段 + created_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP, + updated_at TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP +); + +-- 机场区域表索引 +CREATE INDEX IF NOT EXISTS idx_airport_areas_area_id ON airport_areas(area_id); +CREATE INDEX IF NOT EXISTS idx_airport_areas_name ON airport_areas(name); +CREATE INDEX IF NOT EXISTS idx_airport_areas_type ON airport_areas(type); +CREATE INDEX IF NOT EXISTS idx_airport_areas_priority ON airport_areas(priority DESC); +CREATE INDEX IF NOT EXISTS idx_airport_areas_enabled ON airport_areas(enabled); +CREATE INDEX IF NOT EXISTS idx_airport_areas_version ON airport_areas(version); + +-- PostGIS空间索引 +CREATE INDEX IF NOT EXISTS idx_airport_areas_boundary_gist ON airport_areas USING GIST(boundary); + +-- JSONB索引 (用于车辆类型查询) +CREATE INDEX IF NOT EXISTS idx_airport_areas_allowed_vehicles_gin ON airport_areas USING GIN(allowed_vehicle_types); +CREATE INDEX IF NOT EXISTS idx_airport_areas_allowed_aircraft_gin ON airport_areas USING GIN(allowed_aircraft_types); + +-- 复合索引 +CREATE INDEX IF NOT EXISTS idx_airport_areas_type_enabled ON airport_areas(type, enabled); +CREATE INDEX IF NOT EXISTS idx_airport_areas_enabled_priority ON airport_areas(enabled, priority DESC); + +-- ============================================ +-- 3. 车辆轨迹表 (vehicle_trajectories) - 可选的历史轨迹存储 +-- ============================================ +CREATE TABLE IF NOT EXISTS vehicle_trajectories ( + id BIGSERIAL PRIMARY KEY, + vehicle_id VARCHAR(50) NOT NULL, + trajectory_date DATE NOT NULL, + + -- PostGIS轨迹线 (LINESTRING) + trajectory_line GEOMETRY(LINESTRING, 4326), + + -- 统计信息 + total_distance DOUBLE PRECISION, -- 总距离 (米) + max_speed DOUBLE PRECISION, -- 最大速度 + avg_speed DOUBLE PRECISION, -- 平均速度 + duration_seconds INTEGER, -- 持续时间 (秒) + point_count INTEGER, -- 轨迹点数量 + + -- 时间范围 + start_time TIMESTAMP WITH TIME ZONE NOT NULL, + end_time TIMESTAMP WITH TIME ZONE NOT NULL, + + -- 审计字段 + created_at TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP +); + +-- 车辆轨迹表索引 +CREATE INDEX IF NOT EXISTS idx_vehicle_trajectories_vehicle_id ON vehicle_trajectories(vehicle_id); +CREATE INDEX IF NOT EXISTS idx_vehicle_trajectories_date ON vehicle_trajectories(trajectory_date DESC); +CREATE INDEX IF NOT EXISTS idx_vehicle_trajectories_start_time ON vehicle_trajectories(start_time DESC); + +-- PostGIS轨迹空间索引 +CREATE INDEX IF NOT EXISTS idx_vehicle_trajectories_line_gist ON vehicle_trajectories USING GIST(trajectory_line); + +-- 复合索引 +CREATE INDEX IF NOT EXISTS idx_vehicle_trajectories_compound ON vehicle_trajectories(vehicle_id, trajectory_date DESC); + +-- ============================================ +-- 4. 时间分区设置 (车辆位置表按月分区) +-- ============================================ + +-- 为车辆位置表创建按月分区 +-- 注意：这需要在数据库中手动执行，Spring Boot JPA不会自动创建分区 + +-- 创建分区表函数 (示例，需要根据实际需求调整) +-- CREATE OR REPLACE FUNCTION create_monthly_partitions() +-- RETURNS void AS $$ +-- DECLARE +-- start_date date; +-- end_date date; +-- table_name text; +-- BEGIN +-- FOR i IN 0..12 LOOP -- 创建未来12个月的分区 +-- start_date := date_trunc('month', CURRENT_DATE + (i || ' month')::interval); +-- end_date := start_date + interval '1 month'; +-- table_name := 'vehicle_locations_' || to_char(start_date, 'YYYY_MM'); +-- +-- EXECUTE format('CREATE TABLE IF NOT EXISTS %I PARTITION OF vehicle_locations +-- FOR VALUES FROM (%L) TO (%L)', +-- table_name, start_date, end_date); +-- END LOOP; +-- END; +-- $$ LANGUAGE plpgsql; + +-- ============================================ +-- 5. 触发器 (自动更新updated_at字段) +-- ============================================ + +-- 创建更新时间戳函数 +CREATE OR REPLACE FUNCTION update_updated_at_column() +RETURNS TRIGGER AS $$ +BEGIN + NEW.updated_at = CURRENT_TIMESTAMP; + RETURN NEW; +END; +$$ LANGUAGE plpgsql; + +-- 为车辆位置表创建触发器 +CREATE TRIGGER trigger_vehicle_locations_updated_at + BEFORE UPDATE ON vehicle_locations + FOR EACH ROW + EXECUTE FUNCTION update_updated_at_column(); + +-- 为机场区域表创建触发器 +CREATE TRIGGER trigger_airport_areas_updated_at + BEFORE UPDATE ON airport_areas + FOR EACH ROW + EXECUTE FUNCTION update_updated_at_column(); + +-- ============================================ +-- 6. 数据清理策略 (可选) +-- ============================================ + +-- 创建历史数据清理函数 (保留30天数据) +CREATE OR REPLACE FUNCTION cleanup_old_vehicle_locations() +RETURNS INTEGER AS $$ +DECLARE + deleted_count INTEGER; +BEGIN + DELETE FROM vehicle_locations + WHERE created_at < CURRENT_TIMESTAMP - INTERVAL '30 days'; + + GET DIAGNOSTICS deleted_count = ROW_COUNT; + + -- 记录清理信息 + RAISE NOTICE 'Cleaned up % old vehicle location records', deleted_count; + + RETURN deleted_count; +END; +$$ LANGUAGE plpgsql; + +-- ============================================ +-- 7. 权限设置 (根据实际需求调整) +-- ============================================ + +-- 为应用用户赋予必要权限 +-- GRANT SELECT, INSERT, UPDATE, DELETE ON ALL TABLES IN SCHEMA public TO collision_avoidance_app; +-- GRANT USAGE, SELECT ON ALL SEQUENCES IN SCHEMA public TO collision_avoidance_app; + +-- ============================================ +-- 8. 示例数据 (可选，用于测试) +-- ============================================ + +-- 插入示例机场区域 +-- INSERT INTO airport_areas (area_id, name, type, boundary, priority, speed_limit_kph, enabled, allowed_vehicle_types) VALUES +-- ('runway_01', 'Runway 01', 'RUNWAY', ST_GeomFromText('POLYGON((116.5 39.8, 116.52 39.8, 116.52 39.81, 116.5 39.81, 116.5 39.8))', 4326), 10, 20.0, true, '["AIRCRAFT"]'), +-- ('taxiway_a', 'Taxiway A', 'TAXIWAY', ST_GeomFromText('POLYGON((116.51 39.79, 116.515 39.79, 116.515 39.795, 116.51 39.795, 116.51 39.79))', 4326), 5, 15.0, true, '["AIRCRAFT", "SPECIAL_VEHICLE"]'), +-- ('terminal_area', 'Terminal Area', 'TERMINAL', ST_GeomFromText('POLYGON((116.48 39.78, 116.50 39.78, 116.50 39.80, 116.48 39.80, 116.48 39.78))', 4326), 3, 10.0, true, '["SPECIAL_VEHICLE", "UNMANNED_VEHICLE"]'); + +-- V002迁移脚本完成 +-- ============================================ \ No newline at end of file diff --git a/src/test/java/com/dongni/collisionavoidance/areas/service/AirportAreaServiceIntegrationTest.java b/src/test/java/com/dongni/collisionavoidance/areas/service/AirportAreaServiceIntegrationTest.java index db4431b..5b85152 100644 --- a/src/test/java/com/dongni/collisionavoidance/areas/service/AirportAreaServiceIntegrationTest.java +++ b/src/test/java/com/dongni/collisionavoidance/areas/service/AirportAreaServiceIntegrationTest.java @@ -94,6 +94,8 @@ class AirportAreaServiceIntegrationTest { Polygon boundary, int priority, boolean restricted, Double speedLimit) { AirportArea area = new AirportArea(); + // 添加必需的areaId字段 + area.setAreaId(name.replaceAll("\\s+", "_").toLowerCase() + "_" + System.currentTimeMillis() % 10000); area.setName(name); area.setType(type); area.setDescription(description); @@ -102,6 +104,19 @@ class AirportAreaServiceIntegrationTest { area.setRestricted(restricted); area.setSpeedLimitKph(speedLimit); area.setEnabled(true); + + // 设置JSONB字段为合适的JSON字符串 + if ("RUNWAY".equals(type)) { + area.setAllowedVehicleTypes("[\"AIRCRAFT\"]"); + area.setAllowedAircraftTypes("[\"A320\", \"B737\", \"A330\"]"); + } else if ("TAXIWAY".equals(type)) { + area.setAllowedVehicleTypes("[\"FOLLOW_ME\", \"TUG\", \"FUEL_TRUCK\"]"); + area.setAllowedAircraftTypes("[\"AIRCRAFT\"]"); + } else { + area.setAllowedVehicleTypes("[\"GROUND_VEHICLE\"]"); + area.setAllowedAircraftTypes("[]"); + } + area.setCreatedAt(LocalDateTime.now()); area.setUpdatedAt(LocalDateTime.now()); return area; diff --git a/src/test/java/com/dongni/collisionavoidance/common/repository/AirportAreaRepositoryTest.java b/src/test/java/com/dongni/collisionavoidance/common/repository/AirportAreaRepositoryTest.java index 044988d..668e4fc 100644 --- a/src/test/java/com/dongni/collisionavoidance/common/repository/AirportAreaRepositoryTest.java +++ b/src/test/java/com/dongni/collisionavoidance/common/repository/AirportAreaRepositoryTest.java @@ -10,11 +10,13 @@ import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.Point; import org.locationtech.jts.geom.Polygon; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -25,7 +27,7 @@ import static org.assertj.core.api.Assertions.assertThat; * AirportAreaRepository 单元测试 * 测试PostGIS空间查询功能和区域数据持久化 */ -@DataJpaTest +@SpringBootTest @ActiveProfiles("test") @Transactional class AirportAreaRepositoryTest { @@ -33,8 +35,8 @@ class AirportAreaRepositoryTest { @Autowired private AirportAreaRepository repository; - @Autowired - private TestEntityManager entityManager; + @PersistenceContext + private EntityManager entityManager; private final GeometryFactory geometryFactory = new GeometryFactory(); private AirportArea runwayArea; @@ -298,6 +300,22 @@ class AirportAreaRepositoryTest { area.setRestricted(restricted); area.setSpeedLimitKph(speedLimit); area.setEnabled(true); + + // 设置JSONB字段为合适的JSON字符串 + if ("RUNWAY".equals(type)) { + area.setAllowedVehicleTypes("[\"AIRCRAFT\"]"); + area.setAllowedAircraftTypes("[\"A320\", \"B737\", \"A330\"]"); + } else if ("TAXIWAY".equals(type)) { + area.setAllowedVehicleTypes("[\"FOLLOW_ME\", \"TUG\", \"FUEL_TRUCK\"]"); + area.setAllowedAircraftTypes("[\"AIRCRAFT\"]"); + } else if ("APRON".equals(type)) { + area.setAllowedVehicleTypes("[\"TUG\", \"FUEL_TRUCK\", \"BAGGAGE_CART\"]"); + area.setAllowedAircraftTypes("[\"A320\", \"B737\"]"); + } else { + area.setAllowedVehicleTypes("[\"GROUND_VEHICLE\"]"); + area.setAllowedAircraftTypes("[]"); + } + area.setCreatedAt(LocalDateTime.now()); area.setUpdatedAt(LocalDateTime.now()); diff --git a/src/test/java/com/dongni/collisionavoidance/common/repository/VehicleLocationRepositoryTest.java b/src/test/java/com/dongni/collisionavoidance/common/repository/VehicleLocationRepositoryTest.java index 138d5f7..769162a 100644 --- a/src/test/java/com/dongni/collisionavoidance/common/repository/VehicleLocationRepositoryTest.java +++ b/src/test/java/com/dongni/collisionavoidance/common/repository/VehicleLocationRepositoryTest.java @@ -11,11 +11,13 @@ import org.locationtech.jts.geom.Coordinate; import org.locationtech.jts.geom.GeometryFactory; import org.locationtech.jts.geom.Point; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; -import org.springframework.boot.test.autoconfigure.orm.jpa.TestEntityManager; +import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.ActiveProfiles; import org.springframework.transaction.annotation.Transactional; +import jakarta.persistence.EntityManager; +import jakarta.persistence.PersistenceContext; + import java.time.LocalDateTime; import java.util.List; import java.util.Optional; @@ -27,7 +29,7 @@ import static org.assertj.core.api.Assertions.within; * VehicleLocationRepository 单元测试 * 测试PostGIS空间查询功能和数据持久化 */ -@DataJpaTest +@SpringBootTest @ActiveProfiles("test") @Transactional class VehicleLocationRepositoryTest { @@ -35,8 +37,8 @@ class VehicleLocationRepositoryTest { @Autowired private VehicleLocationRepository repository; - @Autowired - private TestEntityManager entityManager; + @PersistenceContext + private EntityManager entityManager; private final GeometryFactory geometryFactory = new GeometryFactory(); private VehicleLocation testVehicle1; @@ -169,11 +171,11 @@ class VehicleLocationRepositoryTest { LocalDateTime since = LocalDateTime.now().minusMinutes(30); // 查询活跃的航空器 - List aircrafts = repository.findActiveByVehicleType("AIRCRAFT", since); + List aircrafts = repository.findActiveByVehicleType(MovingObjectType.AIRCRAFT, since); assertThat(aircrafts).hasSizeGreaterThanOrEqualTo(2); // 查询活跃的特勤车辆 - List specialVehicles = repository.findActiveByVehicleType("SPECIAL_VEHICLE", since); + List specialVehicles = repository.findActiveByVehicleType(MovingObjectType.SPECIAL_VEHICLE, since); assertThat(specialVehicles).hasSizeGreaterThanOrEqualTo(1); } diff --git a/src/test/java/com/dongni/collisionavoidance/roads/service/RoadNetworkServiceIntegrationTest.java b/src/test/java/com/dongni/collisionavoidance/roads/service/RoadNetworkServiceIntegrationTest.java index 29f7a6b..c77ec06 100644 --- a/src/test/java/com/dongni/collisionavoidance/roads/service/RoadNetworkServiceIntegrationTest.java +++ b/src/test/java/com/dongni/collisionavoidance/roads/service/RoadNetworkServiceIntegrationTest.java @@ -2,7 +2,6 @@ package com.dongni.collisionavoidance.roads.service; import com.dongni.collisionavoidance.common.model.GeoPosition; import com.dongni.collisionavoidance.dataCollector.service.DataCollectorService; -// import com.dongni.collisionavoidance.dataProcessing.service.DataProcessor; // 已删除 import com.dongni.collisionavoidance.roads.model.RoadInfo; import com.dongni.collisionavoidance.config.TestConfig; import org.junit.jupiter.api.Test; diff --git a/src/test/resources/application-test.yml b/src/test/resources/application-test.yml index cffe937..6414a44 100644 --- a/src/test/resources/application-test.yml +++ b/src/test/resources/application-test.yml @@ -1,4 +1,29 @@ spring: + # 测试数据库配置 - 使用现有的collision_avoidance数据库 + datasource: + url: jdbc:postgresql://localhost:5432/collision_avoidance + driver-class-name: org.postgresql.Driver + username: postgres + password: 123456 + hikari: + connection-timeout: 20000 + maximum-pool-size: 5 + minimum-idle: 1 + + # JPA配置 + jpa: + hibernate: + ddl-auto: validate # 验证表结构但不修改 + show-sql: false # 减少测试日志输出 + properties: + hibernate: + dialect: org.hibernate.spatial.dialect.postgis.PostgisPG95Dialect + format_sql: false + + # 禁用Flyway在测试中执行 - 使用JPA自动建表 + flyway: + enabled: false + # 禁用MongoDB自动配置 autoconfigure: exclude: