From 0f5b969ddd52ca43ef003867b5a6749d74b7d71d Mon Sep 17 00:00:00 2001
From: zhaowenyu <35589726@qq.com>
Date: Wed, 12 Nov 2025 17:52:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index b3c8119..71440a6 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -33,7 +33,7 @@
</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">
@@ -50,7 +50,7 @@
c.user_id,
c.dept_id,
c.box_alias_name
- from ard_drone_info c
+ 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>
@@ -82,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>
@@ -126,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>
@@ -150,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,
@@ -204,7 +204,7 @@
</insert>
<update id="updateDroneStatus">
- update ard_drone_info
+ update ard_drone
<trim prefix="SET" suffixOverrides=",">
<if test="onLine != null">on_line = #{onLine},</if>
</trim>
--
Gitblit v1.9.3