From 4368a42d4f21a8a672d75952452c5805d04b098e Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Sat, 09 Sep 2023 15:32:09 +0800
Subject: [PATCH] 新增告警分类，校验规则名称下拉查询
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRecordMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 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 ecc4d8f..2b4e4d0 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
@@ -6,7 +6,7 @@
<select id="selectAlarmRecordPage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRecordVO">
select
sar.*,
- sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType,
+ sar1.type,sar1.alarm_rule_type as alarmRuleType,sar1.create_alarm_type as createAlarmType,sar1.rule_name as ruleName,
arb."name" as reservoirName,aab."ad_name" as areaName
from YWXT.sm_alarm_record sar
left join YWXT.sm_alarm_rule sar1 on sar.alarm_rule_id = sar1.id and sar1.is_deleted = 0
@@ -25,6 +25,9 @@
<if test="alarmRecord.createAlarmType!=null and alarmRecord.createAlarmType!=''">
and sar1.create_alarm_type = #{alarmRecord.createAlarmType}
</if>
+ <if test="alarmRecord.ruleName!=null and alarmRecord.ruleName!=''">
+ and sar1.rule_name = #{alarmRecord.ruleName}
+ </if>
order by sar.id desc
</select>
--
Gitblit v1.9.3