From 4722c9d44d1cb941920776016567daf077d87e13 Mon Sep 17 00:00:00 2001
From: mg <maokecheng@163.com>
Date: 星期一, 24 十月 2022 16:33:00 +0800
Subject: [PATCH] 修改消息分页查询
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 45 +++++++++++++++++++++++++++++++++++----------
1 files changed, 35 insertions(+), 10 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 0a03a44..f25618d 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
@@ -5,10 +5,13 @@
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.common.util.CommonUtils;
import com.ycl.dto.message.MessageParam;
import com.ycl.entity.message.Message;
+import com.ycl.entity.user.UmsAdmin;
import com.ycl.exception.ApiException;
import com.ycl.mapper.message.MessageMapper;
+import com.ycl.mapper.user.UmsAdminMapper;
import com.ycl.service.message.IMessageService;
import com.ycl.service.message.Provider;
import com.ycl.service.message.Sender;
@@ -16,6 +19,10 @@
import com.ycl.service.message.factory.MailFactory;
import com.ycl.service.message.factory.SmsFactory;
import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.stream.Collectors;
/**
* <p>
@@ -27,6 +34,10 @@
*/
@Service
public class MessageServiceImpl extends ServiceImpl<MessageMapper, Message> implements IMessageService {
+
+
+ @Resource
+ private UmsAdminMapper umsAdminMapper;
@Override
public Message sendMessage(MessageParam messageParam) {
@@ -41,16 +52,10 @@
//閭欢鍙戦��
case ChannelCode.SMS:
provider = new MailFactory();
- //id鎹㈡垚閭鍙�
- //String targetToMail = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
- //messageParam.setTargetTo(targetToMail);
break;
- //鐭俊鍙戦��
+ //鐭俊鍙戦��
case ChannelCode.MAIL:
provider = new SmsFactory();
- //id鎹㈡垚鎵嬫満鍙�
- //String targetToPhone = adminService.getTargetTo(messageParam.getTargetTo(), messageParam.getChannelCode());
- //messageParam.setTargetTo(targetToPhone);
break;
default:
throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
@@ -64,14 +69,34 @@
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());
+ queryWrapper.eq(Message::getParentId, 0);
+ if (!CommonUtils.isEmpty(messageParam.getHead())) {
+ queryWrapper.eq(Message::getHead, messageParam.getHead());
}
- if (messageParam.getStatus() != null) {
+ if (!CommonUtils.isEmpty(messageParam.getChannelCode())) {
+ queryWrapper.eq(Message::getChannelCode, messageParam.getChannelCode());
+ }
+ if (!CommonUtils.isEmpty(messageParam.getStatus())) {
queryWrapper.eq(Message::getStatus, messageParam.getStatus());
}
queryWrapper.orderByDesc(Message::getCreateTime);
Page<Message> result = baseMapper.selectPage(page, queryWrapper);
+ List<Message> messages = result.getRecords();
+ if (!CommonUtils.isEmpty(messages)) {
+ List<Long> ids = messages.stream().map(e -> Long.parseLong(e.getTargetFrom().trim())).collect(Collectors.toList());
+ LambdaQueryWrapper<UmsAdmin> queryUSers = new LambdaQueryWrapper<>();
+ queryUSers.in(UmsAdmin::getId, ids);
+ List<UmsAdmin> users = umsAdminMapper.selectList(queryUSers);
+ if (!CommonUtils.isEmpty(users)) {
+ for (UmsAdmin user : users) {
+ for (Message message : messages) {
+ if (message.getTargetFrom().equals(user.getId()+"")) {
+ message.setTargetFrom(user.getUsername());
+ }
+ }
+ }
+ }
+ }
return result;
}
--
Gitblit v1.8.0