From 1cad14bca191807e18705c3a5526eda8151be439 Mon Sep 17 00:00:00 2001
From: zhanghua <314079846@qq.com>
Date: 星期一, 14 四月 2025 23:10:22 +0800
Subject: [PATCH] 批量审核和图片保存bug
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 222 ++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 160 insertions(+), 62 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 639a7d0..31c5f28 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,11 +1,13 @@
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;
-import com.ycl.controller.video.common.constant.ChannelCode;
-import com.ycl.controller.video.common.util.CommonUtils;
+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.message.SendReq;
@@ -23,6 +25,7 @@
import org.springframework.http.HttpEntity;
import org.springframework.http.HttpHeaders;
import org.springframework.http.MediaType;
+import org.springframework.http.ResponseEntity;
import org.springframework.mail.javamail.JavaMailSenderImpl;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
@@ -35,6 +38,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Properties;
import java.util.stream.Collectors;
/**
@@ -78,49 +82,130 @@
RestTemplate restTemplate;
@Override
+ @SneakyThrows
@Transactional(rollbackFor = Exception.class)
- public String sendMessage(Message message) {
+ public void sendSMS(Message message) {
+ Integer messageStatus = sendMessages(message);
- Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
- .eq(Message::getTargetTo, message.getTargetTo())
- .eq(Message::getTargetFrom, message.getTargetFrom())
- .eq(Message::getBody, message.getBody())
- .eq(Message::getHead, message.getHead()));
- if (savedMessage != null) {
- messageMapper.deleteById(savedMessage);
+ if (messageStatus == 2) {
+ message.setStatus(2);
+ message.setRespondResult("鍙戦�佹垚鍔�");
}
+ if (messageStatus == 3) {
+ message.setStatus(3);
+ message.setRespondResult("鍙戦�佸け璐�");
+ }
+ message.setUpdateTime(new Date());
+ message.setSendTime(new Date());
+ messageMapper.updateById(message);
+ }
- ArrayList<Long> ids = new ArrayList<>();
+ @Override
+ @Transactional(rollbackFor = Exception.class)
+ public void sendMessage(Message message) {
- for (String receive : message.getTargetTo().split(",")) {
- Message sendMessage = new Message();
- BeanUtils.copyProperties(message, sendMessage);
- sendMessage.setCreateTime(new Date());
- sendMessage.setSendTime(new Date());
- sendMessage.setTargetTo(receive);
- sendMessage.setSendTime(new Date());
- this.save(sendMessage);
- ids.add(sendMessage.getId());
+// Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
+// .eq(Message::getTargetTo, message.getTargetTo())
+// .eq(Message::getTargetFrom, message.getTargetFrom())
+// .eq(Message::getBody, message.getBody())
+// .eq(Message::getStatus, 1)
+// .eq(Message::getHead, message.getHead()));
+// if (savedMessage != null) {
+// messageMapper.deleteById(savedMessage);
+// }
+
+ ArrayList<Message> ids = new ArrayList<>();
+ message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
+ if (message.getId() == null) {
+ for (String receive : message.getTargetTo().split(",")) {
+ Message sendMessage = new Message();
+ BeanUtils.copyProperties(message, sendMessage);
+ sendMessage.setCreateTime(new Date());
+ sendMessage.setSendTime(new Date());
+ sendMessage.setTargetTo(receive);
+ sendMessage.setSendTime(new Date());
+ sendMessage.setPhoneNumber(message.getTargetTo());
+
+ if (ChannelCode.INNER.equals(message.getChannelCode())) {
+ sendMessage.setIsView(0);
+ }
+ this.save(sendMessage);
+ ids.add(sendMessage);
+ }
}
- switch (message.getChannelCode()) {
- //閭欢鍙戦��
- case ChannelCode.SMS:
- sendSMS(message, ids);
- break;
- //鐭俊鍙戦��
- case ChannelCode.MAIL:
- sendMail(message);
- break;
- case ChannelCode.INNER:
- break;
- default:
- throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
- }
- return "send message success!";
+// switch (message.getChannelCode()) {
+// //鐭俊鍙戦��
+// case ChannelCode.SMS:
+// sendSMS(message, ids);
+// break;
+// //閭欢鍙戦��
+// case ChannelCode.MAIL:
+// sendMail(message);
+// break;
+// case ChannelCode.INNER:
+// break;
+// default:
+// throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
+// }
}
@SneakyThrows
- private void sendSMS(Message message, List<Long> mesIds) {
+ @Transactional(rollbackFor = Exception.class)
+ 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);
+ Message messaged = new Message();
+ for (Long id : mesIds) {
+ if (messageStatus == 2) {
+ messaged.setStatus(2);
+ messaged.setRespondResult("鍙戦�佹垚鍔�");
+ }
+ if (messageStatus == 3) {
+ messaged.setStatus(3);
+ messaged.setRespondResult("鍙戦�佸け璐�");
+ }
+ messaged.setId(id);
+ messaged.setUpdateTime(new Date());
+ messaged.setSendTime(new Date());
+ messageMapper.updateById(messaged);
+ }
+ }
+
+ @Override
+ @SneakyThrows
+ @Transactional(rollbackFor = Exception.class)
+ public void sendMessageByPhone(Message message) {
+ Message sendMessage = new Message();
+ BeanUtils.copyProperties(message, sendMessage);
+ sendMessage.setCreateTime(new Date());
+ sendMessage.setSendTime(new Date());
+ sendMessage.setSendTime(new Date());
+ sendMessage.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
+ this.save(sendMessage);
+ Integer messageStatus = sendMessages(message);
+ Message messaged = new Message();
+ if (messageStatus == 2) {
+ messaged.setStatus(2);
+ messaged.setRespondResult("鍙戦�佹垚鍔�");
+ }
+ if (messageStatus == 3) {
+ messaged.setStatus(3);
+ messaged.setRespondResult("鍙戦�佸け璐�");
+ }
+ messaged.setId(sendMessage.getId());
+ messaged.setUpdateTime(new Date());
+ messaged.setSendTime(new Date());
+ messageMapper.updateById(messaged);
+ }
+
+ @SneakyThrows
+ private Integer sendMessages(Message message) {
String context = "銆�" + message.getHead() + "銆�" + message.getBody();
String addSerial = "";
SendReq sendReq = new SendReq();
@@ -128,12 +213,7 @@
sendReq.setApId(apId);
sendReq.setSign(sign);
sendReq.setContext(context);
- 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();
- }
- sendReq.setMobiles(StringUtils.join(mobiles, ","));
+ sendReq.setMobiles(message.getPhoneNumber());
sendReq.setAddSerial(addSerial);
StringBuffer mac = new StringBuffer();
@@ -151,28 +231,16 @@
ObjectMapper objectMapper = new ObjectMapper();
HttpEntity<String> stringHttpEntity = new HttpEntity<>(Base64Utils.encodeToString(objectMapper.writeValueAsBytes(mac)), httpHeaders);
-
- SendRes sendRes = objectMapper.readValue(restTemplate.postForEntity(url, stringHttpEntity, String.class).getBody(), SendRes.class);
- Message sendedMessage = new Message();
- if (sendRes.getRspcod().equals("success")) {
- for (Long id : mesIds) {
- sendedMessage.setStatus(2);
- sendedMessage.setRespondResult("鍙戦�佹垚鍔�");
- sendedMessage.setId(id);
- sendedMessage.setUpdateTime(new Date());
- sendedMessage.setSendTime(new Date());
- messageMapper.updateById(sendedMessage);
- }
- } else {
- for (Long id : mesIds) {
- sendedMessage.setStatus(3);
- sendedMessage.setRespondResult("鍙戦�佸け璐�");
- sendedMessage.setSendTime(new Date());
- sendedMessage.setId(id);
- sendedMessage.setUpdateTime(new Date());
- messageMapper.updateById(sendedMessage);
+ ResponseEntity<String> response = restTemplate.postForEntity(url + "/sms/submit", sendReq, String.class);
+ if(com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank( response.getBody())) {
+ SendRes sendRes = objectMapper.readValue(response.getBody(), SendRes.class);
+ if (sendRes.getRspcod().equals("success")) {
+ return 2;
+ } else {
+ return 3;
}
}
+ return 3;
}
//鍙戦�侀偖浠�
@@ -182,6 +250,14 @@
javaMailSender.setHost(sendHost);
javaMailSender.setUsername(userName);
javaMailSender.setPassword(password);
+ javaMailSender.setPort(465);
+ Properties properties = new Properties();
+ properties.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ properties.put("mail.smtp.auth", "true");//蹇呴』鏄瓧绗︿覆鑰屼笉鑳芥槸boolean鍚﹀垯鎶ラ敊
+ properties.put("mail.smtp.starttls.enable", "true");
+ properties.put("mail.smtp.timeout", "1000");
+ properties.put("mail.smtp.host", sendHost);
+ javaMailSender.setJavaMailProperties(properties);
MimeMessage mimeMessage = javaMailSender.createMimeMessage();
MimeMessageHelper helper = new MimeMessageHelper(mimeMessage);
helper.setText(message.getBody());
@@ -203,6 +279,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