邮件文件

yd-email-api/src/main/java/com/yd/email/api/controller/ApiEmailSendController.java

@@ -33,4 +33,14 @@ public class ApiEmailSendController implements ApiEmailSendFeignClient {
     public Result<ApiSendEmailResponse> sendEmail(ApiSendEmailRequest request) {
     public Result<ApiSendEmailResponse> sendEmail(ApiSendEmailRequest request) {
         return apiEmailSendService.sendEmail(request);
         return apiEmailSendService.sendEmail(request);
     }
     }
+
+    /**
+     * 测试发送邮件
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<ApiSendEmailResponse> testSendEmail(ApiSendEmailRequest request) {
+        return apiEmailSendService.testSendEmail(request);
+    }
 }
 }
\ No newline at end of file

yd-email-api/src/main/java/com/yd/email/api/service/ApiEmailSendService.java

@@ -6,4 +6,6 @@ import com.yd.email.feign.response.ApiSendEmailResponse;
 
 
 public interface ApiEmailSendService {
 public interface ApiEmailSendService {
     Result<ApiSendEmailResponse> sendEmail(ApiSendEmailRequest request);
     Result<ApiSendEmailResponse> sendEmail(ApiSendEmailRequest request);
+
+    Result<ApiSendEmailResponse> testSendEmail(ApiSendEmailRequest request);
 }
 }

yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailSendServiceImpl.java

@@ -211,5 +211,15 @@ public class ApiEmailSendServiceImpl implements ApiEmailSendService {
         return Result.success();
         return Result.success();
     }
     }
 
 
+    /**
+     * 测试发送邮件
+     * @param request
+     * @return
+     */
+    @Override
+    public Result<ApiSendEmailResponse> testSendEmail(ApiSendEmailRequest request) {
+        return null;
+    }
+
 
 
 }
 }

yd-email-api/src/main/java/com/yd/email/api/service/impl/ApiEmailTaskRecipientsServiceImpl.java

@@ -81,4 +81,17 @@ public class ApiEmailTaskRecipientsServiceImpl implements ApiEmailTaskRecipients
 
 
         return Result.success(saveRecipientsList);
         return Result.success(saveRecipientsList);
     }
     }
+
+//    /**
+//     * 根据当前当前会话id和数据来源查询导入数据，保存到邮件任务收件人关联表中
+//     * @param taskBizId 邮件任务唯一业务ID
+//     * @param status 收件人邮件状态
+//     * @param sessionId 会话id
+//     * @param source 数据的来源 0-选择联系人导入 1-excel导入联系人
+//     * @return
+//     */
+//    public Result<List<EmailTaskRecipients>> queryEmailTaskRecipientsBySessionId(String taskBizId,String status,
+//                                                                                 String sessionId,Integer source) {
+//
+//    }
 }
 }

yd-email-feign/src/main/java/com/yd/email/feign/client/ApiEmailSendFeignClient.java

@@ -22,4 +22,12 @@ public interface ApiEmailSendFeignClient {
      */
      */
     @PostMapping("/send")
     @PostMapping("/send")
     Result<ApiSendEmailResponse> sendEmail(@Validated @RequestBody ApiSendEmailRequest request);
     Result<ApiSendEmailResponse> sendEmail(@Validated @RequestBody ApiSendEmailRequest request);
+
+    /**
+     * 测试发送邮件
+     * @param request
+     * @return
+     */
+    @PostMapping("/test/send")
+    Result<ApiSendEmailResponse> testSendEmail(@Validated @RequestBody ApiSendEmailRequest request);
 }
 }

yd-email-feign/src/main/java/com/yd/email/feign/fallback/ApiEmailSendFeignFallbackFactory.java

@@ -21,6 +21,11 @@ public class ApiEmailSendFeignFallbackFactory implements FallbackFactory<ApiEmai
             public Result<ApiSendEmailResponse> sendEmail(ApiSendEmailRequest request) {
             public Result<ApiSendEmailResponse> sendEmail(ApiSendEmailRequest request) {
                 return null;
                 return null;
             }
             }
+
+            @Override
+            public Result<ApiSendEmailResponse> testSendEmail(ApiSendEmailRequest request) {
+                return null;
+            }
         };
         };
     }
     }
 }
 }

yd-email-feign/src/main/java/com/yd/email/feign/request/ApiSendEmailRequest.java

 package com.yd.email.feign.request;
 package com.yd.email.feign.request;
 
 
-import com.yd.email.feign.dto.ApiEmailTaskRecipientsDto;
 import lombok.Data;
 import lombok.Data;
 import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotBlank;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
-import java.util.List;
 
 
 @Data
 @Data
 public class ApiSendEmailRequest {
 public class ApiSendEmailRequest {
@@ -51,11 +49,13 @@ public class ApiSendEmailRequest {
     /**
     /**
      * 变量分组唯一业务ID
      * 变量分组唯一业务ID
      */
      */
+    @NotBlank(message = "变量分组唯一业务ID不能为空")
     private String variableGroupBizId;
     private String variableGroupBizId;
 
 
     /**
     /**
      * 导入临时表的当前会话id（前端使用，用于查询。存于前端缓存）（冗余字段，选择联系人和导入联系人excel都有值，用于发送到哪些收件人的，查询导入临时表的依据）
      * 导入临时表的当前会话id（前端使用，用于查询。存于前端缓存）（冗余字段，选择联系人和导入联系人excel都有值，用于发送到哪些收件人的，查询导入临时表的依据）
      */
      */
+    @NotBlank(message = "会话id不能为空")
     private String sessionId;
     private String sessionId;
 
 
 //    /**
 //    /**