feat:增加航线属性字段
This commit is contained in:
parent
78428c9e98
commit
4a6cb25af2
|
|
@ -77,6 +77,31 @@ public class AirlineFile extends BaseEntity {
|
||||||
*/
|
*/
|
||||||
private String fileMd5;
|
private String fileMd5;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 爬升模式
|
||||||
|
*/
|
||||||
|
private String climbMode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 海拔高度
|
||||||
|
*/
|
||||||
|
private Double altitude;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 飞行速度
|
||||||
|
*/
|
||||||
|
private Double flightSpeed;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 全局航点高度
|
||||||
|
*/
|
||||||
|
private Double globalWaypointHeight;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 拍照模式
|
||||||
|
*/
|
||||||
|
private String photoMode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 大疆航线对应的oss地址(可能存kmz也可能存waypoint,要看fileUrl存的是啥,这个字段存反的)
|
* 大疆航线对应的oss地址(可能存kmz也可能存waypoint,要看fileUrl存的是啥,这个字段存反的)
|
||||||
*/
|
*/
|
||||||
|
|
@ -133,6 +158,11 @@ public class AirlineFile extends BaseEntity {
|
||||||
", source='" + source + '\'' +
|
", source='" + source + '\'' +
|
||||||
", status=" + status +
|
", status=" + status +
|
||||||
", fileMd5='" + fileMd5 + '\'' +
|
", fileMd5='" + fileMd5 + '\'' +
|
||||||
|
", climbMode='" + climbMode + '\'' +
|
||||||
|
", altitude=" + altitude +
|
||||||
|
", flightSpeed=" + flightSpeed +
|
||||||
|
", globalWaypointHeight=" + globalWaypointHeight +
|
||||||
|
", photoMode='" + photoMode + '\'' +
|
||||||
", djiFileUrl='" + djiFileUrl + '\'' +
|
", djiFileUrl='" + djiFileUrl + '\'' +
|
||||||
", djiRthAltitude=" + djiRthAltitude +
|
", djiRthAltitude=" + djiRthAltitude +
|
||||||
", turnRadius=" + turnRadius +
|
", turnRadius=" + turnRadius +
|
||||||
|
|
|
||||||
|
|
@ -70,6 +70,31 @@ public class AirlineFileEntity extends BaseEntity {
|
||||||
* 航线文件对应的 MD5指纹
|
* 航线文件对应的 MD5指纹
|
||||||
*/
|
*/
|
||||||
private String fileMd5;
|
private String fileMd5;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 爬升模式
|
||||||
|
*/
|
||||||
|
private String climbMode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 海拔高度
|
||||||
|
*/
|
||||||
|
private Double altitude;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 飞行速度
|
||||||
|
*/
|
||||||
|
private Double flightSpeed;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 全局航点高度
|
||||||
|
*/
|
||||||
|
private Double globalWaypointHeight;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 拍照模式
|
||||||
|
*/
|
||||||
|
private String photoMode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 分组ID
|
* 分组ID
|
||||||
|
|
|
||||||
|
|
@ -83,6 +83,31 @@ public class AirlineFileDTO extends BaseEntity {
|
||||||
*/
|
*/
|
||||||
private String fileMd5;
|
private String fileMd5;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 爬升模式
|
||||||
|
*/
|
||||||
|
private String climbMode;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 海拔高度
|
||||||
|
*/
|
||||||
|
private Double altitude;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 飞行速度
|
||||||
|
*/
|
||||||
|
private Double flightSpeed;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 全局航点高度
|
||||||
|
*/
|
||||||
|
private Double globalWaypointHeight;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 拍照模式
|
||||||
|
*/
|
||||||
|
private String photoMode;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 大疆航线对应的oss地址(可能存kmz也可能存waypoint,要看fileUrl存的是啥,这个字段存反的)
|
* 大疆航线对应的oss地址(可能存kmz也可能存waypoint,要看fileUrl存的是啥,这个字段存反的)
|
||||||
*/
|
*/
|
||||||
|
|
@ -138,6 +163,11 @@ public class AirlineFileDTO extends BaseEntity {
|
||||||
", source='" + source + '\'' +
|
", source='" + source + '\'' +
|
||||||
", status=" + status +
|
", status=" + status +
|
||||||
", fileMd5='" + fileMd5 + '\'' +
|
", fileMd5='" + fileMd5 + '\'' +
|
||||||
|
", climbMode='" + climbMode + '\'' +
|
||||||
|
", altitude=" + altitude +
|
||||||
|
", flightSpeed=" + flightSpeed +
|
||||||
|
", globalWaypointHeight=" + globalWaypointHeight +
|
||||||
|
", photoMode='" + photoMode + '\'' +
|
||||||
", djiFileUrl='" + djiFileUrl + '\'' +
|
", djiFileUrl='" + djiFileUrl + '\'' +
|
||||||
", djiRthAltitude=" + djiRthAltitude +
|
", djiRthAltitude=" + djiRthAltitude +
|
||||||
", turnRadius=" + turnRadius +
|
", turnRadius=" + turnRadius +
|
||||||
|
|
|
||||||
|
|
@ -10,6 +10,11 @@ CREATE TABLE IF NOT EXISTS airline_file (
|
||||||
source VARCHAR(255) COMMENT '数据来源',
|
source VARCHAR(255) COMMENT '数据来源',
|
||||||
status INT(11) DEFAULT 1 COMMENT '1 启用 0 停用。默认启用。',
|
status INT(11) DEFAULT 1 COMMENT '1 启用 0 停用。默认启用。',
|
||||||
file_md5 VARCHAR(255) COMMENT '航线文件对应的 MD5指纹',
|
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_by VARCHAR(64) DEFAULT '' COMMENT '创建者',
|
||||||
create_time DATETIME COMMENT '创建时间',
|
create_time DATETIME COMMENT '创建时间',
|
||||||
update_by VARCHAR(64) DEFAULT '' COMMENT '更新者',
|
update_by VARCHAR(64) DEFAULT '' COMMENT '更新者',
|
||||||
|
|
|
||||||
|
|
@ -16,6 +16,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<result property="source" column="source" />
|
<result property="source" column="source" />
|
||||||
<result property="status" column="status" />
|
<result property="status" column="status" />
|
||||||
<result property="fileMd5" column="file_md5" />
|
<result property="fileMd5" column="file_md5" />
|
||||||
|
<result property="climbMode" column="climb_mode" />
|
||||||
|
<result property="altitude" column="altitude" />
|
||||||
|
<result property="flightSpeed" column="flight_speed" />
|
||||||
|
<result property="globalWaypointHeight" column="global_waypoint_height" />
|
||||||
|
<result property="photoMode" column="photo_mode" />
|
||||||
<result property="createBy" column="create_by" />
|
<result property="createBy" column="create_by" />
|
||||||
<result property="createTime" column="create_time" />
|
<result property="createTime" column="create_time" />
|
||||||
<result property="updateBy" column="update_by" />
|
<result property="updateBy" column="update_by" />
|
||||||
|
|
@ -25,13 +30,13 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
|
||||||
<!-- 保存航线文件 -->
|
<!-- 保存航线文件 -->
|
||||||
<insert id="save" parameterType="com.ruoyi.airline.mapper.entity.AirlineFileEntity" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
|
<insert id="save" parameterType="com.ruoyi.airline.mapper.entity.AirlineFileEntity" useGeneratedKeys="true" keyProperty="id" keyColumn="id">
|
||||||
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)
|
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}, #{createBy}, now(), #{updateBy}, now(), #{remark})
|
values (#{name}, #{airVendor}, #{airType}, #{fileName}, #{fileUrl}, #{type}, #{source}, #{status}, #{fileMd5}, #{climbMode}, #{altitude}, #{flightSpeed}, #{globalWaypointHeight}, #{photoMode}, #{createBy}, now(), #{updateBy}, now(), #{remark})
|
||||||
</insert>
|
</insert>
|
||||||
|
|
||||||
<!-- 根据ID列表查询航线文件 -->
|
<!-- 根据ID列表查询航线文件 -->
|
||||||
<select id="selectFileListByIds" parameterType="java.util.List" resultMap="AirlineFileResult">
|
<select id="selectFileListByIds" parameterType="java.util.List" resultMap="AirlineFileResult">
|
||||||
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
|
from airline_file
|
||||||
where id in
|
where id in
|
||||||
<foreach item="id" collection="list" open="(" separator="," close=")">
|
<foreach item="id" collection="list" open="(" separator="," close=")">
|
||||||
|
|
@ -41,14 +46,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
|
|
||||||
<!-- 根据航线名称模糊查询航线文件 -->
|
<!-- 根据航线名称模糊查询航线文件 -->
|
||||||
<select id="selectFileNameLike" parameterType="java.lang.String" resultMap="AirlineFileResult">
|
<select id="selectFileNameLike" parameterType="java.lang.String" resultMap="AirlineFileResult">
|
||||||
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
|
from airline_file
|
||||||
where name like concat(#{name}, '%')
|
where name like concat(#{name}, '%')
|
||||||
</select>
|
</select>
|
||||||
|
|
||||||
<!-- 根据分组ID和航线名称模糊查询航线文件 -->
|
<!-- 根据分组ID和航线名称模糊查询航线文件 -->
|
||||||
<select id="selectFileNameLikeByGroupId" parameterType="java.util.Map" resultMap="AirlineFileResult">
|
<select id="selectFileNameLikeByGroupId" parameterType="java.util.Map" resultMap="AirlineFileResult">
|
||||||
select af.id, af.name, af.air_vendor, af.air_type, af.file_name, af.file_url, af.type, af.source, af.status, af.file_md5, af.create_by, af.create_time, af.update_by, af.update_time, af.remark
|
select af.id, af.name, af.air_vendor, af.air_type, af.file_name, af.file_url, af.type, af.source, af.status, af.file_md5, af.climb_mode, af.altitude, af.flight_speed, af.global_waypoint_height, af.photo_mode, af.create_by, af.create_time, af.update_by, af.update_time, af.remark
|
||||||
from airline_file af
|
from airline_file af
|
||||||
inner join airline_file_group_info afgi on af.id = afgi.airline_id
|
inner join airline_file_group_info afgi on af.id = afgi.airline_id
|
||||||
where afgi.del_flag = 0
|
where afgi.del_flag = 0
|
||||||
|
|
@ -85,6 +90,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
||||||
<if test="fileMd5 != null">
|
<if test="fileMd5 != null">
|
||||||
file_md5 = #{fileMd5},
|
file_md5 = #{fileMd5},
|
||||||
</if>
|
</if>
|
||||||
|
<if test="climbMode != null">
|
||||||
|
climb_mode = #{climbMode},
|
||||||
|
</if>
|
||||||
|
<if test="altitude != null">
|
||||||
|
altitude = #{altitude},
|
||||||
|
</if>
|
||||||
|
<if test="flightSpeed != null">
|
||||||
|
flight_speed = #{flightSpeed},
|
||||||
|
</if>
|
||||||
|
<if test="globalWaypointHeight != null">
|
||||||
|
global_waypoint_height = #{globalWaypointHeight},
|
||||||
|
</if>
|
||||||
|
<if test="photoMode != null">
|
||||||
|
photo_mode = #{photoMode},
|
||||||
|
</if>
|
||||||
<if test="updateBy != null">
|
<if test="updateBy != null">
|
||||||
update_by = #{updateBy},
|
update_by = #{updateBy},
|
||||||
</if>
|
</if>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue