diff --git a/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java b/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java index 61f9f8f..2d8d353 100644 --- a/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java +++ b/src/main/java/com/ruoyi/airline/domain/model/AirlineFile.java @@ -77,6 +77,31 @@ public class AirlineFile extends BaseEntity { */ private String fileMd5; + /** + * 爬升模式 + */ + private String climbMode; + + /** + * 海拔高度 + */ + private Double altitude; + + /** + * 飞行速度 + */ + private Double flightSpeed; + + /** + * 全局航点高度 + */ + private Double globalWaypointHeight; + + /** + * 拍照模式 + */ + private String photoMode; + /** * 大疆航线对应的oss地址(可能存kmz也可能存waypoint,要看fileUrl存的是啥,这个字段存反的) */ @@ -133,6 +158,11 @@ public class AirlineFile extends BaseEntity { ", source='" + source + '\'' + ", status=" + status + ", fileMd5='" + fileMd5 + '\'' + + ", climbMode='" + climbMode + '\'' + + ", altitude=" + altitude + + ", flightSpeed=" + flightSpeed + + ", globalWaypointHeight=" + globalWaypointHeight + + ", photoMode='" + photoMode + '\'' + ", djiFileUrl='" + djiFileUrl + '\'' + ", djiRthAltitude=" + djiRthAltitude + ", turnRadius=" + turnRadius + diff --git a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java index 7a10883..8027957 100644 --- a/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java +++ b/src/main/java/com/ruoyi/airline/mapper/entity/AirlineFileEntity.java @@ -70,6 +70,31 @@ public class AirlineFileEntity extends BaseEntity { * 航线文件对应的 MD5指纹 */ private String fileMd5; + + /** + * 爬升模式 + */ + private String climbMode; + + /** + * 海拔高度 + */ + private Double altitude; + + /** + * 飞行速度 + */ + private Double flightSpeed; + + /** + * 全局航点高度 + */ + private Double globalWaypointHeight; + + /** + * 拍照模式 + */ + private String photoMode; /** * 分组ID diff --git a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java index 973a814..d318d72 100644 --- a/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java +++ b/src/main/java/com/ruoyi/airline/service/dto/AirlineFileDTO.java @@ -83,6 +83,31 @@ public class AirlineFileDTO extends BaseEntity { */ private String fileMd5; + /** + * 爬升模式 + */ + private String climbMode; + + /** + * 海拔高度 + */ + private Double altitude; + + /** + * 飞行速度 + */ + private Double flightSpeed; + + /** + * 全局航点高度 + */ + private Double globalWaypointHeight; + + /** + * 拍照模式 + */ + private String photoMode; + /** * 大疆航线对应的oss地址(可能存kmz也可能存waypoint,要看fileUrl存的是啥,这个字段存反的) */ @@ -138,6 +163,11 @@ public class AirlineFileDTO extends BaseEntity { ", source='" + source + '\'' + ", status=" + status + ", fileMd5='" + fileMd5 + '\'' + + ", climbMode='" + climbMode + '\'' + + ", altitude=" + altitude + + ", flightSpeed=" + flightSpeed + + ", globalWaypointHeight=" + globalWaypointHeight + + ", photoMode='" + photoMode + '\'' + ", djiFileUrl='" + djiFileUrl + '\'' + ", djiRthAltitude=" + djiRthAltitude + ", turnRadius=" + turnRadius + diff --git a/src/main/resources/db/migration/V1__Create_airline_tables.sql b/src/main/resources/db/migration/V1__Create_airline_tables.sql index 0246f78..40ed6e7 100644 --- a/src/main/resources/db/migration/V1__Create_airline_tables.sql +++ b/src/main/resources/db/migration/V1__Create_airline_tables.sql @@ -10,6 +10,11 @@ CREATE TABLE IF NOT EXISTS airline_file ( source VARCHAR(255) COMMENT '数据来源', status INT(11) DEFAULT 1 COMMENT '1 启用 0 停用。默认启用。', file_md5 VARCHAR(255) COMMENT '航线文件对应的 MD5指纹', + climb_mode VARCHAR(64) COMMENT '爬升模式', + altitude DOUBLE COMMENT '海拔高度', + flight_speed DOUBLE COMMENT '飞行速度', + global_waypoint_height DOUBLE COMMENT '全局航点高度', + photo_mode VARCHAR(64) COMMENT '拍照模式', create_by VARCHAR(64) DEFAULT '' COMMENT '创建者', create_time DATETIME COMMENT '创建时间', update_by VARCHAR(64) DEFAULT '' COMMENT '更新者', diff --git a/src/main/resources/mapper/airline/AirlineFileMapper.xml b/src/main/resources/mapper/airline/AirlineFileMapper.xml index ab0b2cb..e7060b7 100644 --- a/src/main/resources/mapper/airline/AirlineFileMapper.xml +++ b/src/main/resources/mapper/airline/AirlineFileMapper.xml @@ -16,6 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + + + + @@ -25,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - insert into airline_file (name, air_vendor, air_type, file_name, file_url, type, source, status, file_md5, create_by, create_time, update_by, update_time, remark) - values (#{name}, #{airVendor}, #{airType}, #{fileName}, #{fileUrl}, #{type}, #{source}, #{status}, #{fileMd5}, #{createBy}, now(), #{updateBy}, now(), #{remark}) + insert into airline_file (name, air_vendor, air_type, file_name, file_url, type, source, status, file_md5, climb_mode, altitude, flight_speed, global_waypoint_height, photo_mode, create_by, create_time, update_by, update_time, remark) + values (#{name}, #{airVendor}, #{airType}, #{fileName}, #{fileUrl}, #{type}, #{source}, #{status}, #{fileMd5}, #{climbMode}, #{altitude}, #{flightSpeed}, #{globalWaypointHeight}, #{photoMode}, #{createBy}, now(), #{updateBy}, now(), #{remark}) - select id, name, air_vendor, air_type, file_name, file_url, type, source, status, file_md5, create_by, create_time, update_by, update_time, remark + select id, name, air_vendor, air_type, file_name, file_url, type, source, status, file_md5, climb_mode, altitude, flight_speed, global_waypoint_height, photo_mode, create_by, create_time, update_by, update_time, remark from airline_file where name like concat(#{name}, '%')