From 3f43e40ed1a1e9f66b3ad2862da9dbc4b710c712 Mon Sep 17 00:00:00 2001
From: nishiwei <13126973358@163.com>
Date: Fri, 23 Oct 2026 14:09:47 +0800
Subject: [PATCH] 智云3.0机场1适配内容提交
---
ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml | 37 +++++++++++++++++++++++++++++++++----
1 files changed, 33 insertions(+), 4 deletions(-)
diff --git a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
index 2b0e11e..cc91190 100644
--- a/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
+++ b/ard-route/src/main/resources/mapper/ArdRouteInfoMapper.xml
@@ -13,11 +13,15 @@
<result property="aircraft" column="aircraft" />
<result property="payload" column="payload" />
<result property="routeData" column="route_data" />
+ <result property="cloudData" column="cloud_data" />
<result property="readOnly" column="read_only" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
+ <result property="pointCount" column="point_count" />
+ <result property="isLoop" column="is_loop" />
+ <result property="missionId" column="mission_id" />
</resultMap>
<sql id="selectArdRouteInfoVo">
@@ -29,23 +33,36 @@
aircraft,
payload,
route_data,
+ cloud_data,
read_only,
create_by,
create_time,
update_by,
- update_time
+ update_time,
+ point_count,
+ is_loop,
+ mission_id
from ard_route_info
</sql>
<select id="selectArdRouteInfoList" parameterType="ArdRouteInfo" resultMap="ArdRouteInfoResult">
<include refid="selectArdRouteInfoVo"/>
<where>
- <if test="name != null and kmzName != ''"> and name like concat('%', #{name}, '%')</if>
+ <if test="name != null and name != ''"> and name like concat('%', #{name}, '%')</if>
<if test="aircraft != null and aircraft != ''"> and aircraft = #{aircraft}</if>
<if test="payload != null and payload != ''"> and payload = #{payload}</if>
<if test="type != null and type != ''"> and type = #{type}</if>
<if test="path != null and path != ''"> and path = #{path}</if>
+ <if test="groupId != null"> and group_id = #{groupId}</if>
+ <if test="isLoop != null"> and is_loop = #{isLoop}</if>
</where>
+ <if test="orderByTime == null and orderByTime == ''">
+ ORDER BY update_time DESC
+ </if>
+ <!-- 动态排序 -->
+ <if test="orderByTime != null and orderByTime != ''">
+ ORDER BY update_time ${orderByTime}
+ </if>
</select>
<select id="selectArdRouteInfoById" parameterType="String" resultMap="ArdRouteInfoResult">
@@ -64,11 +81,15 @@
<if test="aircraft != null">aircraft,</if>
<if test="payload != null">payload,</if>
<if test="routeData != null">route_data,</if>
+ <if test="cloudData != null">cloud_data,</if>
<if test="readOnly != null">read_only,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
+ <if test="pointCount != null">point_count,</if>
+ <if test="isLoop != null">is_loop,</if>
+ <if test="missionId != null">mission_id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id},</if>
@@ -79,11 +100,15 @@
<if test="aircraft != null">#{aircraft},</if>
<if test="payload != null">#{payload},</if>
<if test="routeData != null">#{routeData},</if>
+ <if test="cloudData != null">#{cloudData},</if>
<if test="readOnly != null">#{readOnly},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
+ <if test="pointCount != null">#{pointCount},</if>
+ <if test="isLoop != null">#{isLoop},</if>
+ <if test="missionId != null">#{missionId},</if>
</trim>
</insert>
@@ -97,11 +122,15 @@
<if test="aircraft != null">aircraft = #{aircraft},</if>
<if test="payload != null">payload = #{payload},</if>
<if test="routeData != null">route_data = #{routeData},</if>
+ <if test="cloudData != null">cloud_data = #{cloudData},</if>
<if test="readOnly != null">read_only = #{readOnly},</if>
<if test="createBy != null">create_by = #{createBy},</if>
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
+ <if test="pointCount != null">point_count = #{pointCount},</if>
+ <if test="isLoop != null">is_loop = #{isLoop},</if>
+ <if test="missionId != null">mission_id = #{missionId},</if>
</trim>
where id = #{id}
</update>
@@ -119,7 +148,7 @@
<select id="selectArdRouteInfoByName" parameterType="String" resultMap="ArdRouteInfoResult">
<include refid="selectArdRouteInfoVo"/>
- where file_name = #{fileName}
+ where name = #{name}
</select>
<delete id="deleteRouteInforByGroupIds" parameterType="String">
@@ -130,7 +159,7 @@
</delete>
<select id="selectArdRouteInfoByGroupId" parameterType="String" resultMap="ArdRouteInfoResult">
- select id,name,path,group_id,type,aircraft,payload,read_only,create_by,create_time,update_by,update_time from ard_route_info
+ <include refid="selectArdRouteInfoVo"/>
<where>
<if test="groupId != null "> and group_id = #{groupId}</if>
</where>
--
Gitblit v1.9.3