From 8467de5085b1ccbb00a66eec7050ac346eace209 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期四, 05 十月 2023 17:23:08 +0800
Subject: [PATCH] 增加恢复报警过滤接口
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index fa71583..547d0cc 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -2,7 +2,7 @@
<!DOCTYPE mapper
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.ruoyi.alarm.tubeAlarm.mapper.ArdAlarmTubeMapper">
+<mapper namespace="com.ruoyi.alarm.tube.mapper.ArdAlarmTubeMapper">
<resultMap type="ArdAlarmTube" id="ArdAlarmTubeResult">
<result property="id" column="id"/>
@@ -73,6 +73,7 @@
<if test="recordUrl != null and recordUrl != ''">and record_url = #{recordUrl}</if>
<if test="viewTime != null ">and view_time = #{viewTime}</if>
</where>
+ order by alarm_time desc
</select>
<select id="selectArdAlarmTubeById" parameterType="String" resultMap="ArdAlarmTubeResult">
@@ -181,10 +182,11 @@
) T
WHERE T.rn = 1
</select>
- <select id="selectCountByStartTime" resultType="Integer">
+ <select id="selectCountByAlarmTime" resultType="Integer">
SELECT COUNT(DISTINCT aat.tube_id)
FROM ard_alarm_tube aat
WHERE aat.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
+ and aat.view_time is null
</select>
<update id="updateViewTimeByTubeId" parameterType="String">
update ard_alarm_tube
@@ -193,4 +195,5 @@
and alarm_time <= #{alarmTime}
and view_time is null
</update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3