From de026326a9df6f4a2192e99cf0e53e7e7b6d445d Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 24 Oct 2025 17:29:33 +0800
Subject: [PATCH] 1.整理文件管理文件路径。 2.新增航线信息接口业务。 3.优化KMZ文件接口业务逻辑。 4.pom文件修改。 5.增加业务工具类。 6.增加部分业务注解。 7.增加修改无人机状态方法。
---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 43 +++++++++++++++++++++++++++++--------------
1 files changed, 29 insertions(+), 14 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index cfab1bc..6c78ec8 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -10,12 +10,13 @@
<result property="boxName" column="box_name" />
<result property="boxVersion" column="box_version" />
<result property="startTime" column="start_time" />
- <result property="onLine" column="onLine" />
+ <result property="onLine" column="on_line" />
<result property="videoServer" column="video_server" />
<result property="videoPort" column="video_port" />
<result property="lastTaskId" column="last_task_id" />
<result property="userId" column="user_id" />
<result property="deptId" column="dept_id" />
+ <result property="boxAliasName" column="box_alias_name" />
<result property="createBy" column="create_by" />
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
@@ -37,24 +38,25 @@
<sql id="selectArdDroneVo">
select id,
- box_sn,
- box_name,
- box_version,
- start_time,
- on_line,
- video_server,
- video_port,
- last_task_id,
- server_id,
- user_id,
- dept_id
+ box_sn,
+ box_name,
+ box_version,
+ start_time,
+ on_line,
+ video_server,
+ video_port,
+ last_task_id,
+ server_id,
+ user_id,
+ dept_id,
+ box_alias_name
from ard_drone_info
</sql>
<select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneInfoResult">
<include refid="selectArdDroneVo"/>
- <where>
- <if test="boxSn != null and boxSn != ''"> and box_sn = #{boxSn}</if>
+ <where>
+ <if test="boxSn != null and boxSn != ''"> and box_sn like concat('%', #{boxSn}, '%')</if>
<if test="boxName != null and boxName != ''"> and box_name like concat('%', #{boxName}, '%')</if>
<if test="boxVersion != null and boxVersion != ''"> and box_version = #{boxVersion}</if>
<if test="onLine != null "> and onLine = #{onLine}</if>
@@ -87,6 +89,7 @@
<if test="serverId != null">server_id,</if>
<if test="userId != null">user_id,</if>
<if test="deptId != null">dept_id,</if>
+ <if test="boxAliasName != null">box_alias_name,</if>
<if test="createBy != null">create_by,</if>
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
@@ -106,6 +109,7 @@
<if test="serverId != null">#{serverId},</if>
<if test="userId != null">#{userId},</if>
<if test="deptId != null">#{deptId},</if>
+ <if test="boxAliasName != null">#{boxAliasName},</if>
<if test="createBy != null">#{createBy},</if>
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
@@ -128,6 +132,7 @@
<if test="serverId != null">server_id = #{serverId},</if>
<if test="userId != null">user_id = #{userId},</if>
<if test="deptId != null">dept_id = #{deptId},</if>
+ <if test="boxAliasName != null">box_alias_name = #{boxAliasName},</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>
@@ -162,6 +167,7 @@
server_id,
user_id,
dept_id,
+ box_alias_name,
create_by,
create_time,
update_by,
@@ -181,6 +187,7 @@
#{item.serverId},
#{item.userId},
#{item.deptId},
+ #{item.boxAliasName},
#{item.createBy},
#{item.createTime},
#{item.updateBy},
@@ -189,4 +196,12 @@
</foreach>
</insert>
+ <update id="updateDroneStatus">
+ update ard_drone_info
+ <trim prefix="SET" suffixOverrides=",">
+ <if test="onLine != null">on_line = #{onLine},</if>
+ </trim>
+ where server_id = #{serverId}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3