From 9cfd6505733369a17cc40854ba0c65c6a03cabfa Mon Sep 17 00:00:00 2001
From: Xiajijian <1176061145@qq.com>
Date: Fri, 05 Dec 2025 15:46:02 +0800
Subject: [PATCH] 1. 修改去掉盒子别名类型字段报错问题。
---
ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml | 25 +++++++++----------------
1 files changed, 9 insertions(+), 16 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
index b3c8119..ed3958f 100644
--- a/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
+++ b/ard-work/src/main/resources/mapper/ArdDroneInfoMapper.xml
@@ -16,7 +16,6 @@
<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" />
@@ -33,7 +32,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">
@@ -48,9 +47,8 @@
c.last_task_id,
c.server_id,
c.user_id,
- c.dept_id,
- c.box_alias_name
- from ard_drone_info c
+ c.dept_id
+ 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 +80,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>
@@ -96,7 +94,6 @@
<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>
@@ -116,7 +113,6 @@
<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>
@@ -126,7 +122,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>
@@ -139,7 +135,6 @@
<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>
@@ -150,18 +145,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,
@@ -174,7 +169,6 @@
server_id,
user_id,
dept_id,
- box_alias_name,
create_by,
create_time,
update_by,
@@ -194,7 +188,6 @@
#{item.serverId},
#{item.userId},
#{item.deptId},
- #{item.boxAliasName},
#{item.createBy},
#{item.createTime},
#{item.updateBy},
@@ -204,7 +197,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