Merge remote-tracking branch 'origin/feature-changeFlow-221110' into feature-changeFlow-221110

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

@@ -171,8 +171,7 @@ public class ChangeFlowBiz {
         // 查询工单详情
         FlowDataDTO flowDataDTO = flowService.flowDetail(flowId);
         String nodeId = flowDataDTO.getFlowMeta().getCurrNodeDataList().get(0).getNodeId();
-        // todo: 根据类型查询负责人详情，格式邮箱
-        String changeCommander = appConfig.getTestEmail();
+        String changeCommander = changeFlowCreateReq.getChangeCommander();
         // 保存工单数据
         ChangeRecord changeRecord = buildChangeRecord(flowId, nodeId, changeFlowCreateReq, changeCommander, uid);
         changeFlowService.saveRecord(changeRecord);
@@ -655,6 +654,8 @@ public class ChangeFlowBiz {
         changeFlowVO.setCreateTime(changeRecord.getCreateTime());
         changeFlowVO.setChangeConfirmResultTime(changeRecord.getChangeConfirmResultTime());
         changeFlowVO.setChangeResult(changeRecord.getChangeResult());
+        changeFlowVO.setChangeResultDesc(changeRecord.getChangeResultDesc());
+        changeFlowVO.setTopoId(ChangeFlowEnum.CHANGE_FLOW.getTopoId());
         return changeFlowVO;
     }
 

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

@@ -14,6 +14,7 @@ import lombok.Getter;
  */
 public enum ChangeFlowEnum {
 
+    CHANGE_FLOW("0000", "全链路变更", "qc-change-flow"),
     CHANGE_FLOW_START("79560500", "开始节点", "qc-change-flow"),
     CHANGE_FLOW_SUBMIT("79560501", "变更申请提交", "qc-change-flow"),
     CHANGE_FLOW_EXE("79560502","变更执行", "qc-change-flow"),

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

@@ -50,6 +50,7 @@ public class ChangeFlowCreateReq {
     /**
      * 变更负责人
      */
+    @NotBlank(message = "变更负责人不能为空")
     private String changeCommander;
 
     /**

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

@@ -148,6 +148,11 @@ public class ChangeFlowVO {
     private Integer changeResult;
 
     /**
+     * 变更结论详情
+     */
+    private String changeResultDesc;
+
+    /**
      * 备注
      */
     private String remark;
@@ -156,4 +161,9 @@ public class ChangeFlowVO {
      * 变更商品基础信息
      */
     private List<ItemBasicInfoVO> itemBasicInfoList;
+
+    /**
+     * topoId
+     */
+    private String topoId;
 }
\ No newline at end of file

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

 package com.netease.mail.yanxuan.change.web.config;
 
-
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
-import org.springframework.web.servlet.config.annotation.AsyncSupportConfigurer;
 import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
-import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
 
 /**
  * @author zhangbingQAQ
  * @date 2021/8/27 10:18
  */
 @Configuration
-public class WebMvcConfig implements WebMvcConfigurer{
+public class WebMvcConfig implements WebMvcConfigurer {
 
     @Autowired
     private AdminUserLoginInterceptor userLoginInterceptor;
 
-    @Autowired
-    private LoginInterceptor loginInterceptor;
-
     /**
      * 拦截器配置
      *
@@ -30,8 +22,8 @@ public class WebMvcConfig implements WebMvcConfigurer{
      */
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(userLoginInterceptor).addPathPatterns("/**").excludePathPatterns("/i/health").excludePathPatterns("/change/flow/getOperator","/test/**");
-        // registry.addInterceptor(loginInterceptor).addPathPatterns("/**").excludePathPatterns("/change/flow/getOperator");
+        registry.addInterceptor(userLoginInterceptor).addPathPatterns("/**").excludePathPatterns("/i/health")
+            .excludePathPatterns("/change/flow/getOperator", "/test/**");
     }
 
 }

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

@@ -6,28 +6,27 @@
  */
 package com.netease.mail.yanxuan.change.web.controller;
 
-import com.netease.mail.yanxuan.change.biz.service.InteriorChangeConfigService;
-import com.netease.mail.yanxuan.change.common.bean.AdminUserHolder;
-import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeGoodsPrincipalPO;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
-import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
+import java.util.ArrayList;
+import java.util.List;
+
 import org.springframework.beans.factory.annotation.Autowired;
-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.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
 import com.netease.mail.yanxuan.change.biz.service.rpc.TodoService;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
-import com.netease.mail.yanxuan.change.common.enums.OperateTypeEnum;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeRecord;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq;
+import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 
 import lombok.extern.slf4j.Slf4j;
 
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @Author zcwang
  * @Date 2022/11/28