From 4141eecf7d1ffdb90aa591d0978cb15cffcb055a Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Wed, 06 Mar 2024 14:48:13 +0800
Subject: [PATCH] 大坝安全监测告警修改

---
 skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml |   30 ++++++++++++++++++++++++++++--
 1 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
index 168ddb7..4839e1b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml
@@ -150,10 +150,10 @@
         left join SJZT_MD."att_ad_base" b on b."guid" = a."interior_ad_guid"
         where sar.is_deleted = 0
         <if test="alarmRecord.startTime!=null and alarmRecord.startTime!=''">
-            and date_format(sar.create_time,'%Y-%m-%d') >= #{alarmRecord.startTime}
+            and sar.create_time >= #{alarmRecord.startTime}
         </if>
         <if test="alarmRecord.endTime!=null and alarmRecord.endTime!=''">
-            and date_format(sar.create_time,'%Y-%m-%d') &lt;= #{alarmRecord.endTime}
+            and sar.create_time &lt;= #{alarmRecord.endTime}
         </if>
         <if test="alarmRecord.adCode!=null and alarmRecord.adCode!=''">
             and  a."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
@@ -162,6 +162,32 @@
         ) b on a.dict_value = b.type
     </select>
 
+    <!--  查询大坝安全告警统计数据  -->
+    <select id="statisticAlarmRecordByAlarmRuleType" resultType="cn.gistack.alerts.alarmRule.vo.StatisticAlarmRecord">
+        select case when alarm_rule_type='大坝安全监测告警' then '告警数量' else '预警数量' end as ruleName,
+        sum(
+        (
+        select count(*) from YWXT.sm_alarm_record cha
+        left join SJZT_MD."att_res_base" a on a."guid" = cha.reservoir_number
+        left join SJZT_MD."att_ad_base" b on b."guid" = a."interior_ad_guid"
+        where a.id = cha.alarm_rule_id
+        and cha.is_deleted = 0
+        <if test="alarmRecord.startTime!=null and alarmRecord.startTime!=''">
+            and cha.create_time >= #{alarmRecord.endTime}
+        </if>
+        <if test="alarmRecord.endTime!=null and alarmRecord.endTime!=''">
+            and cha.create_time &lt;= #{alarmRecord.endTime}
+        </if>
+        <if test="alarmRecord.adCode!=null and alarmRecord.adCode!=''">
+            and  a."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
+        </if>
+        )
+        ) as num
+        from  YWXT.sm_alarm_rule a
+        where type = '大坝安全监测'
+        group by alarm_rule_type
+    </select>
+
     <!--查询符合条件的告警类型-->
     <select id="listAlarmRule" resultType="cn.gistack.alerts.alarmRule.entity.AlarmRule">
         select * from YWXT.sm_alarm_rule where is_deleted = 0

--
Gitblit v1.9.3