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/service/impl/AlarmRuleServiceImpl.java | 36 ++++++++++++++++++++++++++++++------
1 files changed, 30 insertions(+), 6 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
index 0688153..c4c2eb9 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java
@@ -33,15 +33,9 @@
public Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
if (null != alarmRule.getIsExport()){
List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(null, alarmRule);
- for (AlarmRuleVO alarmRuleVO : alarmRuleVOS) {
- alarmRuleVO.setAlarmPerson(String.join(",",sysClient.getRoleNames(alarmRuleVO.getAlarmPerson()).getData()));
- }
return alarmRuleVOS;
}
List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(page, alarmRule);
- for (AlarmRuleVO alarmRuleVO : alarmRuleVOS) {
- alarmRuleVO.setAlarmPerson(String.join(",",sysClient.getRoleNames(alarmRuleVO.getAlarmPerson()).getData()));
- }
return page.setRecords(alarmRuleVOS);
}
@@ -58,4 +52,34 @@
// 返回
return alarmRule;
}
+
+ /**
+ * 查询对应的短信模板ID 集合
+ * @param alarmRuleId
+ * @return
+ */
+ @Override
+ public List<String> getAlarmRuleDetailList(String alarmRuleId) {
+ return baseMapper.getAlarmRuleDetailListByAlarmRuleId(alarmRuleId);
+ }
+
+ /**
+ * 通过告警规则类型查询生成告警规则类型
+ * @param alarmRuleType
+ * @return
+ */
+ @Override
+ public Object getCreateRuleType(String alarmRuleType) {
+ return baseMapper.getCreateRuleType(alarmRuleType);
+ }
+
+ /**
+ * 通过成告警规则类型查询告警规则名称
+ * @param createAlarmType
+ * @return
+ */
+ @Override
+ public Object getAlarmRuleName(String createAlarmType) {
+ return baseMapper.getAlarmRuleName(createAlarmType);
+ }
}
--
Gitblit v1.9.3