From b5b9378fcc0013a8b95d654f3aa09905c224182c Mon Sep 17 00:00:00 2001 From: ‘liusuyi’ <1951119284@qq.com> Date: 星期一, 03 七月 2023 09:18:38 +0800 Subject: [PATCH] 增加雷达报警1003和1004查看报警 修改查看报警点数量只获取未读数量 --- ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml | 45 ++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 44 insertions(+), 1 deletions(-) diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml index 1a98bc8..a08e0fa 100644 --- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml +++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml @@ -16,6 +16,8 @@ <result property="createTime" column="create_time"/> <result property="userId" column="user_id"/> <result property="deptId" column="dept_id"/> + <result property="recordUrl1" column="record_url1"/> + <result property="recordUrl2" column="record_url2"/> </resultMap> <sql id="selectArdAlarmRadarVo"> @@ -30,7 +32,9 @@ create_by, create_time, user_id, - dept_id + dept_id, + record_url1, + record_url2 from ard_alarm_radar </sql> @@ -41,6 +45,7 @@ <if test="alarmType != null and alarmType != ''">and alarm_type = #{alarmType}</if> <if test="deptId != null ">and dept_id = #{deptId}</if> </where> + order by alarm_time desc </select> <select id="selectArdAlarmRadarById" parameterType="String" resultMap="ArdAlarmRadarResult"> @@ -63,6 +68,7 @@ <if test="createTime != null">create_time,</if> <if test="userId != null">user_id,</if> <if test="deptId != null">dept_id,</if> + <if test="guideFlag != null">guide_flag,</if> </trim> <trim prefix="values (" suffix=")" suffixOverrides=","> <if test="id != null">#{id},</if> @@ -77,6 +83,7 @@ <if test="createTime != null">#{createTime},</if> <if test="userId != null">#{userId},</if> <if test="deptId != null">#{deptId},</if> + <if test="guideFlag != null">#{guideFlag},</if> </trim> </insert> @@ -94,6 +101,9 @@ <if test="createTime != null">create_time = #{createTime},</if> <if test="userId != null">user_id = #{userId},</if> <if test="deptId != null">dept_id = #{deptId},</if> + <if test="recordUrl1 != null">record_url1 = #{recordUrl1},</if> + <if test="recordUrl2 != null">record_url2 = #{recordUrl2},</if> + <if test="guideFlag != null">guide_flag = #{guideFlag},</if> </trim> where id = #{id} </update> @@ -139,5 +149,38 @@ FROM ard_alarm_radar aar WHERE aar.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE and aar.alarm_type = #{alarmType} + and aar.view_time is null </select> + <select id="getCameraByRadar" resultType="String"> + select ac.id + from ard_equip_radar aer + INNER JOIN ard_towers at + on aer.tower_id= at.id + INNER JOIN ard_cameras ac on aer.tower_id=ac.tower_id + </select> + <select id="getArdAlarmRadarWithGuide" resultMap="ArdAlarmRadarResult"> + select * + from ard_alarm_radar + where create_time > current_timestamp - interval '5' minute + and guide_flag = #{guideFlag} + and alarm_type =#{alarmType} + and name = #{name} + ORDER BY create_time desc limit 1 + </select> + <select id="getArdAlarmRadarWithNotGuide" resultType="Integer"> + select count(*) + from ard_alarm_radar + where create_time >= #{guideTime} + and guide_flag = #{ardAlarmRadar.guideFlag} + and alarm_type =#{ardAlarmRadar.alarmType} + and name = #{ardAlarmRadar.name} + </select> + <update id="updateViewTimeByCondition" parameterType="String"> + update ard_alarm_radar + set view_time=#{viewTime} + where name = #{name} + and alarm_type=#{alarmType} + and alarm_time<=#{alarmTime} + and view_time is null + </update> </mapper> \ No newline at end of file -- Gitblit v1.9.3