From 1dd5d8f8a616f5cf3caa7828d46989c7d3dcafc4 Mon Sep 17 00:00:00 2001
From: xieb <vip_xiaobin810@163.com>
Date: Thu, 19 Oct 2023 15:01:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtdev' into jtdev
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml | 19 +++++++++++++++++++
1 files changed, 19 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
index 1677692..7fed765 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/mapper/AlarmRuleMapper.xml
@@ -19,6 +19,9 @@
<if test="alarmRule.ruleName!=null and alarmRule.ruleName!=''">
and sar.rule_name like concat(concat('%',#{alarmRule.ruleName}),'%')
</if>
+ <if test="alarmRule.target!=null and alarmRule.target!=''">
+ and sar.target = #{alarmRule.target}
+ </if>
</select>
<!--通过id查询-->
@@ -40,4 +43,20 @@
where sard.alarm_rule_id = #{id}
</select>
+ <!--通过告警规则类型查询生成告警规则类型-->
+ <select id="getCreateRuleType" resultType="cn.gistack.system.entity.DictBiz">
+ select create_alarm_type as dictValue,create_alarm_type as dictKey from sm_alarm_rule
+ where is_deleted =0
+ and alarm_rule_type = #{alarmRuleType}
+ group by create_alarm_type
+ </select>
+
+ <!--通过成告警规则类型查询告警规则名称-->
+ <select id="getAlarmRuleName" resultType="cn.gistack.system.entity.DictBiz">
+ select rule_name as dictValue,rule_name as dictKey from sm_alarm_rule
+ where is_deleted =0
+ and create_alarm_type = #{createAlarmType}
+ group by rule_name
+ </select>
+
</mapper>
--
Gitblit v1.9.3