From 3cf5e9483f60c94d29df1a79bc0c1ca910ca46ef Mon Sep 17 00:00:00 2001
From: wl <173@qq.com>
Date: 星期二, 13 十二月 2022 14:58:24 +0800
Subject: [PATCH] fix: 执法事件对外接口
---
ycl-platform/src/main/java/com/ycl/service/message/impl/MessageServiceImpl.java | 27 +++++++++++++++++++--------
1 files changed, 19 insertions(+), 8 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 8c09bae..f57fa44 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,9 +1,6 @@
package com.ycl.service.message.impl;
-import cn.hutool.core.net.url.UrlBuilder;
-import cn.hutool.core.net.url.UrlPath;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-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.fasterxml.jackson.databind.ObjectMapper;
@@ -13,12 +10,12 @@
import com.ycl.entity.message.Message;
import com.ycl.entity.message.SendReq;
import com.ycl.entity.message.SendRes;
-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.utils.MD5Util;
+import com.ycl.vo.message.MessageVO;
import lombok.SneakyThrows;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
@@ -38,6 +35,7 @@
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
+import java.util.Properties;
import java.util.stream.Collectors;
/**
@@ -83,15 +81,18 @@
@Override
@Transactional(rollbackFor = Exception.class)
public String sendMessage(Message message) {
+
Message savedMessage = messageMapper.selectOne(new LambdaQueryWrapper<Message>()
.eq(Message::getTargetTo, message.getTargetTo())
- .eq(Message::getTargetFrom, message.getTargetFrom()));
+ .eq(Message::getTargetFrom, message.getTargetFrom())
+ .eq(Message::getBody, message.getBody())
+ .eq(Message::getHead, message.getHead()));
if (savedMessage != null) {
messageMapper.deleteById(savedMessage);
}
ArrayList<Long> ids = new ArrayList<>();
-
+ message.setTargetFrom(umsAdminMapper.selectById(message.getCreateUser()).getUsername());
for (String receive : message.getTargetTo().split(",")) {
Message sendMessage = new Message();
BeanUtils.copyProperties(message, sendMessage);
@@ -110,6 +111,8 @@
//鐭俊鍙戦��
case ChannelCode.MAIL:
sendMail(message);
+ break;
+ case ChannelCode.INNER:
break;
default:
throw new ApiException("鏈尮閰嶅埌璇ョ被鍨�");
@@ -180,6 +183,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());
@@ -195,9 +206,9 @@
}
@Override
- public Page<Message> list(MessageParam messageParam) {
+ public Page<MessageVO> list(MessageParam messageParam) {
Page<Message> page = new Page<>(messageParam.getCurrent(), messageParam.getPageSize());
- return messageMapper.selectMessagePage(page,messageParam);
+ return messageMapper.selectMessagePage(page, messageParam);
}
@Override
--
Gitblit v1.8.0