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

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

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

@@ -373,12 +373,11 @@ public class ChangeFlowBiz {
         ChangeRecord changeRecord = this.getFlowInfo(flowId);
         // 检查工单节点
         this.checkNode(changeRecord.getFlowNode(), Collections.singletonList(changeFlowSubmitReq.getCurrentNodeId()));
-        // todo:检验操作权限
         String uid = RequestLocalBean.getUid();
         String changeCommander = changeRecord.getChangeCommander();
-        /*if (!uid.equals(changeCommander)) {
+        if (!uid.equals(changeCommander)) {
             throw ExceptionFactory.createBiz(ResponseCode.NO_AUTH, ResponseCode.NO_AUTH.getMsg());
-        }*/
+        }
         // 获取工单详情
         FlowDataDTO flowDataDTO = flowService.flowDetail(flowId.toString());
         if (flowDataDTO == null) {
@@ -556,11 +555,10 @@ public class ChangeFlowBiz {
         // 检查工单节点
         this.checkNode(changeRecord.getFlowNode(), Collections.singletonList(ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getNodeId()));
         String uid = RequestLocalBean.getUid();
-        // todo:检查审核人
         String changeCommander = changeRecord.getChangeCommander();
-        /*if (!uid.equals(changeCommander)) {
+        if (!uid.equals(changeCommander)) {
             throw ExceptionFactory.createBiz(ResponseCode.NO_AUTH, ResponseCode.NO_AUTH.getMsg());
-        }*/
+        }
         // 获取工单详情
         FlowDataDTO flowDataDTO = flowService.flowDetail(flowId.toString());
         if (flowDataDTO == null) {
@@ -596,8 +594,8 @@ public class ChangeFlowBiz {
             .changeProfitDesc(changeRecord.getChangeProfitDesc()).files(changeFileList).build();
     }
 
-    public ChangeFlowVO detail(Long id) {
-        ChangeRecord changeRecord = changeFlowService.getById(id);
+    public ChangeFlowVO detail(Long flowId) {
+        ChangeRecord changeRecord = changeFlowService.getByFlowId(flowId);
         if (changeRecord == null) {
             throw ExceptionFactory.createBiz(ResponseCode.ERROR_FLOW_ID, "工单id不存在");
         }
@@ -852,12 +850,11 @@ public class ChangeFlowBiz {
         List<String> nodeList = Arrays.asList(ChangeFlowEnum.CHANGE_FLOW_SUBMIT.getNodeId(),
             ChangeFlowEnum.CHANGE_FLOW_CONFIRM.getNodeId());
         this.checkNode(changeRecord.getFlowNode(), nodeList);
-        // todo:检验操作权限
         String uid = RequestLocalBean.getUid();
         String changeCommander = changeRecord.getChangeCommander();
-        /*if (!uid.equals(changeCommander)) {
+        if (!uid.equals(changeCommander)) {
             throw ExceptionFactory.createBiz(ResponseCode.NO_AUTH, ResponseCode.NO_AUTH.getMsg());
-        }*/
+        }
         // 工单审核人转交
         String deliverUser = req.getDeliverUser();
         UserBaseDTO userBaseDTO = new UserBaseDTO();

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

@@ -4,12 +4,12 @@ import com.alibaba.fastjson.JSONObject;
 import com.netease.mail.yanxuan.change.biz.meta.exception.ExceptionFactory;
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeConfigService;
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeExecConfigService;
-import com.netease.mail.yanxuan.change.common.bean.AdminUserHolder;
 import com.netease.mail.yanxuan.change.common.bean.AjaxResult;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.netease.mail.yanxuan.change.biz.service.change.AdminChangeConfigService;
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeTypeService;
+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.bean.ResponseCodeEnum;
 import com.netease.mail.yanxuan.change.common.enums.ChangeSubjectEnum;
@@ -212,7 +212,7 @@ public class AdminChangeConfigServiceImpl implements AdminChangeConfigService {
             throw ExceptionFactory.createBiz(ResponseCode.PARAMETER_DEFICIENCY);
             //如果是执行人就从head里面把邮箱装载
         }else if (changeConfigReq.getChangeCommanderType() == 1){
-            changeConfigReq.setChangeCommander(AdminUserHolder.getUserName());
+            changeConfigReq.setChangeCommander(RequestLocalBean.getUid());
         }
         changeConfig.setChangeCommanderType(changeConfigReq.getChangeCommanderType());
         if (changeConfigReq.getChangeCommander() == null){

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

 package com.netease.mail.yanxuan.change.biz.service.impl.change;
 
 import com.netease.mail.yanxuan.change.biz.service.change.ChangeExecConfigService;
-import com.netease.mail.yanxuan.change.common.bean.AdminUserHolder;
+import com.netease.mail.yanxuan.change.common.bean.RequestLocalBean;
 import com.netease.mail.yanxuan.change.dal.entity.ChangeExecConfig;
 import com.netease.mail.yanxuan.change.dal.mapper.ChangeExecConfigMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -30,7 +30,7 @@ public class ChangeExecConfigServiceImpl implements ChangeExecConfigService {
         for (ChangeExecConfig changeExecConfig : changeExecConfigs){
             //如果变更行动方案是变更发起人的话就填充登入人信息
             if(changeExecConfig.getChangeExecUserType() == 1){
-                changeExecConfig.setChangeExecUser(AdminUserHolder.getUserName());
+                changeExecConfig.setChangeExecUser(RequestLocalBean.getUid());
             }
             //在修改的时候实际上删除在新增需要屏蔽掉ID
             if (changeExecConfig.getId() != null){

yanxuan-qc-change-system-dal/src/main/java/com/netease/mail/yanxuan/change/dal/mapper/ChangeRecordMapper.java

@@ -22,7 +22,7 @@ import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeFlowListQueryReq
 @Mapper
 public interface ChangeRecordMapper extends tk.mybatis.mapper.common.Mapper<ChangeRecord> {
 
-    @Select("select * from TB_YX_QC_CHANGE_RECORD where `flow_id` = #{flowId}")
+    @Select("select * from TB_YX_QC_CHANGE_RECORD where `flow_id` = #{flowId} limit 1")
     ChangeRecord selectByFlowId(@Param("flowId") Long flowId);
 
     List<ChangeRecord> selectByCondition(ChangeFlowListQueryReq changeFlowListQueryReq);

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

 package com.netease.mail.yanxuan.change.web.config;
 
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -18,11 +22,16 @@ public class AdminUserLoginInterceptor implements HandlerInterceptor {
     @Override
     public boolean preHandle(HttpServletRequest request,
                              HttpServletResponse response, Object handler) throws Exception {
+        Map<String, String> headerMap = new HashMap<>();
+        Enumeration<String> enumeration = request.getHeaderNames();
+        while (enumeration.hasMoreElements()) {
+            String name	= enumeration.nextElement();
+            String value = request.getHeader(name);
+            headerMap.put(name, value);
+        }
+        log.info("adminUserLoginInterceptor headerMap ={}", headerMap);
         String uid = request.getHeader("uid");
         log.info("adminUserLoginInterceptor uid ={}", uid);
-        if(uid == null){
-            uid = "grp.gyhtest1001@corp.netease.com";
-        }
         AdminUserHolder.setUserName(uid);
         return true;
     }

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

@@ -15,7 +15,6 @@ import org.springframework.web.servlet.HandlerInterceptor;
 import org.springframework.web.servlet.ModelAndView;
 
 import com.alibaba.fastjson.JSON;
-import com.netease.mail.yanxuan.change.common.bean.AdminUserHolder;
 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.ResponseCodeEnum;

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

@@ -13,17 +13,21 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 public class WebMvcConfig implements WebMvcConfigurer {
 
     @Autowired
-    private AdminUserLoginInterceptor userLoginInterceptor;
+    private UserInterceptor userInterceptor;
 
-    /**
+    @Autowired
+    private AdminUserLoginInterceptor adminUserLoginInterceptor;
+
+    /**`
      * 拦截器配置
      *
      * @param registry
      */
     @Override
     public void addInterceptors(InterceptorRegistry registry) {
-        registry.addInterceptor(userLoginInterceptor).addPathPatterns("/**").excludePathPatterns("/i/health")
-            .excludePathPatterns("/change/flow/getOperator", "/test/**");
+        registry.addInterceptor(userInterceptor).addPathPatterns("/**").excludePathPatterns("/i/health")
+            .excludePathPatterns("/change/flow/getOperator", "/test/createToDo","/test/progressTodo","/test/submit");
+        registry.addInterceptor(adminUserLoginInterceptor).addPathPatterns("test/**");
     }
 
 }

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

@@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.github.pagehelper.PageInfo;
 import com.netease.mail.yanxuan.change.biz.biz.ChangeFlowBiz;
 import com.netease.mail.yanxuan.change.biz.config.TitleConfig;
 import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
@@ -62,8 +61,8 @@ public class ChangeFlowController {
      * @return
      */
     @GetMapping("/detail")
-    public AjaxResult<ChangeFlowVO> detail(@RequestParam Long id) {
-        return AjaxResult.success(changeFlowBiz.detail(id));
+    public AjaxResult<ChangeFlowVO> detail(@RequestParam Long flowId) {
+        return AjaxResult.success(changeFlowBiz.detail(flowId));
     }
 
     /**

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

@@ -6,16 +6,11 @@
  */
 package com.netease.mail.yanxuan.change.web.controller;
 
-import java.util.List;
-
-import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.Assert;
 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.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 import com.alibaba.fastjson.JSON;
@@ -24,19 +19,10 @@ import com.netease.mail.yanxuan.change.biz.service.ChangeFlowService;
 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.dal.entity.ChangeRecord;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierSendService;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplierService;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierGoodsInfoReq;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierRelatedUserReq;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.req.SupplierSearchRemoteReq;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierGoodsInfoRsp;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierInfoRsp;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierSimpleRsp;
-import com.netease.mail.yanxuan.change.integration.flow.supplier.rsp.SupplierUserRsp;
-import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -84,13 +70,9 @@ public class TestController {
         return AjaxResult.success();
     }
 
-    @Autowired
-    private FlowRpcSupplierInfoService supplierInfoService;
-
-    @PostMapping("/test")
-    public AjaxResponse<List<SupplierUserRsp>> test(@RequestBody SupplierRelatedUserReq req) {
-        return supplierInfoService.querySupplierRelatedUser(req);
+    @GetMapping("/getUid")
+    public AjaxResult<String> getUid() {
+        return AjaxResult.success(RequestLocalBean.getUid());
     }
 
-
 }
\ No newline at end of file