From b20738c3993b7b8f80c2dee6edf1b4faf7dbecb0 Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Wed, 15 Oct 2025 17:15:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 51 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index 70c130f..a5451d5 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ard.work.mapper.ArdDroneInfoMapper">
- <resultMap type="ArdDroneInfo" id="ArdDroneResult">
+ <resultMap type="ArdDroneInfo" id="ArdDroneInfoResult">
<result property="id" column="id" />
<result property="boxSn" column="box_sn" />
<result property="boxName" column="box_name" />
@@ -21,18 +21,18 @@
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
<result property="remark" column="remark" />
- <result property="serverInfoId" column="server_info_id" />
+ <result property="serverId" column="server_id" />
<!-- 关联 ArdServerInfo 对象 -->
<association property="ardServerInfo"
javaType="com.ard.work.domain.entity.ArdServerInfo"
- column="server_info_id"
+ column="server_id"
autoMapping="true"
select="selectArdServerInfo">
</association>
</resultMap>
<select id="selectArdServerInfo" resultType="com.ard.work.domain.entity.ArdServerInfo">
- select * from ard_server_info where id = #{serverInfoId}
+ select * from ard_server_info where id = #{serverId}
</select>
<sql id="selectArdDroneVo">
@@ -45,13 +45,13 @@
video_server,
video_port,
last_task_id,
- server_info_id,
+ server_id,
user_id,
dept_id
from ard_drone_info
</sql>
- <select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneResult">
+ <select id="selectArdDroneList" parameterType="ArdDroneInfo" resultMap="ArdDroneInfoResult">
<include refid="selectArdDroneVo"/>
<where>
<if test="boxSn != null and boxSn != ''"> and box_sn = #{boxSn}</if>
@@ -64,11 +64,14 @@
</where>
</select>
- <select id="selectArdDroneById" parameterType="String" resultMap="ArdDroneResult">
+ <select id="selectArdDroneById" parameterType="String" resultMap="ArdDroneInfoResult">
<include refid="selectArdDroneVo"/>
where id = #{id}
</select>
-
+ <select id="selectArdDroneByBoxSn" parameterType="String" resultMap="ArdDroneInfoResult">
+ <include refid="selectArdDroneVo"/>
+ where box_sn = #{boxSn}
+ </select>
<insert id="insertArdDrone" parameterType="ArdDroneInfo">
insert into ard_drone_info
<trim prefix="(" suffix=")" suffixOverrides=",">
@@ -141,4 +144,44 @@
#{id}
</foreach>
</delete>
+
+ <insert id="insertArdDroneLs">
+ insert into ard_drone_info(
+ id,
+ box_sn,
+ box_name,
+ box_version,
+ start_time,
+ on_line,
+ video_server,
+ video_port,
+ last_task_id,
+ server_id,
+ user_id,
+ dept_id,
+ create_by,
+ create_time,
+ update_by,
+ update_time,
+ remark
+ ) values
+ <foreach item="item" index="index" collection="list" separator=",">
+ (#{item.id},
+ #{item.boxSn}),
+ #{item.boxName}),
+ #{item.boxVersion}),
+ #{item.startTime}),
+ #{item.videoServer}),
+ #{item.videoPort}),
+ #{item.lastTaskId}),
+ #{item.userId}),
+ #{item.deptId}),
+ #{item.createBy}),
+ #{item.createTime}),
+ #{item.updateBy}),
+ #{item.updateTime}),
+ #{item.remark})
+ </foreach>
+ </insert>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3