From 950f31ee2351e2d26ede3eeba49c09d52f46b296 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期五, 03 十一月 2023 17:31:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/resources/mapper/device/ArdCameraNoGuideZoneMapper.xml | 30 +++++++++++++++---------------
1 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/device/ArdCameraNoGuideZoneMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCameraNoGuideZoneMapper.xml
index 84718c3..b830bdc 100644
--- a/ard-work/src/main/resources/mapper/device/ArdCameraNoGuideZoneMapper.xml
+++ b/ard-work/src/main/resources/mapper/device/ArdCameraNoGuideZoneMapper.xml
@@ -5,6 +5,7 @@
<mapper namespace="com.ruoyi.device.noguidezone.mapper.ArdCameraNoGuideZoneMapper">
<resultMap type="ArdCameraNoGuideZone" id="ArdCameraNoGuideZoneResult">
+ <result property="id" column="id" />
<result property="name" column="name" />
<result property="poi" column="poi" />
<result property="cameraId" column="camera_id" />
@@ -15,11 +16,10 @@
<result property="createTime" column="create_time" />
<result property="updateBy" column="update_by" />
<result property="updateTime" column="update_time" />
- <result property="id" column="id" />
</resultMap>
<sql id="selectArdCameraNoGuideZoneVo">
- select name, poi, camera_id, enabled, dept_id, user_id, create_by, create_time, update_by, update_time, id from ard_camera_no_guide_zone
+ select id, name, poi, camera_id, enabled, dept_id, user_id, create_by, create_time, update_by, update_time from ard_camera_no_guide_zone
</sql>
<select id="selectArdCameraNoGuideZoneList" parameterType="ArdCameraNoGuideZone" resultMap="ArdCameraNoGuideZoneResult">
@@ -29,19 +29,20 @@
<if test="poi != null and poi != ''"> and poi = #{poi}</if>
<if test="cameraId != null and cameraId != ''"> and camera_id = #{cameraId}</if>
<if test="enabled != null and enabled != ''"> and enabled = #{enabled}</if>
- <if test="deptId != null "> and dept_id = #{deptId}</if>
+ <if test="deptId != null and deptId != ''"> and dept_id = #{deptId}</if>
<if test="userId != null and userId != ''"> and user_id = #{userId}</if>
</where>
</select>
- <select id="selectArdCameraNoGuideZoneByName" parameterType="String" resultMap="ArdCameraNoGuideZoneResult">
+ <select id="selectArdCameraNoGuideZoneById" parameterType="String" resultMap="ArdCameraNoGuideZoneResult">
<include refid="selectArdCameraNoGuideZoneVo"/>
- where name = #{name}
+ where id = #{id}
</select>
<insert id="insertArdCameraNoGuideZone" parameterType="ArdCameraNoGuideZone">
insert into ard_camera_no_guide_zone
<trim prefix="(" suffix=")" suffixOverrides=",">
+ <if test="id != null">id,</if>
<if test="name != null">name,</if>
<if test="poi != null">poi,</if>
<if test="cameraId != null">camera_id,</if>
@@ -52,9 +53,9 @@
<if test="createTime != null">create_time,</if>
<if test="updateBy != null">update_by,</if>
<if test="updateTime != null">update_time,</if>
- <if test="id != null">id,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
+ <if test="id != null">#{id},</if>
<if test="name != null">#{name},</if>
<if test="poi != null">#{poi},</if>
<if test="cameraId != null">#{cameraId},</if>
@@ -65,13 +66,13 @@
<if test="createTime != null">#{createTime},</if>
<if test="updateBy != null">#{updateBy},</if>
<if test="updateTime != null">#{updateTime},</if>
- <if test="id != null">#{id},</if>
</trim>
</insert>
<update id="updateArdCameraNoGuideZone" parameterType="ArdCameraNoGuideZone">
update ard_camera_no_guide_zone
<trim prefix="SET" suffixOverrides=",">
+ <if test="name != null">name = #{name},</if>
<if test="poi != null">poi = #{poi},</if>
<if test="cameraId != null">camera_id = #{cameraId},</if>
<if test="enabled != null">enabled = #{enabled},</if>
@@ -81,19 +82,18 @@
<if test="createTime != null">create_time = #{createTime},</if>
<if test="updateBy != null">update_by = #{updateBy},</if>
<if test="updateTime != null">update_time = #{updateTime},</if>
- <if test="id != null">id = #{id},</if>
</trim>
- where name = #{name}
+ where id = #{id}
</update>
- <delete id="deleteArdCameraNoGuideZoneByName" parameterType="String">
- delete from ard_camera_no_guide_zone where name = #{name}
+ <delete id="deleteArdCameraNoGuideZoneById" parameterType="String">
+ delete from ard_camera_no_guide_zone where id = #{id}
</delete>
- <delete id="deleteArdCameraNoGuideZoneByNames" parameterType="String">
- delete from ard_camera_no_guide_zone where name in
- <foreach item="name" collection="array" open="(" separator="," close=")">
- #{name}
+ <delete id="deleteArdCameraNoGuideZoneByIds" parameterType="String">
+ delete from ard_camera_no_guide_zone where id in
+ <foreach item="id" collection="array" open="(" separator="," close=")">
+ #{id}
</foreach>
</delete>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3