From bfc38cacac67f1bf2a5e857865d64cd49dc8175e Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 21 六月 2023 15:53:44 +0800
Subject: [PATCH] 增加通用光电报警接收 增加报警类型配置
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index dcc4c42..2a2c452 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -21,11 +21,12 @@
<result property="longitude" column="longitude" />
<result property="latitude" column="latitude" />
<result property="altitude" column="altitude" />
+ <result property="recordUrl" column="record_url" />
<result property="viewTime" column="view_time" />
</resultMap>
<sql id="selectArdAlarmTubeVo">
- select id, host, tube_id, tube_name, tube_type, pipe_diameter, color, position, type, alarm_type, alarm_time, watcher, create_time, longitude, latitude, altitude, view_time from ard_alarm_tube
+ select id, host, tube_id, tube_name, tube_type, pipe_diameter, color, position, type, alarm_type, alarm_time, watcher, create_time, longitude, latitude, altitude, record_url, view_time from ard_alarm_tube
</sql>
<select id="selectArdAlarmTubeList" parameterType="ArdAlarmTube" resultMap="ArdAlarmTubeResult">
@@ -45,6 +46,7 @@
<if test="longitude != null and longitude != ''"> and longitude = #{longitude}</if>
<if test="latitude != null and latitude != ''"> and latitude = #{latitude}</if>
<if test="altitude != null and altitude != ''"> and altitude = #{altitude}</if>
+ <if test="recordUrl != null and recordUrl != ''"> and record_url = #{recordUrl}</if>
<if test="viewTime != null "> and view_time = #{viewTime}</if>
</where>
</select>
@@ -73,6 +75,7 @@
<if test="longitude != null">longitude,</if>
<if test="latitude != null">latitude,</if>
<if test="altitude != null">altitude,</if>
+ <if test="recordUrl != null">record_url,</if>
<if test="viewTime != null">view_time,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -92,6 +95,7 @@
<if test="longitude != null">#{longitude},</if>
<if test="latitude != null">#{latitude},</if>
<if test="altitude != null">#{altitude},</if>
+ <if test="recordUrl != null">#{recordUrl},</if>
<if test="viewTime != null">#{viewTime},</if>
</trim>
</insert>
@@ -114,6 +118,7 @@
<if test="longitude != null">longitude = #{longitude},</if>
<if test="latitude != null">latitude = #{latitude},</if>
<if test="altitude != null">altitude = #{altitude},</if>
+ <if test="recordUrl != null">record_url = #{recordUrl},</if>
<if test="viewTime != null">view_time = #{viewTime},</if>
</trim>
where id = #{id}
@@ -139,6 +144,7 @@
aat.longitude,
aat.latitude,
aat.altitude,
+ aat.record_url,
ROW_NUMBER() OVER ( PARTITION BY aat.tube_id ORDER BY aat.alarm_time DESC ) AS rn,
COUNT(CASE WHEN aat.view_time IS NULL THEN 1 END) OVER ( PARTITION BY aat.tube_id ) AS COUNT,
COUNT ( aat.alarm_time ) OVER ( PARTITION BY tube_id ) AS total
@@ -146,9 +152,15 @@
ard_alarm_tube aat
WHERE
aat.alarm_time >= ( CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE )
+ order by aat.alarm_time desc
) T
WHERE T.rn = 1
</select>
+ <select id="selectCountByStartTime" resultType="Integer">
+ SELECT COUNT(DISTINCT aat.tube_id)
+ FROM ard_alarm_tube aat
+ WHERE aat.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
+ </select>
<update id="updateViewTimeByTubeId" parameterType="String">
update ard_alarm_tube
set view_time=#{viewTime}
--
Gitblit v1.9.3