From 1a120cd07c8cb1bfa71c6cce6c9dc27c2c6b8b4d Mon Sep 17 00:00:00 2001
From: wangjingyi <wangjingyifighting@live.com>
Date: Wed, 30 Mar 2022 14:17:53 +0800
Subject: [PATCH] 邮件发送功能

---
 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java  | 36 ++++++++++++++++++++++++++++++++++++
 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java | 26 --------------------------
 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java          | 11 +++++++++++
 3 files changed, 47 insertions(+), 26 deletions(-)
 create mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
 delete mode 100644 yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java

diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
new file mode 100644
index 0000000..0bd9d5d
--- /dev/null
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailReqVO.java
@@ -0,0 +1,36 @@
+package cn.iocoder.yudao.module.system.controller.admin.mail.vo.send;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+@ApiModel("管理后台 - 邮件发送 Req VO")
+@Data
+public class MailReqVO { // TODO @wangjingyi：1）参数校验；2）ReqVO
+
+    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
+    @NotNull(message = "邮箱账号不能为空")
+    private String from;
+
+    @ApiModelProperty(value = "标题"  , example = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容"  , example = "内容")
+    private String content;
+
+    @ApiModelProperty(value = "邮箱模版id" , example = "1024")
+    @NotNull(message = "邮箱模版id不能为空")
+    private Integer templateId;
+
+    @ApiModelProperty(value = "收件人" , required = true , example = "yudaoyuanma@123.com")
+    @NotNull(message = "收件人不能为空")
+    private List<String> tos;
+
+    @ApiModelProperty(value = "附件"  , example = "附件编码")
+    private List<String> fileIds;
+
+
+}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
deleted file mode 100644
index 4d1bd9a..0000000
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/controller/admin/mail/vo/send/MailSendVO.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package cn.iocoder.yudao.module.system.controller.admin.mail.vo.send;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.util.List;
-@Data
-public class MailSendVO { // TODO @wangjingyi：1）参数校验；2）ReqVO
-
-    @ApiModelProperty(value = "邮箱" , required = true , example = "yudaoyuanma@123.com")
-    private String from;
-
-    @ApiModelProperty(value = "标题"  , example = "标题")
-    private String title;
-
-    @ApiModelProperty(value = "内容"  , example = "内容")
-    private String content;
-
-    @ApiModelProperty(value = "收件人" , required = true , example = "yudaoyuanma@123.com")
-    private List<String> tos;
-
-    @ApiModelProperty(value = "附件"  , example = "附件编码")
-    private List<String> fileIds;
-
-
-}
diff --git a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
index fe768ef..8dbfbc5 100644
--- a/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
+++ b/yudao-module-system/yudao-module-system-impl/src/main/java/cn/iocoder/yudao/module/system/convert/mail/MailAccountConvert.java
@@ -7,7 +7,9 @@ import cn.iocoder.yudao.module.system.dal.dataobject.mail.MailAccountDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
 
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 @Mapper
 public interface MailAccountConvert {
@@ -31,4 +33,13 @@ public interface MailAccountConvert {
                 .setPass(mailAccountDO.getPassword())
                 .setSslEnable(mailAccountDO.getSslEnable());
     };
+
+    default Map<String, String> convertToMap(MailAccountDO mailAccountDO , String content) {
+        Map<String , String> map = new HashMap<>();
+        map.put("from" , mailAccountDO.getFrom());
+        map.put("username" , mailAccountDO.getUsername());
+        map.put("content" , content);
+        return map;
+    };
+
 }
--
libgit2 0.21.4