Merge branch 'feature-changeFlow-221110' of…

Merge branch 'feature-changeFlow-221110' of https://yxwbgit.mail.netease.com/yx-qc-change-flow/yanxuan-qc-change-system into feature-changeFlow-221110

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

@@ -33,6 +33,9 @@ public class AppConfig {
     @Value("${testEmail:A@163.com}")
     private String testEmail;
 
+    @Value("${sendEmail:wb.wangzhichao01@mesg.corp.netease.com}")
+    private String sendEmail;
+
     @Value("${change.goods.principal.name:aaa}")
     private String defaultName;
 

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

@@ -57,8 +57,8 @@ public interface ChangeFlowService {
      * @param entityId
      * @param nodeId1
      * @param nodeId2
-     * @param currentTime
+     * @param tomorrowSpecificTime
      * @return
      */
-    List<ChangeRecord> getByStatusAndTime(Long entityId, String nodeId1, String nodeId2, long currentTime);
+    List<ChangeRecord> getByStatusAndTime(Long entityId, String nodeId1, String nodeId2, long tomorrowSpecificTime);
 }
\ No newline at end of file

yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/service/impl/ChangeFlowServiceImpl.java

@@ -56,7 +56,7 @@ public class ChangeFlowServiceImpl implements ChangeFlowService {
     }
 
     @Override
-    public List<ChangeRecord> getByStatusAndTime(Long entityId, String nodeId1, String nodeId2, long currentTime) {
-        return changeRecordMapper.getByStatusAndTime(entityId, nodeId1, nodeId2, currentTime);
+    public List<ChangeRecord> getByStatusAndTime(Long entityId, String nodeId1, String nodeId2, long tomorrowSpecificTime) {
+        return changeRecordMapper.getByStatusAndTime(entityId, nodeId1, nodeId2, tomorrowSpecificTime);
     }
 }
\ No newline at end of file

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

@@ -73,7 +73,8 @@ public class FlowService {
      * @param approved
      * @return
      */
-    public String submitFlow(String flowId, FlowDataDTO flowDataDTO, String uid, String topoId, String content, boolean approved) {
+    public String submitFlow(String flowId, FlowDataDTO flowDataDTO, String uid, String topoId, String content,
+        boolean approved, String operateResult, String remark) {
         NodeSubmitReqDTO nodeSubmitReqDTO = new NodeSubmitReqDTO();
         nodeSubmitReqDTO.setFlowId(flowId);
         nodeSubmitReqDTO.setNodeId(flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId());
@@ -81,7 +82,8 @@ public class FlowService {
         nodeSubmitReqDTO.setUserName(uid);
         nodeSubmitReqDTO.setTopoId(topoId);
         nodeSubmitReqDTO.setContent(content);
-        nodeSubmitReqDTO.setOperateResult(FlowxOperationEnum.SUBMIT.getName());
+        nodeSubmitReqDTO.setOperateResult(operateResult);
+        nodeSubmitReqDTO.setRemark(remark);
         nodeSubmitReqDTO.setCreateTime(System.currentTimeMillis());
         nodeSubmitReqDTO.setApproved(approved);
         nodeSubmitReqDTO.setOccLock(flowDataDTO.getOccLock() + 1);
@@ -89,13 +91,13 @@ public class FlowService {
         List<String> nextNodeIdList;
         // 提交工单
         AjaxResponse<List<String>> submitResponse = flowRpcService.submit(CommonConstants.FLOWX_PRODUCT,
-                nodeSubmitReqDTO);
+            nodeSubmitReqDTO);
         if (ResponseCodeEnum.SUCCESS.getCode() == submitResponse.getCode()) {
             nextNodeIdList = submitResponse.getData();
             log.info("[submitFlow] nextNodeIdList={}", JSON.toJSONString(nextNodeIdList));
         } else {
             log.error("[submitFlow] submit flow failed, query={}, errMsg={}", JSON.toJSONString(nodeSubmitReqDTO),
-                    JSON.toJSONString(submitResponse));
+                JSON.toJSONString(submitResponse));
             throw ExceptionFactory.createBiz(ResponseCode.SUBMIT_FLOW_ERROR, "提交工单错误");
         }
         if (CollectionUtils.isEmpty(nextNodeIdList)) {

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

@@ -36,22 +36,21 @@ public class SupplierSendService {
     @Autowired
     private EmailTemplateServiceImpl emailTemplateService;
 
-    /**
-     * 发送供应商邮件
-     * @param changeRecord
-     * @param emailTemplateEnum
-     * @param param
-     */
-    public void sendSupplierEmail(ChangeRecord changeRecord, EmailTemplateEnum emailTemplateEnum,
+
+    public void sendSupplierEmail(String supplier, String subjectParam, EmailTemplateEnum emailTemplateEnum,
         Map<String, Object> param) {
-        SupplierSendEmailReq req = new SupplierSendEmailReq();
-        req.setSupplierId(changeRecord.getChangeSupplier());
-        req.setMailSubject(String.format(emailTemplateEnum.getSubject(), changeRecord.getId()));
-        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);
+        try {
+            SupplierSendEmailReq req = new SupplierSendEmailReq();
+            req.setSupplierId(supplier);
+            req.setMailSubject(subjectParam);
+            EmailFactor factor = EmailFactor.builder().data(param).emailTemplateEnum(emailTemplateEnum)
+                .subject(req.getMailSubject()).type(EmailTypeEnum.HTML.getType()).build();
+            req.setMailContent(this.content(factor));
+            log.debug("[sendSupplierEmail] 发送供应商邮件内容 subjectParam:{}, req:{}", subjectParam, JSON.toJSONString(req));
+            flowRpcSupplierSendService.sendEmail(req);
+        } catch (Exception e) {
+            log.error("[op:sendSupplierEmail] error,supplier:{},subjectParam:{}, e:{}", supplier, subjectParam, e);
+        }
     }
 
     /**

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

@@ -19,14 +19,17 @@ import org.springframework.stereotype.Component;
 import com.alibaba.fastjson.JSON;
 import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
+import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.FlowService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierSendService;
 import com.netease.mail.yanxuan.change.common.bean.CommonConstants;
 import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
 import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 import com.netease.mail.yanxuan.change.common.enums.FlowOperationTypeEnum;
+import com.netease.mail.yanxuan.change.common.enums.FlowxOperationEnum;
 import com.netease.mail.yanxuan.change.common.util.DateUtils;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
 import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
 import com.netease.mail.yanxuan.dschedule.core.biz.model.ReturnT;
 import com.netease.mail.yanxuan.dschedule.core.handler.IJobHandler;
@@ -56,17 +59,22 @@ public class AutoSubmit extends IJobHandler {
     @Autowired
     private SupplierSendService sendSupplierEmail;
 
+    @Autowired
+    private ChangeConfigService changeConfigService;
+
     @Override
     public ReturnT<String> execute(String... strings) throws Exception {
         log.info("AutoSubmit start");
         long startTime = DateUtils.getCurrentTime();
+        // 处理变更确认时间是今天24点之前的
+        Long tomorrowSpecificTime = DateUtils.getTomorrowSpecificTime("00:00:00");
         List<Long> count = new ArrayList<>();
         Long entityId = 0L;
         // 查询今天时间之前的数据
         try {
             while (true) {
                 List<ChangeRecord> records = changeFlowService.getByStatusAndTime(entityId, ChangeFlowEnum.CHANGE_FLOW_EXE.getNodeId(),
-                        ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId(), startTime);
+                        ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId(), tomorrowSpecificTime);
                 if (CollectionUtils.isEmpty(records)) {
                     break;
                 }
@@ -100,7 +108,8 @@ public class AutoSubmit extends IJobHandler {
             content.put(CommonConstants.FLOW_OPERATION_KEY, FlowOperationTypeEnum.PASS.getValue());
             try {
                 String execNode = flowService.submitFlow(flowId.toString(), flowDataDTO, uid,
-                        ChangeFlowEnum.CHANGE_FLOW_EXE.getTopoId(), JSON.toJSONString(content), true);
+                    ChangeFlowEnum.CHANGE_FLOW_EXE.getTopoId(), JSON.toJSONString(content), true,
+                    FlowxOperationEnum.SUBMIT.getName(), "提交工单");
                 // 更新工单数据
                 changeRecord.setFlowNode(execNode);
                 changeRecord.setUpdateTime(DateUtils.getCurrentTime());
@@ -114,11 +123,27 @@ 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.getId().toString(),
+        ChangeConfigPo changeConfigPo = changeConfigService.queryInfoPo(changeRecord.getParentChangeClassId(),
+            changeRecord.getSonChangeClassId());
+        StringBuilder changeType = new StringBuilder("");
+        try {
+            changeType.append(changeConfigPo.getChangeTypes().get(0).getTypeName());
+        } catch (Exception e) {
+            log.error("queryInfoPo error:{}", JSON.toJSONString(changeConfigPo));
+        }
+        try {
+            changeType.append(changeConfigPo.getChangeTypes().get(1).getTypeName());
+        } catch (Exception e) {
+            log.error("queryInfoPo error:{}", JSON.toJSONString(changeConfigPo));
+        }
+        String subjectParam = changeRecord.getChangeSubject() + changeType.toString()
+                + changeRecord.getId().toString();
+        changeFlowBiz.qcSendEmail(changeRecord.getChangeCommander(), subjectParam,
             EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         // 如果是供应商，再次发送供应商邮件
         if (changeRecord.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
-            sendSupplierEmail.sendSupplierEmail(changeRecord, EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
+            sendSupplierEmail.sendSupplierEmail(changeRecord.getChangeSupplier(), subjectParam,
+                EmailTemplateEnum.YX_QC_CHANGE_AFFIRM, map);
         }
     }
 }
\ No newline at end of file

yanxuan-qc-change-system-common/src/main/java/com/netease/mail/yanxuan/change/common/enums/ChangeStatusEnum.java

@@ -11,11 +11,11 @@ package com.netease.mail.yanxuan.change.common.enums;
  * @Date 2022/11/14
  */
 public enum ChangeStatusEnum {
-
     IN(1, "进行中"),
     CANCEL(2, "取消完结"),
     DELAY(3, "延期"),
-    END(4, "完结");
+    END(4, "完结"),
+    WAIT(5, "待发起"),;
 
     private Integer status;
 

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/ChangeFlowDeliverReq.java

@@ -33,6 +33,5 @@ public class ChangeFlowDeliverReq {
     /**
      * 转交备注
      */
-    @NotBlank(message = "转交备注不可为空")
     private String remark;
 }
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/meta/model/req/SendMailReq.java

+/**
+ * @(#)SendMailReq.java, 2022/12/9.
+ * <p/>
+ * Copyright 2022 Netease, Inc. All rights reserved.
+ * NETEASE PROPRIETARY/CONFIDENTIAL. Use is subject to license terms.
+ */
+package com.netease.mail.yanxuan.change.dal.meta.model.req;
+
+import lombok.Data;
+
+/**
+ * @Author zcwang
+ * @Date 2022/12/9
+ */
+@Data
+public class SendMailReq {
+
+    private Long id;
+
+    private String code;
+
+    private String mapToJson;
+
+    private Integer createSource;
+
+    private String changeSupplier;
+}
\ No newline at end of file

yanxuan-qc-change-system-dal/src/main/resources/mybatis/mapper/ChangeRecordMapper.xml

@@ -79,6 +79,6 @@
                 and create_time <![CDATA[ < ]]> #{endTime}
             </if>
         </where>
-        order by create_time desc
+            order by create_time desc
     </select>
 </mapper>
\ No newline at end of file

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/email/enums/EmailTemplateEnum.java

@@ -11,7 +11,7 @@ public enum EmailTemplateEnum {
 
     YX_QC_CHANGE_RELEASE_FLOW("yxqc_change_release_flow","发起变更","【待处理】%s 变更申请提交 "),
 
-    YX_QC_CHANGE_SUBMIT_CANCEL("yx_qc_change_submit_cancel","变更取消","【待处理】%s 变更取消通知"),
+    YX_QC_CHANGE_SUBMIT_CANCEL("yx_qc_change_submit_cancel","变更取消","%s 变更取消通知"),
 
     YX_QC_CHANGE_SUBMIT_FORWARD("yx_qc_change_submit_forward","变更转交","%s 变更工单转交通知"),
 
@@ -51,4 +51,13 @@ public enum EmailTemplateEnum {
         return subject;
     }
 
+    public static EmailTemplateEnum getEmailTemplateEnum(String code){
+        for (EmailTemplateEnum template : EmailTemplateEnum.values()) {
+            if (template.getCode().equals(code)) {
+                return template;
+            }
+        }
+        return null;
+    }
+
 }

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

@@ -6,30 +6,39 @@
  */
 package com.netease.mail.yanxuan.change.web.controller;
 
-import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
-import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeConfigPo;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierInfoService;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
+import java.util.List;
+import java.util.Map;
+
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
+import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
+import com.netease.mail.yanxuan.change.biz.config.AppConfig;
 import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
+import com.netease.mail.yanxuan.change.biz.service.rpc.SupplierSendService;
 import com.netease.mail.yanxuan.change.biz.service.rpc.TodoService;
 import com.netease.mail.yanxuan.change.biz.task.AutoSubmit;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
 import com.netease.mail.yanxuan.change.common.bean.ResponseCode;
 import com.netease.mail.yanxuan.change.common.enums.ChangeFlowEnum;
+import com.netease.mail.yanxuan.change.common.enums.CreateSourceEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
+import com.netease.mail.yanxuan.change.dal.meta.model.req.SendMailReq;
+import com.netease.mail.yanxuan.change.integration.email.enums.EmailTemplateEnum;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierInfoService;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
 
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.List;
-
 /**
  * @Author zcwang
  * @Date 2022/11/28
@@ -48,7 +57,17 @@ public class TestController {
     @Autowired
     private AutoSubmit autoSubmit;
 
+    @Autowired
+    private ChangeFlowBiz changeFlowBiz;
+
+    @Autowired
+    private AppConfig appConfig;
+
+    @Autowired
+    private SupplierSendService sendSupplierEmail;
+
     @PostMapping("/createToDo")
+
     public AjaxResult<Void> createTodoTask(ChangeRecord entity) {
         log.info("[createToDoTask] entity:{}", JSON.toJSONString(entity));
         todoService.createTodoTask(entity);
@@ -86,4 +105,21 @@ public class TestController {
     public List<SupplierUserRsp> test(@RequestBody SupplierRelatedUserReq req) {
         return supplierInfoService.querySupplierRelatedUser(req);
     }
+
+    @PostMapping("/send")
+    public void sendEmail(@RequestBody SendMailReq req) {
+        String subjectParam = req.getId().toString();
+        EmailTemplateEnum emailTemplateEnum = EmailTemplateEnum.getEmailTemplateEnum(req.getCode());
+        String mapToJson = req.getMapToJson();
+        log.debug("[testSendEmail] subjectParam:{}, emailTemplateEnum:{}, mapToJson:{}", subjectParam,
+            emailTemplateEnum, mapToJson);
+        changeFlowBiz.qcSendEmail(appConfig.getSendEmail(), subjectParam,
+                        emailTemplateEnum, JSON.parseObject(mapToJson, Map.class));
+        // 如果是供应商，再次发送供应商邮件
+        if (req.getCreateSource().equals(CreateSourceEnum.QC.getType())) {
+            Assert.notNull(req.getChangeSupplier(), "同舟端负责人不可为空");
+            sendSupplierEmail.sendSupplierEmail(req.getChangeSupplier(), subjectParam,
+                    emailTemplateEnum, JSON.parseObject(mapToJson, Map.class));
+        }
+    }
 }
\ No newline at end of file