From c8b03d3da4e29fc3fb9a42ca157738256c331a00 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Wed, 13 Mar 2024 13:55:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 52 insertions(+), 5 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 d029059..10e149c 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
@@ -80,9 +80,28 @@
select "ad_name" from SJZT_MD."att_ad_base" where "p_ad_code" = #{adCode} order by "guid"
</select>
+ <!--按行政区code行政区-->
+ <select id="getAdNameListByAdCode" resultType="java.lang.String">
+ select "ad_name" from SJZT_MD."att_ad_base" where "ad_code" = #{adCode} order by "guid"
+ </select>
+
<!--查询告警统计数据-->
<select id="statisticAlarmRecord" resultType="cn.gistack.alerts.alarmRule.vo.StatisticAlarmRecord">
- select cityName as adName,rule_name as ruleName,count(*) num from (
+ select
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 1 ">
+ cityName as adName,
+ </if>
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 2 ">
+ countyName as adName,
+ </if>
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 3 ">
+ townName as adName,
+ </if>
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 4 ">
+ townName as adName,
+ </if>
+
+ rule_name as ruleName,count(*) num from (
select
sar.id,sar.alarm_rule_id,sar.create_time,sar.reservoir_number,
arb."name",
@@ -130,7 +149,22 @@
and arb."interior_ad_guid" like concat('%',#{alarmRecord.adCode},'%')
</if>
) f
- group by cityName,rule_name
+ group by
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 1 ">
+ cityName,
+ </if>
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 2 ">
+ countyName,
+ </if>
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 3 ">
+ townName,
+ </if>
+ <if test="alarmRecord.adLevel !=null and alarmRecord.adLevel != '' and alarmRecord.adLevel == 4 ">
+ townName,
+ </if>
+
+
+ rule_name
</select>
<!--查询告警统计数据-按三大类-->
@@ -164,7 +198,16 @@
<!-- 查询大坝安全告警统计数据 -->
<select id="statisticAlarmRecordByAlarmRuleType" resultType="cn.gistack.alerts.alarmRule.vo.StatisticAlarmRecord">
- select case when alarm_rule_type='大坝安全监测告警' then '告警数量' else '预警数量' end as ruleName,
+ select
+ case
+ when alarm_rule_type='渗压监测告警' then '告警数量'
+ when alarm_rule_type='渗压监测预警' then '预警数量'
+ when alarm_rule_type='变形监测告警' then '告警数量'
+ when alarm_rule_type='变形监测预警' then '预警数量'
+ when alarm_rule_type='渗流监测告警' then '告警数量'
+ when alarm_rule_type='渗流监测预警' then '预警数量'
+ else alarm_rule_type
+ end as ruleName,
sum(
(
select count(*) from YWXT.sm_alarm_record cha
@@ -173,7 +216,7 @@
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}
+ and cha.create_time >= #{alarmRecord.startTime}
</if>
<if test="alarmRecord.endTime!=null and alarmRecord.endTime!=''">
and cha.create_time <= #{alarmRecord.endTime}
@@ -184,7 +227,11 @@
)
) as num
from YWXT.sm_alarm_rule a
- where type = '大坝安全监测'
+ <where>
+ <if test="alarmRecord.type!=null and alarmRecord.type!=''">
+ and type = #{alarmRecord.type}
+ </if>
+ </where>
group by alarm_rule_type
</select>
--
Gitblit v1.9.3