From 4ef3b7b71b2b444f09e20bd440215e1677a602a4 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期二, 09 一月 2024 09:57:20 +0800
Subject: [PATCH] 2024年第一次bug修改
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 43 ++++++++++++++++++++++++++++++++++---------
1 files changed, 34 insertions(+), 9 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 6c5e7e1..b6a1a7e 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
@@ -1,6 +1,8 @@
package com.ycl.service.message.impl;
+import cn.hutool.core.collection.CollUtil;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.fasterxml.jackson.databind.ObjectMapper;
@@ -33,7 +35,6 @@
import javax.annotation.Resource;
import javax.mail.internet.MimeMessage;
-import javax.xml.ws.Response;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
@@ -94,7 +95,7 @@
messageMapper.deleteById(savedMessage);
}
- ArrayList<Long> ids = new ArrayList<>();
+ ArrayList<Message> ids = new ArrayList<>();
message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
if (message.getId() == null) {
for (String receive : message.getTargetTo().split(",")) {
@@ -104,12 +105,13 @@
sendMessage.setSendTime(new Date());
sendMessage.setTargetTo(receive);
sendMessage.setSendTime(new Date());
- sendMessage.setPhoneNumber(umsAdminMapper.selectById(receive).getMobile());
+ sendMessage.setPhoneNumber(message.getTargetTo());
+
if (ChannelCode.INNER.equals(message.getChannelCode())) {
sendMessage.setIsView(0);
}
this.save(sendMessage);
- ids.add(sendMessage.getId());
+ ids.add(sendMessage);
}
}
switch (message.getChannelCode()) {
@@ -130,11 +132,12 @@
@SneakyThrows
@Transactional(rollbackFor = Exception.class)
- void sendSMS(Message message, List<Long> mesIds) {
- String[] ids = message.getTargetTo().split(",");
- String[] mobiles = new String[ids.length];
- for (int i = 0; i < ids.length; i++) {
- mobiles[i] = umsAdminMapper.selectById(ids[i]).getMobile();
+ public void sendSMS(Message message, List<Message> messageList) {
+ List<String> mobiles = new ArrayList<>();
+ List<Long> mesIds = new ArrayList<>();
+ for (Message m : messageList) {
+ mobiles.add(m.getPhoneNumber());
+ mesIds.add(m.getId());
}
message.setPhoneNumber(StringUtils.join(mobiles, ","));
Integer messageStatus = sendMessages(message);
@@ -254,6 +257,28 @@
}
@Override
+ public Page<Message> queryMyMessage(Page<Message> page, Long userId) {
+ List<Message> list = list();
+ ArrayList<Long> ids = new ArrayList<>();
+ list.forEach(item -> {
+ String targetTo = item.getTargetTo();
+ if (StringUtils.isNotBlank(targetTo)) {
+ String[] split = targetTo.split(",");
+ for (String s : split) {
+ if (userId.equals(Long.getLong(s))) {
+ ids.add(item.getId());
+ break;
+ }
+ }
+ }
+ });
+ if (CollUtil.isEmpty(ids)) {
+ return new Page<>();
+ }
+ return baseMapper.selectPage(page, new QueryWrapper<Message>().lambda().in(Message::getId, ids));
+ }
+
+ @Override
public Boolean deleteMessages(List<Long> ids) {
LambdaQueryWrapper<Message> queryWrapper = new LambdaQueryWrapper<>();
queryWrapper.in(Message::getId, ids).or().in(Message::getParentId, ids);
--
Gitblit v1.8.0