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/AlarmRuleMapper.xml | 30 +++++++++++++++++++++++++++++-
1 files changed, 29 insertions(+), 1 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 1a1b1c3..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
@@ -4,7 +4,9 @@
<!--自定义分页列表查询-->
<select id="selectAlarmRulePage" resultType="cn.gistack.alerts.alarmRule.vo.AlarmRuleVO">
- select sar.* from YWXT.sm_alarm_rule sar where sar.is_deleted = 0
+ select sar.*
+ from YWXT.sm_alarm_rule sar
+ where sar.is_deleted = 0
<if test="alarmRule.type!=null and alarmRule.type!=''">
and sar.type = #{alarmRule.type}
</if>
@@ -16,6 +18,9 @@
</if>
<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>
@@ -31,4 +36,27 @@
where sard.alarm_rule_id = #{id}
</select>
+ <!--通过id查询对应的短信模板ID 集合-->
+ <select id="getAlarmRuleDetailListByAlarmRuleId" resultType="java.lang.String">
+ select sst.template_id from sm_alarm_rule_detail sard
+ left join sm_sms_template sst on sst.id = sard.template_id
+ 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