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/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java | 18 ++++++++++++++++++
ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java | 1 +
ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml | 1 +
ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml | 1 +
ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml | 1 +
ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml | 9 +++++++++
6 files changed, 31 insertions(+), 0 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
index b90aa40..c6af0b3 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/globalAlarm/service/impl/GlobalAlarmServiceImpl.java
@@ -265,6 +265,24 @@
ardAlarmStealelecMapper.updateViewTimeByDescribe(describe, startTime, DateUtils.getTime());
return ardAlarmStealelec;
}
+ case 1003:
+ ArdAlarmRadar ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmRadar)) {
+ String name = ardAlarmRadar.getName();
+ String alarmType=ardAlarmRadar.getAlarmType();
+ String alarmTime=fmt.format(ardAlarmRadar.getAlarmTime());
+ ardAlarmRadarMapper.updateViewTimeByCondition(name,alarmType, alarmTime,DateUtils.getTime());
+ return ardAlarmRadar;
+ }
+ case 1004:
+ ardAlarmRadar = ardAlarmRadarMapper.selectArdAlarmRadarById(condition.getId());
+ if (StringUtils.isNotNull(ardAlarmRadar)) {
+ String name = ardAlarmRadar.getName();
+ String alarmType=ardAlarmRadar.getAlarmType();
+ String alarmTime=fmt.format(ardAlarmRadar.getAlarmTime());
+ ardAlarmRadarMapper.updateViewTimeByCondition(name,alarmType, alarmTime,DateUtils.getTime());
+ return ardAlarmRadar;
+ }
case 1014:
ArdAlarmTube ardAlarmTube = ardAlarmTubeMapper.selectArdAlarmTubeById(condition.getId());
if (StringUtils.isNotNull(ardAlarmTube)) {
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java
index f8962b2..2375c9e 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/radarAlarm/mapper/ArdAlarmRadarMapper.java
@@ -78,4 +78,5 @@
public int getArdAlarmRadarWithNotGuide(@Param("ardAlarmRadar") ArdAlarmRadar ardAlarmRadar, @Param("guideTime") Date guideTime);
+ public int updateViewTimeByCondition(@Param("name")String name,@Param("alarmType")String alarmType,@Param("alarmTime") String alarmTime,@Param("viewTime") String viewTime);
}
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
index e93692a..bd0217f 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmCameraMapper.xml
@@ -165,5 +165,6 @@
SELECT COUNT(DISTINCT aac.camera_name)
FROM ard_alarm_camera aac
WHERE aac.alarm_time >= CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE
+ and aac.view_time is null
</select>
</mapper>
\ No newline at end of file
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
index 1d5a538..a08e0fa 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmRadarMapper.xml
@@ -149,6 +149,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
@@ -174,4 +175,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
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
index d19ef6b..02686cf 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmStealelecMapper.xml
@@ -97,6 +97,7 @@
select count(DISTINCT aas."describe")
from ard_alarm_stealelec aas
where aas.start_time >= (CURRENT_TIMESTAMP - INTERVAL '%${refreshTime}%' MINUTE)
+ and aas.view_time is null
</select>
<update id="updateViewTimeByDescribe" parameterType="String">
update ard_alarm_stealelec
diff --git a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
index b2b2643..d963e3d 100644
--- a/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
+++ b/ard-work/src/main/resources/mapper/alarm/ArdAlarmTubeMapper.xml
@@ -186,6 +186,7 @@
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
--
Gitblit v1.9.3