From 4e2975cee275d8315483b30c5d85b8c33a092e63 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期五, 21 十月 2022 15:30:53 +0800
Subject: [PATCH] 取消消息类型校验
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
index ec959cd..08c5175 100644
--- a/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
+++ b/ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ycl.common.constant.ChannelCode;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
import com.ycl.exception.ApiException;
@@ -14,8 +15,6 @@
import com.ycl.service.message.factory.InnerFactory;
import com.ycl.service.message.factory.MailFactory;
import com.ycl.service.message.factory.SmsFactory;
-import com.ycl.service.user.UmsAdminService;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
@@ -29,9 +28,6 @@
@Service
public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
- @Autowired
- private UmsAdminService adminService;
-
@Override
public Message sendMessage(MessageParam messageParam) {
Message message = null;
@@ -39,23 +35,22 @@
switch (messageParam.getChannelCode())
{
//鍐呯珯鍙戦��
- case "01":
+ case ChannelCode.INNER:
provider = new InnerFactory();
break;
//閭欢鍙戦��
- case "02":
+ case ChannelCode.SMS:
provider = new MailFactory();
//id鎹㈡垚閭鍙�
- String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
- messageParam.setTargetTo(targetToMail);
-
+ //String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
+ //messageParam.setTargetTo(targetToMail);
break;
- //鐭俊鍙戦��
- case "03":
+ //鐭俊鍙戦��
+ case ChannelCode.MAIL:
provider = new SmsFactory();
//id鎹㈡垚鎵嬫満鍙�
- String targetToPhone = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
- messageParam.setTargetTo(targetToPhone);
+ //String targetToPhone = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
+ //messageParam.setTargetTo(targetToPhone);
break;
default:
throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
@@ -69,6 +64,12 @@
public IPage<Message> list(MessageParam messageParam) {
Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<>();
+ if (messageParam.getMessageType() != null) {
+ queryWrapper.eq(Message::getMessageType, messageParam.getMessageType());
+ }
+ if (messageParam.getStatus() != null) {
+ queryWrapper.eq(Message::getStatus, messageParam.getStatus());
+ }
Page<Message> result = baseMapper.selectPage(page, queryWrapper);
return result;
}
--
Gitblit v1.8.0