From 9de7bdfd10bf84a5e5fbbdc4853e8b30bf7cd0c9 Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Thu, 04 Dec 2025 13:15:05 +0800
Subject: [PATCH] 2025-12-03 zwy 跟踪任务id获取任务详情接口调整；定时任务时，增加status状态pending：待执行，并发给前端
---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 78 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 28 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index cfab1bc..71440a6 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" />
@@ -32,35 +33,43 @@
</resultMap>
<select id="selectArdServerInfo" resultType="com.ard.work.domain.entity.ArdServerInfo">
- select * from ard_server_info where id = #{serverId}
+ select * from ard_server where id = #{serverId}
</select>
<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
- from ard_drone_info
+ select c.id,
+ c.box_sn,
+ c.box_name,
+ c.box_version,
+ c.start_time,
+ c.on_line,
+ c.video_server,
+ c.video_port,
+ c.last_task_id,
+ c.server_id,
+ c.user_id,
+ c.dept_id,
+ c.box_alias_name
+ from ard_drone c
+ left join sys_dept d on d.dept_id = c.dept_id
+ left join sys_user u on u.user_id = c.user_id
</sql>
<select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneInfoResult">
<include refid="selectArdDroneVo"/>
- <where>
- <if test="boxSn != null and boxSn != ''"> and box_sn = #{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>
- <if test="lastTaskId != null "> and last_task_id = #{lastTaskId}</if>
- <if test="userId != null "> and user_id = #{userId}</if>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <where>
+ <if test="boxSn != null and boxSn != ''"> and c.box_sn like concat('%', #{boxSn}, '%')</if>
+ <if test="boxName != null and boxName != ''"> and c.box_name like concat('%', #{boxName}, '%')</if>
+ <if test="boxVersion != null and boxVersion != ''"> and c.box_version = #{boxVersion}</if>
+ <if test="onLine != null "> and c.onLine = #{onLine}</if>
+ <if test="lastTaskId != null "> and c.last_task_id = #{lastTaskId}</if>
+ <if test="userId != null "> and c.user_id = #{userId}</if>
+ <if test="deptId != null and deptId != 0">
+ and (d.dept_id = #{deptId} OR d.dept_id IN ( SELECT t.dept_id FROM sys_dept t WHERE
+ find_in_set(#{deptId}, ancestors) ))
+ </if>
+ <!-- 数据范围过滤 -->
+ ${params.dataScope}
</where>
</select>
@@ -73,7 +82,7 @@
where box_sn = #{boxSn}
</select>
<insert id="insertArdDrone" parameterType="ArdDroneInfo">
- insert into ard_drone_info
+ insert into ard_drone
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
<if test="boxSn != null">box_sn,</if>
@@ -87,6 +96,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 +116,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>
@@ -115,7 +126,7 @@
</insert>
<update id="updateArdDrone" parameterType="ArdDroneInfo">
- update ard_drone_info
+ update ard_drone
<trim prefix="SET" suffixOverrides=",">
<if test="boxSn != null">box_sn = #{boxSn},</if>
<if test="boxName != null">box_name = #{boxName},</if>
@@ -128,6 +139,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>
@@ -138,18 +150,18 @@
</update>
<delete id="deleteArdDroneById" parameterType="String">
- delete from ard_drone_info where id = #{id}
+ delete from ard_drone where id = #{id}
</delete>
<delete id="deleteArdDroneByIds" parameterType="String">
- delete from ard_drone_info where id in
+ delete from ard_drone where id in
<foreach item="id" collection="array" open="(" separator="," close=")">
#{id}
</foreach>
</delete>
<insert id="insertArdDroneLs" parameterType="java.util.List">
- insert into ard_drone_info(
+ insert into ard_drone(
id,
box_sn,
box_name,
@@ -162,6 +174,7 @@
server_id,
user_id,
dept_id,
+ box_alias_name,
create_by,
create_time,
update_by,
@@ -181,6 +194,7 @@
#{item.serverId},
#{item.userId},
#{item.deptId},
+ #{item.boxAliasName},
#{item.createBy},
#{item.createTime},
#{item.updateBy},
@@ -189,4 +203,12 @@
</foreach>
</insert>
+ <update id="updateDroneStatus">
+ update ard_drone
+ <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