From 0a12bfc2e9594345a0a6cf136bcf234c62450d9d Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期六, 14 十月 2023 16:31:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ard-work/src/main/resources/mapper/vtdu/VtduMapper.xml | 35 +++++++++++++++++++++++------------ 1 files changed, 23 insertions(+), 12 deletions(-) diff --git a/ard-work/src/main/resources/mapper/vtdu/VtduMapper.xml b/ard-work/src/main/resources/mapper/vtdu/VtduMapper.xml index cfb9e36..41de89d 100644 --- a/ard-work/src/main/resources/mapper/vtdu/VtduMapper.xml +++ b/ard-work/src/main/resources/mapper/vtdu/VtduMapper.xml @@ -6,12 +6,13 @@ <resultMap type="Vtdu" id="VtduResult"> <result property="name" column="name"/> - <result property="sourceUrl" column="source_url"/> + <result property="rtspSource" column="rtsp_source"/> <result property="isCode" column="is_code"/> - <result property="codeType" column="code_type"/> + <result property="mode" column="mode"/> <result property="rtspUrl" column="rtsp_url"/> <result property="rtmpUrl" column="rtmp_url"/> <result property="webrtcUrl" column="webrtc_url"/> + <result property="cameraId" column="camera_id"/> <result property="createBy" column="create_by"/> <result property="createTime" column="create_time"/> <result property="updateBy" column="update_by"/> @@ -20,12 +21,13 @@ <sql id="selectVtduVo"> select name, - source_url, + rtsp_source, is_code, - code_type, + mode, rtsp_url, rtmp_url, webrtc_url, + camera_id, create_by, create_time, update_by, @@ -37,9 +39,10 @@ <include refid="selectVtduVo"/> <where> <if test="name != null and name != ''">and name like '%'||#{name}||'%'</if> - <if test="sourceUrl != null and sourceUrl != ''">and source_url = #{sourceUrl}</if> + <if test="rtspSource != null and rtspSource != ''">and rtsp_source = #{rtspSource}</if> <if test="isCode != null and isCode != ''">and is_code = #{isCode}</if> - <if test="codeType != null and codeType != ''">and code_type = #{codeType}</if> + <if test="mode != null and mode != ''">and mode = #{mode}</if> + <if test="cameraId != null and cameraId != ''">and camera_id = #{cameraId}</if> </where> </select> @@ -52,12 +55,13 @@ insert into vtdu <trim prefix="(" suffix=")" suffixOverrides=","> <if test="name != null">name,</if> - <if test="sourceUrl != null">source_url,</if> + <if test="rtspSource != null">rtsp_source,</if> <if test="isCode != null">is_code,</if> - <if test="codeType != null">code_type,</if> + <if test="mode != null">mode,</if> <if test="rtspUrl != null">rtsp_url,</if> <if test="rtmpUrl != null">rtmp_url,</if> <if test="webrtcUrl != null">webrtc_url,</if> + <if test="cameraId != null">camera_id,</if> <if test="createBy != null">create_by,</if> <if test="createTime != null">create_time,</if> <if test="updateBy != null">update_by,</if> @@ -65,12 +69,13 @@ </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="name != null">#{name},</if> - <if test="sourceUrl != null">#{sourceUrl},</if> + <if test="rtspSource != null">#{rtspSource},</if> <if test="isCode != null">#{isCode},</if> - <if test="codeType != null">#{codeType},</if> + <if test="mode != null">#{mode},</if> <if test="rtspUrl != null">#{rtspUrl},</if> <if test="rtmpUrl != null">#{rtmpUrl},</if> <if test="webrtcUrl != null">#{webrtcUrl},</if> + <if test="cameraId != null">#{cameraId},</if> <if test="createBy != null">#{createBy},</if> <if test="createTime != null">#{createTime},</if> <if test="updateBy != null">#{updateBy},</if> @@ -81,12 +86,13 @@ <update id="updateVtdu" parameterType="Vtdu"> update vtdu <trim prefix="SET" suffixOverrides=","> - <if test="sourceUrl != null">source_url = #{sourceUrl},</if> + <if test="rtspSource != null">rtsp_source = #{rtspSource},</if> <if test="isCode != null">is_code = #{isCode},</if> - <if test="codeType != null">code_type = #{codeType},</if> + <if test="mode != null">mode = #{mode},</if> <if test="rtspUrl != null">rtsp_url = #{rtspUrl},</if> <if test="rtmpUrl != null">rtmp_url = #{rtmpUrl},</if> <if test="webrtcUrl != null">webrtc_url = #{webrtcUrl},</if> + <if test="cameraId != null">camera_id = #{cameraId},</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> @@ -107,4 +113,9 @@ #{name} </foreach> </delete> + <delete id="deleteVtduByCameraId" parameterType="String"> + delete + from vtdu + where camera_id = #{cameraId} + </delete> </mapper> \ No newline at end of file -- Gitblit v1.9.3