From f73dbcd6c21d28ab1e98840eee73c6d09bd0f929 Mon Sep 17 00:00:00 2001
From: ke <893754509@qq.com>
Date: Tue, 27 Aug 2024 17:31:07 +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/SmsRecordServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++++
1 files changed, 36 insertions(+), 0 deletions(-)
diff --git a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java
index e373aac..f65d1fc 100644
--- a/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java
+++ b/skjcmanager/skjcmanager-service/skjcmanager-alerts/src/main/java/cn/gistack/alerts/sms/service/impl/SmsRecordServiceImpl.java
@@ -1,13 +1,18 @@
package cn.gistack.alerts.sms.service.impl;
+import cn.gistack.alerts.alarmRule.service.AlarmRuleService;
import cn.gistack.alerts.sms.entity.SmsRecord;
import cn.gistack.alerts.sms.mapper.SmsRecordMapper;
import cn.gistack.alerts.sms.service.ISmsRecordService;
import cn.gistack.alerts.sms.vo.SmsRecordVO;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.logging.log4j.util.Strings;
+import org.springblade.core.log.exception.ServiceException;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -16,6 +21,9 @@
*/
@Service
public class SmsRecordServiceImpl extends ServiceImpl<SmsRecordMapper, SmsRecord> implements ISmsRecordService {
+
+ @Autowired
+ private AlarmRuleService alarmRuleService;
/**
* 自定义分页列表查询
@@ -42,4 +50,32 @@
public int batchSaveSendRecord(List<SmsRecord> list) {
return baseMapper.batchSaveSendRecord(list);
}
+
+ /**
+ * 自定义分页列表查询
+ * @param page 分页查询对象
+ * @param smsRecord
+ * @return
+ */
+ @Override
+ public Object msgPage(IPage<SmsRecordVO> page, SmsRecordVO smsRecord) {
+ List<String> list = new ArrayList<>();
+ // 判断是否为一级目录
+ if (null!=smsRecord.getSmsType() && smsRecord.getSmsType().length()>1){
+ // 查询对应的短信模板ID 集合
+ list = alarmRuleService.getAlarmRuleDetailList(smsRecord.getSmsType());
+ // 设置类型为null
+ smsRecord.setSmsType("");
+ }
+ if (!Strings.isBlank(smsRecord.getType()) && smsRecord.getType().equals("1")){
+ // 查询短信
+ return page.setRecords(baseMapper.smsPage(page,smsRecord,list));
+ }
+ if (!Strings.isBlank(smsRecord.getType()) && smsRecord.getType().equals("2")){
+ // 查询站内信
+ return page.setRecords(baseMapper.msgPage(page,smsRecord,list));
+ }
+ // 查询全部返回
+ return page.setRecords(baseMapper.smsAndMsgPage(page,smsRecord,list));
+ }
}
--
Gitblit v1.9.3