From a084c7c284be36f4eedb819bc30fe7febd20ca80 Mon Sep 17 00:00:00 2001
From: zhongrj <646384940@qq.com>
Date: Thu, 31 Aug 2023 17:57:23 +0800
Subject: [PATCH] 短信记录查询分类接口新增（加入告警的明细下级），查询接口对应修改
---
skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/alarmRule/service/impl/AlarmRuleServiceImpl.java | 23 +++++++++++++++++++++--
1 files changed, 21 insertions(+), 2 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 a7b825e..f3e419f 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
@@ -4,9 +4,13 @@
import cn.gistack.alerts.alarmRule.mapper.AlarmRuleMapper;
import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
import cn.gistack.alerts.alarmRule.vo.AlarmRuleVO;
+import cn.gistack.system.feign.ISysClient;
import com.baomidou.mybatisplus.core.metadata.IPage;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* 告警规则服务实现层
@@ -15,6 +19,9 @@
*/
@Service
public class AlarmRuleServiceImpl extends BaseServiceImpl<AlarmRuleMapper, AlarmRule> implements AlarmRuleService {
+
+ @Autowired
+ private ISysClient sysClient;
/**
* 自定义分页列表查询
@@ -25,9 +32,11 @@
@Override
public Object selectAlarmRulePage(IPage<AlarmRuleVO> page, AlarmRuleVO alarmRule) {
if (null != alarmRule.getIsExport()){
- return baseMapper.selectAlarmRulePage(null,alarmRule);
+ List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(null, alarmRule);
+ return alarmRuleVOS;
}
- return page.setRecords(baseMapper.selectAlarmRulePage(page,alarmRule));
+ List<AlarmRuleVO> alarmRuleVOS = baseMapper.selectAlarmRulePage(page, alarmRule);
+ return page.setRecords(alarmRuleVOS);
}
/**
@@ -43,4 +52,14 @@
// 返回
return alarmRule;
}
+
+ /**
+ * 查询对应的短信模板ID 集合
+ * @param alarmRuleId
+ * @return
+ */
+ @Override
+ public List<String> getAlarmRuleDetailList(String alarmRuleId) {
+ return baseMapper.getAlarmRuleDetailListByAlarmRuleId(alarmRuleId);
+ }
}
--
Gitblit v1.9.3