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/service/impl/InteriorChangeConfigServiceImpl.java

@@ -19,6 +19,7 @@ import com.netease.mail.yanxuan.change.integration.flow.supplier.FlowRpcSupplier
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
 
 import java.util.*;
 
@@ -26,6 +27,7 @@ import java.util.*;
  * @author WangJiaXiang
  * @date 2022/11/18/018$
  */
+@Service
 public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigService {
 
     private static Logger logger = LoggerFactory.getLogger(InteriorChangeConfigServiceImpl.class);
@@ -49,6 +51,9 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
     public GoodsResponseRpc queryCommanderInfo(ChangeCommanderPO changeCommander) {
         //获取模板名称   通过一级变更类型 二级变更类型ID 定位模板
         ChangeConfig changeConfig = changeConfigService.queryChangeType(changeCommander.getParentChangeClassId(), changeCommander.getSonChangeClassId());
+        if (changeConfig == null){
+            return null;
+        }
         //查询出当前模板配置中选择的 角色
         ChangeCommanderEnum changeCommanderEnum = ChangeCommanderEnum.getChangeCommanderEnum(changeConfig.getChangeCommanderType());
         //直接排除 选项为固定人 或者发起人
@@ -119,6 +124,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
                     GoodsResponseRpc rpc = new GoodsResponseRpc();
                     rpc.setEmail(data.getUserName());
                     rpc.setName(data.getRealName());
+                    emails.add(rpc);
                 }
             }
         }
@@ -136,7 +142,7 @@ public class InteriorChangeConfigServiceImpl implements InteriorChangeConfigServ
             }
             map.put(email.getName(),email);
         }
-        if (name == null){
+        if (name.getName() == null){
             Iterator<GoodsResponseRpc> iterator = map.values().iterator();
             name = iterator.next();
         }

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

@@ -30,7 +30,9 @@ public interface ChangeConfigMapper extends tk.mybatis.mapper.common.Mapper<Chan
     void deleteById(@Param("id") Long id);
 
     @Select("select * from TB_YX_QC_CHANGE_CONFIG where parent_change_class_id = #{parentChangeClassId} and son_change_class_id = #{sonChangeClassId}")
-    ChangeConfig queryChangeType(Long parentChangeClassId,Long sonChangeClassId);
+    ChangeConfig queryChangeType(
+            @Param("parentChangeClassId")Long parentChangeClassId,
+            @Param("sonChangeClassId")Long sonChangeClassId);
 
     List<ChangeConfigPo> selectChangeConfigPo(ChangeConfigQueryReq req);
 

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/FlowIusRpcService.java → yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/FlowIusRpcService.java

-package com.netease.mail.yanxuan.change.integration.flow;
+package com.netease.mail.yanxuan.change.integration.flow.ius;
 
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
+import com.netease.yanxuan.flowx.sdk.meta.dto.base.FlowDataDTO;
 import com.netease.yanxuan.missa.client.annotation.MissaClient;
 import org.springframework.stereotype.Service;
 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.RequestParam;
 
 /**
@@ -14,9 +18,12 @@ import org.springframework.web.bind.annotation.RequestParam;
 public interface FlowIusRpcService {
 
     @GetMapping("/v1/qc/user/get")
-    String queryEmailInfo(@RequestParam(name = "uid")String uid);
+    AjaxResponse<IusUserInfoRsp> queryUserInfo(@RequestParam(name = "uid")String uid);
 
-    @GetMapping("/v1/qc/user/queryLeaderChain")
-    String queryDepartment(@RequestParam(name = "uid")String uid);
+    @GetMapping("/v1/qc/allTeam/pos/queryLeaderChain")
+    AjaxResponse<IusDepartmentRsp> queryLeaderChain(@RequestParam(name = "uid")String uid);
+
+    @PostMapping("/v1/qc/user/queryLeaderChain")
+    AjaxResponse<IusDepartmentRsp> queryDepartment(@RequestBody IusDepartmentReq uid);
 
 }

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/IusDepartmentReq.java

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import java.util.List;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/25/025$
+ */
+public class IusDepartmentReq {
+
+    private boolean hasOrgPos;
+
+    private boolean icac;
+
+    private List<String> uids;
+
+
+    public IusDepartmentReq() {
+        this.hasOrgPos = true;
+        this.icac = true;
+    }
+
+    public IusDepartmentReq(List<String> uids) {
+        this.hasOrgPos = true;
+        this.icac = true;
+        this.uids = uids;
+    }
+
+    public boolean isHasOrgPos() {
+        return hasOrgPos;
+    }
+
+    public void setHasOrgPos(boolean hasOrgPos) {
+        this.hasOrgPos = hasOrgPos;
+    }
+
+    public boolean isIcac() {
+        return icac;
+    }
+
+    public void setIcac(boolean icac) {
+        this.icac = icac;
+    }
+
+    public List<String> getUids() {
+        return uids;
+    }
+
+    public void setUids(List<String> uids) {
+        this.uids = uids;
+    }
+
+    @Override
+    public String toString() {
+        return "IusDepartmentReq{" +
+                "hasOrgPos=" + hasOrgPos +
+                ", icac=" + icac +
+                ", uids=" + uids +
+                '}';
+    }
+}

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/IusDepartmentRsp.java

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/25/025$
+ */
+@Data
+public class IusDepartmentRsp {
+
+    List<SecondaryDepartments> secondaryDepartments;
+
+}

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/IusUserInfoRsp.java

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import lombok.Data;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/25/025$
+ * 用来接受查询用户信息接口
+ */
+@Data
+public class IusUserInfoRsp {
+
+    private Long createTime;
+
+    private String extEmail;
+
+    private Long firstLoginTime;
+
+    private Long lastLoginTime;
+
+    private Boolean locked;
+
+    private String name;
+
+    private Integer orgPosId;
+
+    private Integer srcCode;
+
+    private Integer staffStatus;
+
+    private String uid;
+
+    private String userId;
+
+    private String virtual;
+}

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/OrgPos.java

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import lombok.Data;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/25/025$
+ */
+@Data
+public class OrgPos {
+    private String deptId;
+
+    private int level;
+
+    private int orgPosId;
+
+    private String orgPosName;
+
+    private int parentOrgPosId;
+
+    private int posStructType;
+
+    private int rootOrgPosId;
+}

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/SecondaryDepartments.java

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/25/025$
+ */
+@Data
+public class SecondaryDepartments {
+
+    private int identity;
+
+    private List<leaderChain> leaderChainList;
+
+    private int orgPosId;
+
+    private int orgPosLevel;
+
+    private String orgPosName;
+
+    private String uid;
+
+    private int userId;
+
+    private String userName;
+
+
+}

yanxuan-qc-change-system-integration/src/main/java/com/netease/mail/yanxuan/change/integration/flow/ius/leaderChain.java

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import lombok.Data;
+
+/**
+ * @author WangJiaXiang
+ * @date 2022/11/25/025$
+ */
+@Data
+public class leaderChain {
+    private int createTime;
+
+    private String extEmail;
+
+    private int firstLoginTime;
+
+    private int identity;
+
+    private int lastLoginTime;
+
+    private boolean locked;
+
+    private String name;
+
+    private OrgPos orgPos;
+
+    private int orgPosId;
+
+    private int orgPosLevel;
+
+    private String srcCode;
+
+    private int staffStatus;
+
+    private String uid;
+
+    private int userId;
+
+    private boolean virtual;
+}

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

 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.AjaxResult;
 import com.netease.mail.yanxuan.change.biz.service.change.AdminChangeConfigService;
+import com.netease.mail.yanxuan.change.dal.meta.model.po.ChangeCommanderPO;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigQueryReq;
 import com.netease.mail.yanxuan.change.dal.meta.model.req.ChangeConfigReq;
-import com.netease.mail.yanxuan.change.integration.flow.FlowIusRpcService;
+import com.netease.mail.yanxuan.change.dal.meta.model.rpc.GoodsResponseRpc;
+import com.netease.mail.yanxuan.change.integration.flow.ius.FlowIusRpcService;
+import com.netease.mail.yanxuan.change.integration.flow.ius.IusDepartmentReq;
+import com.netease.mail.yanxuan.change.integration.flow.ius.IusDepartmentRsp;
+import com.netease.mail.yanxuan.change.integration.flow.ius.IusUserInfoRsp;
+import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 
 
 /**
@@ -107,13 +115,29 @@ public class ChangeConfigController {
     private FlowIusRpcService iusRpcService;
 
     @GetMapping("/test")
-    public String queryGoods(){
-        return iusRpcService.queryEmailInfo("grp.gyhtest1001@corp.netease.com");
+    public AjaxResponse<IusUserInfoRsp> queryGoods(){
+        return iusRpcService.queryUserInfo("grp.gyhtest1001@corp.netease.com");
     }
 
     @GetMapping("/test1")
-    public String queryGoods1(){
-        return iusRpcService.queryDepartment("grp.gyhtest1001@corp.netease.com");
+    public AjaxResponse<IusDepartmentRsp> queryGoods1(){
+        ArrayList<String> strings = new ArrayList<>();
+        strings.add("grp.gyhtest1001@corp.netease.com");
+        return iusRpcService.queryDepartment(new IusDepartmentReq(strings));
+    }
+
+    @GetMapping("/test2")
+    public AjaxResponse<IusDepartmentRsp> queryGoods2(){
+        return iusRpcService.queryLeaderChain("grp.gyhtest1001@corp.netease.com");
+    }
+
+
+    @Autowired
+    private InteriorChangeConfigService changeConfigService;
+
+    @PostMapping("/test3")
+    public GoodsResponseRpc queryCommanderInfo(@RequestBody ChangeCommanderPO changeCommander){
+        return changeConfigService.queryCommanderInfo(changeCommander);
     }
 
 }