测试拼接标题

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/IEmailService.java

 package com.netease.mail.yanxuan.change.integration.email.service;
 
 import com.netease.mail.yanxuan.change.integration.email.email.EmailFactor;
-import java.io.File;
 import java.util.Collection;
 import java.util.List;
 
@@ -11,40 +10,13 @@ import java.util.List;
 public interface IEmailService {
 
     /**
-     * @param to 收件人
-     * @param emailFactor 邮件要素
-     */
-    void sendEmail(String to, EmailFactor emailFactor);
-
-    /**
-     * @param toList 收件人列表
-     * @param factor 要素
-     */
-    void sendEmail(Collection<String> toList, EmailFactor factor);
-
-    /**
-     * @param toList 收件人
-     * @param ccList 抄送人
-     * @param factor 要素
-     * @param fileList 附件
-     */
-    void sendEmail(String toList, String ccList, EmailFactor factor,List<File> fileList);
-
-    /**
      *
      * @param toList 收件人列表
      * @param ccList 抄送人列表
      * @param factor 要素
+     * @param subjectParams 标题参数
      */
-    void sendEmail(Collection<String> toList, Collection<String> ccList, EmailFactor factor);
-
-    /**
-     * @param toList 收件人列表
-     * @param ccList 抄送人列表
-     * @param factor 要素
-     * @param fileList 附件
-     */
-    void sendEmail(Collection<String> toList, Collection<String> ccList, EmailFactor factor, List<File> fileList);
+    void sendEmail(Collection<String> toList, Collection<String> ccList, EmailFactor factor, List<String>subjectParams);
 
 
 }

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/service/impl/EmailServiceImpl.java

@@ -31,35 +31,8 @@ public class EmailServiceImpl implements IEmailService {
 
     @Override
     @Async("asyncEmail")
-    public void sendEmail(String to, EmailFactor emailFactor) {
-        this.sendEmail(to, null, emailFactor, null);
-    }
-
-    @Override
-    @Async("asyncEmail")
-    public void sendEmail(Collection<String> toList, EmailFactor factor) {
-        this.sendEmail(toList, null, factor, null);
-    }
-
-    @Override
-    @Async("asyncEmail")
-    public void sendEmail(String toList, String ccList, EmailFactor factor, List<File> fileList) {
-        List<String> _toList = null;
-        List<String> _ccList = null;
-        if (StringUtils.isNotBlank(toList)) {
-            _toList = Arrays.asList(toList.split(","));
-        }
-
-        if (StringUtils.isNotBlank(ccList)) {
-            _ccList = Arrays.asList(ccList.split(","));
-        }
-        this.sendEmail(_toList, _ccList, factor, fileList);
-    }
-
-    @Override
-    @Async("asyncEmail")
     public void sendEmail(Collection<String> toList, Collection<String> ccList,
-                          EmailFactor factor) {
+                          EmailFactor factor,List<String>subjectParams) {
         if (factor != null) {
             String content = this.content(factor);
             if (!CollectionUtils.isEmpty(toList)) {
@@ -68,34 +41,12 @@ public class EmailServiceImpl implements IEmailService {
             if (!CollectionUtils.isEmpty(ccList)) {
                 ccList = ccList.stream().filter(e -> e != null).collect(Collectors.toList());
             }
-            uasClient.sendEmail(factor.getSubject(), content, toList, ccList, null);
-        }
-    }
-
-    @Override
-    @Async("asyncEmail")
-    public void sendEmail(Collection<String> toList, Collection<String> ccList, EmailFactor factor,
-                          List<File> fileList) {
-        if (factor != null) {
-            logger.info("请求前参数查看\n"+factor.getData().toString());
-            String content = this.content(factor);
-            logger.info("请求后参数查看"+factor.getData().toString());
-            String abnormalTitle = (String) factor.getData().get("abnormalTitle");
-            String taskType = (String) factor.getData().get(EmailParamEnum.TASK_TYPE.getKey());
             String subject = factor.getSubject();
-            if (!StringUtils.isEmpty(abnormalTitle)) {
-                subject = String.format(subject, abnormalTitle, taskType);
-            }
-            if (!StringUtils.isEmpty(taskType)) {
-                subject = String.format(subject, taskType);
-            }
-            if (!CollectionUtils.isEmpty(toList)) {
-                toList = toList.stream().filter(e -> e != null).collect(Collectors.toList());
-            }
-            if (!CollectionUtils.isEmpty(ccList)) {
-                ccList = ccList.stream().filter(e -> e != null).collect(Collectors.toList());
+            //标题参数处理
+            if (subjectParams != null || subjectParams.size() != 0){
+                subject = String.format(subject,subjectParams.toArray());
             }
-            uasClient.sendEmail(subject, content, toList, ccList, fileList);
+            uasClient.sendEmail(subject, content, toList, ccList, null);
         }
     }
 

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/controller/ChangeConfigController.java

@@ -15,6 +15,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import java.util.ArrayList;
 import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -116,19 +117,21 @@ public class ChangeConfigController {
     public void queryCommanderInfo(){
         EmailFactor emailFactor = new EmailFactor();
         emailFactor.setType(EmailTypeEnum.TEXT.getType());
-        emailFactor.setEmailTemplateEnum(EmailTemplateEnum.YX_QC_RELEASE_FLOW);
+        emailFactor.setEmailTemplateEnum(EmailTemplateEnum.YX_QC_CHANGE_SUBMIT_FORWARD);
+        List<String> list = new ArrayList<>();
+        list.add("99888");
         ArrayList<String> strings = new ArrayList<>();
         strings.add("wb.tanglongwei@mesg.corp.netease.com");
         HashMap<String,Object> map = new HashMap<>();
-        map.put("flowId","工单ID");
-        map.put("releaseId","发起人账号");
-        map.put("releaseName","发起人姓名");
-        map.put("abnormalTitle","异常标题");
-        map.put("flowLink","工单链接");
-        map.put("findTime","findTime");
-        map.put("findDes","findDes");
+        map.put("changeId","变更Id");
+        map.put("changeSubject","变更主体");
+        map.put("changeContent","变更内容");
+        map.put("changeCommander","负责人名称");
+        map.put("changeCommanderEmail","负责人邮箱");
+        map.put("restsChangeCommander","转交后责任人名称");
+        map.put("restsChangeCommanderEmail","转交后责任人邮箱");
         emailFactor.setData(map);
-        iEmailService.sendEmail(strings,null,emailFactor);
+        iEmailService.sendEmail(strings,null,emailFactor,null);
 
     }