From 1b259de8c0a06e6e16941a4ac3189d950fc542ab Mon Sep 17 00:00:00 2001 From: aijinhui <aijinhui> Date: 星期一, 09 十月 2023 16:26:58 +0800 Subject: [PATCH] 报警统计 --- ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml | 17 ++++++++++------- 1 files changed, 10 insertions(+), 7 deletions(-) diff --git a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml index 90c8603..c8fa4e0 100644 --- a/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml +++ b/ard-work/src/main/resources/mapper/device/ArdCamerasMapper.xml @@ -13,7 +13,7 @@ <result property="username" column="username"/> <result property="password" column="password"/> <result property="gdtype" column="gdtype"/> - <result property="channel" column="channel"/> + <result property="chanNum" column="channel"/> <result property="longitude" column="longitude"/> <result property="latitude" column="latitude"/> <result property="altitude" column="altitude"/> @@ -32,6 +32,7 @@ <result property="operatorExpired" column="operator_expired"/> <result property="camMaxVisibleDistance" column="cam_max_visible_distance"/> <result property="camAlarmGuideEnable" column="cam_alarm_guide_enable"/> + <result property="state" column="state"/> </resultMap> <sql id="selectArdCamerasVo"> @@ -61,7 +62,8 @@ c.operator_id, c.operator_expired, c.cam_max_visible_distance, - c.cam_alarm_guide_enable + c.cam_alarm_guide_enable, + c.state from ard_cameras 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 @@ -78,7 +80,7 @@ <if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if> <if test="password != null and password != ''">and c.password = #{password}</if> <if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if> - <if test="channel != null ">and c.channel = #{channel}</if> + <if test="chanNum != null ">and c.channel = #{chanNum}</if> <if test="longitude != null ">and c.longitude = #{longitude}</if> <if test="latitude != null ">and c.latitude = #{latitude}</if> <if test="altitude != null ">and c.altitude = #{altitude}</if> @@ -111,7 +113,7 @@ <if test="username != null and username != ''">and c.username like '%'||#{username}||'%'</if> <if test="password != null and password != ''">and c.password = #{password}</if> <if test="gdtype != null and gdtype != ''">and c.gdtype = #{gdtype}</if> - <if test="channel != null ">and c.channel = #{channel}</if> + <if test="chanNum != null ">and c.channel = #{chanNum}</if> <if test="longitude != null ">and c.longitude = #{longitude}</if> <if test="latitude != null ">and c.latitude = #{latitude}</if> <if test="altitude != null ">and c.altitude = #{altitude}</if> @@ -148,7 +150,7 @@ <if test="username != null">username,</if> <if test="password != null">password,</if> <if test="gdtype != null">gdtype,</if> - <if test="channel != null">channel,</if> + <if test="chanNum != null">channel,</if> <if test="longitude != null">longitude,</if> <if test="latitude != null">latitude,</if> <if test="altitude != null">altitude,</if> @@ -179,7 +181,7 @@ <if test="username != null">#{username},</if> <if test="password != null">#{password},</if> <if test="gdtype != null">#{gdtype},</if> - <if test="channel != null">#{channel},</if> + <if test="chanNum != null">#{chanNum},</if> <if test="longitude != null">#{longitude},</if> <if test="latitude != null">#{latitude},</if> <if test="altitude != null">#{altitude},</if> @@ -213,7 +215,7 @@ <if test="username != null">username = #{username},</if> <if test="password != null">password = #{password},</if> <if test="gdtype != null">gdtype = #{gdtype},</if> - <if test="channel != null">channel = #{channel},</if> + <if test="chanNum != null">channel = #{chanNum},</if> <if test="longitude != null">longitude = #{longitude},</if> <if test="latitude != null">latitude = #{latitude},</if> <if test="altitude != null">altitude = #{altitude},</if> @@ -236,6 +238,7 @@ <if test="updateTime != null">update_time = #{updateTime},</if> <if test="operatorId != null">operator_id = #{operatorId},</if> <if test="operatorExpired != null">operator_expired = #{operatorExpired},</if> + <if test="state != null">state = #{state},</if> </trim> where id = #{id} </update> -- Gitblit v1.9.3