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/sms/service/impl/SmsResultServiceImpl.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
index 06830f3..3e0e68b 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsResultServiceImpl.java
@@ -1,12 +1,19 @@
package cn.gistack.alerts.sms.service.impl;
+import cn.gistack.alerts.alarmRule.entity.AlarmRule;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
import cn.gistack.alerts.sms.entity.SmsResult;
import cn.gistack.alerts.sms.mapper.SmsResultMapper;
import cn.gistack.alerts.sms.service.ISmsResultService;
import cn.gistack.alerts.sms.vo.SmsResultVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
+import org.apache.ibatis.jdbc.Null;
import org.springblade.core.mp.base.BaseServiceImpl;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
/**
* 短信发送结果
@@ -14,6 +21,9 @@
*/
@Service
public class SmsResultServiceImpl extends BaseServiceImpl<SmsResultMapper, SmsResult> implements ISmsResultService {
+
+ @Autowired
+ private AlarmRuleService alarmRuleService;
/**
* 自定义分页列表查询
@@ -23,11 +33,21 @@
*/
@Override
public Object selectSmsResultPage(IPage<SmsResultVO> page, SmsResultVO smsResult) {
+ List<String> list = new ArrayList<>();
+ // 判断是否为一级目录
+ if (null!=smsResult.getSmsType() && smsResult.getSmsType().length()>1){
+ // 查询对应的短信模板ID 集合
+ list = alarmRuleService.getAlarmRuleDetailList(smsResult.getSmsType());
+ // 设置类型为null
+ smsResult.setSmsType("");
+ }
if (null!=smsResult.getIsExport()){
// 导出，不分页
- return baseMapper.selectSmsResultPage(null,smsResult);
+ List<SmsResultVO> resultVOList = baseMapper.selectSmsResultPage(null, smsResult, list);
+ // 设置统计值
+ return resultVOList;
}
// 查询返回
- return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult));
+ return page.setRecords(baseMapper.selectSmsResultPage(page,smsResult,list));
}
}
--
Gitblit v1.9.3