From 18fa1385119350cebf6fb55a33a31fda263dba95 Mon Sep 17 00:00:00 2001
From: ‘liusuyi’ <1951119284@qq.com>
Date: 星期三, 12 七月 2023 10:47:36 +0800
Subject: [PATCH] 增加通用光电报警查看
---
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
index 0cb747e..2fe34eb 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
@@ -44,7 +44,14 @@
<if test="name != null and name != ''">and name like '%'||#{name}||'%'</if>
<if test="alarmType != null and alarmType != ''">and alarm_type = #{alarmType}</if>
<if test="deptId != null ">and dept_id = #{deptId}</if>
+ <if test="params.beginTime != null and params.beginTime != ''"><!-- 寮�濮嬫椂闂存绱� -->
+ AND alarm_time >= to_timestamp(#{params.beginTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
+ <if test="params.endTime != null and params.endTime != ''"><!-- 缁撴潫鏃堕棿妫�绱� -->
+ AND alarm_time <= to_timestamp(#{params.endTime},'yyyy-MM-DD HH24:MI:ss')
+ </if>
</where>
+ order by alarm_time desc
</select>
<select id="selectArdAlarmRadarById" parameterType="String" resultMap="ArdAlarmRadarResult">
@@ -148,6 +155,7 @@
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
@@ -173,4 +181,12 @@
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