From 05dd7b7be50a7227893bdeba881d0a368fe4b63e Mon Sep 17 00:00:00 2001
From: yupeng <roc__yu@163.com>
Date: 星期一, 10 三月 2025 15:02:17 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xizang-changyun' into xizang-changyun
---
ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java | 121 ++++++++++++++++++++++++++++--
ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java | 1
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java | 9 -
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java | 99 ++++++++++++++++++++++++
4 files changed, 214 insertions(+), 16 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
index f074175..157d180 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInvoiceController.java
@@ -5,6 +5,7 @@
import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.TencentMailUtil;
import com.ruoyi.system.dto.TBillDto;
import com.ruoyi.system.model.TBill;
import com.ruoyi.system.model.TInvoice;
@@ -57,13 +58,7 @@
@PostMapping("/uploadVoucher")
@PreAuthorize("@ss.hasPermi('invoice:list:payment')")
public R<Boolean> uploadVoucher(@RequestBody TInvoiceQuery query) {
- TInvoice tInvoice = new TInvoice();
- tInvoice.setId(query.getId());
- tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
- tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
- tInvoice.setInvoiceTime(query.getInvoiceTime());
- tInvoice.setStatus(2);
- return R.ok(invoiceService.updateById(tInvoice));
+ return R.ok(invoiceService.uploadVoucher(query));
}
}
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
index 9893f69..4ce4421 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/utils/TencentMailUtil.java
@@ -6,11 +6,20 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
+import javax.activation.DataHandler;
+import javax.activation.FileDataSource;
+import java.net.URLEncoder;
+import javax.activation.URLDataSource;
import javax.mail.*;
-import javax.mail.internet.InternetAddress;
-import javax.mail.internet.MimeMessage;
+import javax.mail.internet.*;
import java.io.UnsupportedEncodingException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
import java.util.Properties;
+import java.util.concurrent.CompletableFuture;
@Component
@Slf4j
@@ -95,17 +104,113 @@
e.printStackTrace();
log.error("发送邮件发生异常",e);
}
-
}
- public static void main(String[] args) {
- TencentMailUtil tencentMailUtil = new TencentMailUtil();
- MailProperties properties = new MailProperties();
- tencentMailUtil.properties = properties;
- tencentMailUtil.send("645025773@qq.com","大学城揽院24栋");
+ public void sendInvoice(String emailAddress, List<Map<String, String>> list) {
+ // 异步发送邮件
+ CompletableFuture.runAsync(() -> {
+ try {
+ sendEmail(emailAddress, list);
+ } catch (ServiceException e) {
+ log.error("邮件发送失败", e);
+ }
+ });
+ }
+ private void sendEmail(String emailAddress, List<Map<String, String>> list) throws ServiceException {
+ try {
+ // 创建邮件会话
+ Session mailSession = Session.getInstance(getMailProperties(), getAuthenticator());
+
+ // 创建邮件消息
+ MimeMessage message = new MimeMessage(mailSession);
+
+ // 设置发件人
+ InternetAddress from = new InternetAddress(properties.getUserAddr(), properties.getUserName());
+ message.setFrom(from);
+
+ // 设置收件人
+ InternetAddress to = new InternetAddress(emailAddress);
+ message.setRecipient(MimeMessage.RecipientType.TO, to);
+
+ // 设置邮件标题
+ message.setSubject("发票");
+
+ // 创建邮件内容
+ Multipart multipart = createMultipart(list);
+
+ // 设置邮件内容
+ message.setContent(multipart);
+
+ // 发送邮件
+ Transport.send(message);
+ } catch (MessagingException | UnsupportedEncodingException | MalformedURLException e) {
+ log.error("发送邮件发生异常", e);
+ throw new ServiceException("发送邮件失败, 请检查");
+ }
+ }
+
+ private Properties getMailProperties() {
+ Properties props = new Properties();
+ props.put("mail.smtp.auth", "true");
+ props.put("mail.smtp.host", properties.getSmtpHost());
+ props.put("mail.smtp.socketFactory.class", "javax.net.ssl.SSLSocketFactory");
+ props.put("mail.smtp.socketFactory.port", properties.getSmtpPort());
+ props.put("mail.smtp.port", properties.getSmtpPort());
+ props.put("mail.user", properties.getUserAddr());
+ props.put("mail.password", properties.getPassword());
+ props.setProperty("mail.smtp.socketFactory.fallback", "false");
+ props.put("mail.smtp.ssl.enable", "false");
+ return props;
+ }
+
+ private Authenticator getAuthenticator() {
+ return new Authenticator() {
+ @Override
+ protected PasswordAuthentication getPasswordAuthentication() {
+ String userName = properties.getUserAddr();
+ String password = properties.getPassword();
+ return new PasswordAuthentication(userName, password);
+ }
+ };
}
+
+ private Multipart createMultipart(List<Map<String, String>> list) throws MessagingException, UnsupportedEncodingException, MalformedURLException {
+ Multipart multipart = new MimeMultipart();
+
+ // 添加文本消息部分
+ BodyPart messageBodyPart = new MimeBodyPart();
+ messageBodyPart.setHeader("Content-Type", "text/plain;charset=utf-8");
+ multipart.addBodyPart(messageBodyPart);
+
+ // 添加附件部分
+ for (Map<String, String> map : list) {
+ messageBodyPart = new MimeBodyPart();
+ String url = map.get("url");
+ String fileName = map.get("fileName");
+
+ URLDataSource source = new URLDataSource(new URL(url));
+ messageBodyPart.setDataHandler(new DataHandler(source));
+
+ String filenameEncode = MimeUtility.encodeText(fileName, "UTF-8", "base64");
+ messageBodyPart.setFileName(filenameEncode);
+ messageBodyPart.setHeader("Content-Transfer-Encoding", "base64");
+ messageBodyPart.setHeader("Content-Disposition", "attachment");
+ messageBodyPart.setHeader("Content-Type", "application/octet-stream;name=\"" + filenameEncode + "\"");
+
+ multipart.addBodyPart(messageBodyPart);
+ }
+
+ return multipart;
+ }
+
+ public static void main(String[] args) throws UnsupportedEncodingException {
+ TencentMailUtil tencentMailUtil = new TencentMailUtil();
+ MailProperties properties = new MailProperties();
+ tencentMailUtil.properties = properties;
+ tencentMailUtil.send("645025773@qq.com","大学城揽院24栋");
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java
index c637d9d..62a2e34 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInvoiceService.java
@@ -19,4 +19,5 @@
public interface TInvoiceService extends IService<TInvoice> {
PageInfo<TInvoice> pageList(TInvoiceQuery query);
List<TInvoice> makeQuery(TInvoiceQuery query);
+ Boolean uploadVoucher(TInvoiceQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
index 36dbad6..c0be87b 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInvoiceServiceImpl.java
@@ -3,7 +3,9 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.exception.ServiceException;
import com.ruoyi.common.utils.StringUtils;
+import com.ruoyi.common.utils.TencentMailUtil;
import com.ruoyi.system.mapper.TInvoiceMapper;
import com.ruoyi.system.model.TInvoice;
import com.ruoyi.system.query.TInvoiceQuery;
@@ -12,7 +14,10 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
-import java.util.List;
+import javax.annotation.Resource;
+import java.util.*;
+import java.util.concurrent.CompletableFuture;
+import java.util.stream.Collectors;
/**
* <p>
@@ -28,6 +33,8 @@
TInvoiceToBillServiceImpl tInvoiceToBillService;
@Autowired
TBillService tBillService;
+ @Resource
+ TencentMailUtil mailUtil;
@Override
public PageInfo<TInvoice> pageList(TInvoiceQuery query) {
@@ -49,4 +56,94 @@
.orderByDesc(TInvoice::getCreateTime);
return this.baseMapper.selectList(queryWrapper);
}
+
+ @Override
+ public Boolean uploadVoucher(TInvoiceQuery query) {
+ // 检查是否存在对应的发票记录
+ TInvoice preexist = getById(query.getId());
+ if (preexist == null) {
+ log.error("未找到对应的发票记录，ID: {}"+query.getId());
+ return false;
+ }
+
+ // 更新发票信息
+ TInvoice tInvoice = new TInvoice();
+ tInvoice.setId(query.getId());
+ tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
+ tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
+ tInvoice.setInvoiceTime(query.getInvoiceTime());
+ tInvoice.setStatus(2);
+
+ // 处理附件信息
+ List<Map<String, String>> attachments = buildAttachments(query.getInvoiceVoucher(), query.getInvoiceVoucherName());
+ if (attachments.isEmpty()) {
+ log.warn("未找到有效的附件信息");
+ return updateById(tInvoice);
+ }
+
+ // 异步发送邮件
+ CompletableFuture.runAsync(() -> {
+ try {
+ mailUtil.sendInvoice(preexist.getEmail(), attachments);
+ } catch (ServiceException e) {
+ log.error("邮件发送失败", e);
+ }
+ });
+
+ // 更新数据库
+ return updateById(tInvoice);
+ }
+
+ private List<Map<String, String>> buildAttachments(String invoiceVoucher, String invoiceVoucherName) {
+ if (invoiceVoucher == null || invoiceVoucherName == null) {
+ return Collections.emptyList();
+ }
+
+ String[] voucherUrls = invoiceVoucher.split(",");
+ String[] voucherNames = invoiceVoucherName.split(",");
+
+ // 确保两个数组长度一致
+ int length = Math.min(voucherUrls.length, voucherNames.length);
+ if (length == 0) {
+ return Collections.emptyList();
+ }
+
+ // 构建附件列表
+ List<Map<String, String>> attachments = new ArrayList<>(length);
+ for (int i = 0; i < length; i++) {
+ Map<String, String> attachment = new HashMap<>(2); // 初始容量为2，避免扩容
+ attachment.put("url", voucherUrls[i]);
+ attachment.put("fileName", voucherNames[i]);
+ attachments.add(attachment);
+ }
+
+ return attachments;
+ }
+
+ // @Override
+ // public Boolean uploadVoucher(TInvoiceQuery query) {
+ // TInvoice preexist = getById(query.getId());
+ // if (preexist == null){
+ // return false;
+ // }
+ // TInvoice tInvoice = new TInvoice();
+ // tInvoice.setId(query.getId());
+ // tInvoice.setInvoiceVoucher(query.getInvoiceVoucher());
+ // tInvoice.setInvoiceVoucherName(query.getInvoiceVoucherName());
+ // tInvoice.setInvoiceTime(query.getInvoiceTime());
+ // tInvoice.setStatus(2);
+ // List<Map<String, String>> mapArrayList = new ArrayList<>();
+ // String invoiceVoucher = query.getInvoiceVoucher();
+ // String invoiceVoucherName = query.getInvoiceVoucherName();
+ //
+ // List<String> list = Arrays.stream(invoiceVoucher.split(",")).collect(Collectors.toList());
+ // for (int i = 0; i < list.size()-1; i++) {
+ // Map<String, String> map = new HashMap<>();
+ // map.put("url", list.get(i));
+ // map.put("fileName",invoiceVoucherName.split(",")[i]);
+ // mapArrayList.add(map);
+ // }
+ // mailUtil.sendInvoice(preexist.getEmail(),mapArrayList);
+ // return updateById(tInvoice);
+ // }
}
--
Gitblit v1.7.1