add: 导出回调不拦截登录

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java

@@ -256,7 +256,7 @@ public class ChangeFlowBiz {
             param.put("changeCommanderEmail", changeRecord.getChangeCommander());
             param.put("flowUrl", changeRecord.getFlowId());
             param.put("dataList", changeExecRecords);
-            qcSendEmail(changeCommander, changeRecord, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
+            qcSendEmail(changeCommander, changeRecord.getId().toString(), EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
             // 如果是供应商，再次发送供应商邮件
             if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
                 sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
@@ -281,7 +281,7 @@ public class ChangeFlowBiz {
         }
         param.put("changeType", changeType.toString());
         param.put("flowUrl", changeRecord.getFlowId());
-        qcSendEmail(changeCommander, changeRecord, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
+        qcSendEmail(changeCommander, changeRecord.getId().toString(), EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
         // 如果是供应商，再次发送供应商邮件
         if (changeFlowCreateReq.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
@@ -289,13 +289,21 @@ public class ChangeFlowBiz {
         return flowId;
     }
 
-    public void qcSendEmail(String changeCommander, ChangeRecord changeRecord, EmailTemplateEnum emailTemplateEnum,
-        HashMap<String, Object> param) {
+    /**
+     * 严选QC端发送邮件
+     * @param changeCommander   负责人
+     * @param subjectParam      主体参数
+     * @param emailTemplateEnum 邮件模板
+     * @param param             正文参数
+     */
+    public void qcSendEmail(String changeCommander, String subjectParam, EmailTemplateEnum emailTemplateEnum,
+        Map<String, Object> param) {
         IusDepartmentReq iusDepartmentReq = new IusDepartmentReq();
         iusDepartmentReq.setHasOrgPos(true);
         iusDepartmentReq.setIcac(true);
         iusDepartmentReq.setUids(Collections.singletonList(changeCommander));
         HashMap<String, List<SecondaryDepartments>> map = iusService.queryDepartment(iusDepartmentReq);
+        log.info("[qcSendEmail] subjectParam:{}, map:{}", subjectParam, map);
         List<SecondaryDepartments> secondaryDepartments = map.get(changeCommander);
         List<String> ccList = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(secondaryDepartments)) {
@@ -303,8 +311,8 @@ public class ChangeFlowBiz {
         }
         // 变更管理QM，所有邮件都要发
         ccList.add(appConfig.getChangeManageQM());
-        iEmailService.sendEmail(Collections.singletonList(changeCommander), ccList, param,
-                emailTemplateEnum, Collections.singletonList(changeRecord.getId().toString()));
+        iEmailService.sendEmail(Collections.singletonList(changeCommander), ccList, param, emailTemplateEnum,
+            subjectParam);
     }
 
     private List<ChangeFile> buildChangeFileRecord(Long changeRecordId, List<ChangeFlowFile> files, Integer type) {
@@ -496,7 +504,7 @@ public class ChangeFlowBiz {
                 param.put("changeCommanderEmail", changeRecord.getChangeCommander());
                 param.put("flowUrl", changeRecord.getFlowId());
                 param.put("dataList", changeExecRecords);
-                qcSendEmail(changeRecord.getChangeCommander(), changeRecord, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
+                qcSendEmail(changeRecord.getChangeCommander(), changeRecord.getId().toString(), EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
                 // 如果是供应商，再次发送供应商邮件
                 if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
                     sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_EXECUTE, param);
@@ -537,7 +545,8 @@ public class ChangeFlowBiz {
                         finishPartMap.put("changeId", changeRecord.getId());
                         finishPartMap.put("changeSubject", changeRecord.getChangeSubject());
                         finishPartMap.put("flowUrl", changeRecord.getFlowId());
-                        qcSendEmail(changeRecord.getChangeCommander(), changeRecord, EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
+                        qcSendEmail(changeRecord.getChangeCommander(), changeRecord.getId().toString(),
+                            EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
                         // 如果是供应商，再次发送供应商邮件
                         if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
                             sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_FINISH, finishPartMap);
@@ -560,7 +569,7 @@ public class ChangeFlowBiz {
                         cancelMap.put("changeId", changeRecord.getId());
                         cancelMap.put("changeSubject", changeRecord.getChangeSubject());
                         cancelMap.put("flowUrl", changeRecord.getFlowId());
-                        qcSendEmail(changeRecord.getChangeCommander(), changeRecord, EmailTemplateEnum.YX_QC_CHANGE_FINISH, cancelMap);
+                        qcSendEmail(changeRecord.getChangeCommander(), changeRecord.getId().toString(), EmailTemplateEnum.YX_QC_CHANGE_FINISH, cancelMap);
                         // 如果是供应商，再次发送供应商邮件
                         if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
                             sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_FINISH, cancelMap);
@@ -647,7 +656,11 @@ public class ChangeFlowBiz {
         changeRecord.setCancelReason(req.getCancelReason());
         changeRecord.setUpdateTime(DateUtils.getCurrentTime());
         todoService.progressTodoTask(changeRecord, OperateTypeEnum.FINISH.getType());
-        // todo:取消501节点，取消工单，发送邮件
+        /*qcSendEmail(changeCommander, changeRecord.getId().toString(), EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
+        // 如果是供应商，再次发送供应商邮件
+        if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+            sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_RELEASE_FLOW, param);
+        }*/
         return changeFlowService.updateRecord(changeRecord);
     }
 

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/rpc/SupplierSendService.java

@@ -42,14 +42,13 @@ public class SupplierSendService {
      * @param emailTemplateEnum
      * @param param
      */
-    public void sendSupplierEmail(ChangeRecord changeRecord, EmailTemplateEnum emailTemplateEnum, Map<String, Object> param) {
+    public void sendSupplierEmail(ChangeRecord changeRecord, EmailTemplateEnum emailTemplateEnum,
+        Map<String, Object> param) {
         SupplierSendEmailReq req = new SupplierSendEmailReq();
         req.setSupplierId(changeRecord.getChangeSupplier());
         req.setMailSubject(String.format(emailTemplateEnum.getSubject(), changeRecord.getId()));
-        EmailFactor emailFactor = new EmailFactor();
-        EmailFactor factor = EmailFactor.builder()
-                .data(param).emailTemplateEnum(emailTemplateEnum)
-                .subject(req.getMailSubject()).type(EmailTypeEnum.HTML.getType()).build();
+        EmailFactor factor = EmailFactor.builder().data(param).emailTemplateEnum(emailTemplateEnum)
+            .subject(req.getMailSubject()).type(EmailTypeEnum.HTML.getType()).build();
         req.setMailContent(this.content(factor));
         log.debug("[sendSupplierEmail] 发送供应商邮件内容 flowId:{}, req:{}", changeRecord.getFlowId(), JSON.toJSONString(req));
         flowRpcSupplierSendService.sendEmail(req);

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/task/AutoSubmit.java

@@ -114,7 +114,8 @@ public class AutoSubmit extends IJobHandler {
         map.put("changeId", changeRecord.getId());
         map.put("changeSubject", changeRecord.getChangeSubject());
         map.put("flowUrl", changeRecord.getFlowId());
-        changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), changeRecord, EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
+        changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), changeRecord.getId().toString(),
+            EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         // 如果是供应商，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
             sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);

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

@@ -3,6 +3,7 @@ package com.netease.mail.yanxuan.change.integration.email.service;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
 
@@ -19,8 +20,8 @@ public interface IEmailService {
      * @param ccList 抄送人
      * @param map  邮箱参数
      * @param emailTemplateEnum  标题枚举
-     * @param subjectParams  标题参数
+     * @param subjectParam  标题参数
      */
-    void sendEmail(Collection<String> toList, Collection<String> ccList, HashMap<String, Object> map,
-        EmailTemplateEnum emailTemplateEnum, List<String> subjectParams);
+    void sendEmail(Collection<String> toList, Collection<String> ccList, Map<String, Object> map,
+        EmailTemplateEnum emailTemplateEnum, String subjectParam);
 }

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

@@ -5,6 +5,8 @@ import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum
 import com.netease.mail.yanxuan.change.integration.email.enums.EmailTypeEnum;
 import com.netease.mail.yanxuan.change.integration.email.service.IEmailService;
 import com.netease.mail.yanxuan.change.integration.email.service.UasClientService;
+
+import org.apache.logging.log4j.util.Strings;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -13,6 +15,7 @@ import org.springframework.util.CollectionUtils;
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 @Service
@@ -26,8 +29,8 @@ public class EmailServiceImpl implements IEmailService {
 
     @Override
     @Async("asyncEmail")
-    public void sendEmail(Collection<String> toList, Collection<String> ccList,
-                          HashMap<String, Object> map, EmailTemplateEnum emailTemplateEnum, List<String> subjectParams) {
+    public void sendEmail(Collection<String> toList, Collection<String> ccList, Map<String, Object> map,
+                          EmailTemplateEnum emailTemplateEnum, String subjectParam) {
         EmailFactor emailFactor = new EmailFactor();
         //固定
         emailFactor.setType(EmailTypeEnum.TEXT.getType());
@@ -43,8 +46,8 @@ public class EmailServiceImpl implements IEmailService {
             }
             String subject = emailFactor.getSubject();
             //标题参数处理
-            if (subjectParams != null) {
-                subject = String.format(subject, subjectParams.get(0));
+            if (Strings.isNotBlank(subjectParam)) {
+                subject = String.format(subject, subjectParam);
             }
             uasClient.sendEmail(subject, content, toList, ccList, null);
         }

yanxuan-qc-change-system-web/src/main/java/com/netease/mail/yanxuan/change/web/config/WebMvcConfig.java

@@ -26,7 +26,7 @@ public class WebMvcConfig implements WebMvcConfigurer {
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
         registry.addInterceptor(userInterceptor).addPathPatterns("/**").excludePathPatterns("/i/health")
-            .excludePathPatterns("/change/flow/getOperator", "/test/createToDo","/test/progressTodo","/test/submit");
+            .excludePathPatterns("/change/flow/getOperator", "/test/**", "/api/des/callback/**");
         registry.addInterceptor(adminUserLoginInterceptor).addPathPatterns("test/**");
     }