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

yanxuan-qc-change-system-assembly/src/main/java/com/netease/mail/yanxuan/change/assembly/Application.java

@@ -11,8 +11,7 @@ import tk.mybatis.spring.annotation.MapperScan;
 /**
  * 项目启动类
  */
-@ComponentScan(basePackages = "com.netease.mail.yanxuan.change")
-// @ComponentScan(basePackages = "com.netease.mail.yanxuan.qc")
+@ComponentScan(basePackages = {"com.netease.mail.yanxuan.change","com.netease.mail.yanxuan.qc"})
 @MapperScan("com.netease.mail.yanxuan.change.dal.mapper")
 @EnableApolloConfig
 @EnableMissaClients(basePackages = "com.netease.mail.yanxuan.change")

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.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;
@@ -24,7 +23,7 @@ public interface FlowIusRpcService {
     AjaxResponse<IusUserInfoRsp> queryUserInfo(@RequestParam(name = "uid")String uid);
 
     @GetMapping("/v1/qc/allTeam/pos/queryLeaderChain")
-    AjaxResponse<Object> queryLeaderChain(@RequestParam(name = "uid")String uid);
+    AjaxResponse<List<OrgPosLeaderChainRsp>> queryLeaderChain(@RequestParam(name = "uid")String uid);
 
     @PostMapping("/v1/qc/user/queryLeaderChain")
     AjaxResponse<HashMap<String, List<SecondaryDepartments>>> queryDepartment(@RequestBody IusDepartmentReq uid);

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

@@ -8,16 +8,23 @@ import lombok.Data;
  */
 @Data
 public class OrgPos {
+
+    //对应OA部门编码
     private String deptId;
 
+    //部门的级别
     private Integer level;
 
+    //部门id
     private Integer orgPosId;
 
+    //部门名称
     private String orgPosName;
 
+    //上一级部门id
     private Integer parentOrgPosId;
 
+    //部门结构类型，0-职能部门，1-项目部门
     private Integer posStructType;
 
     private Integer rootOrgPosId;

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

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import lombok.Data;
+import java.util.List;
+
+@Data
+public class OrgPosLeaderChainRsp {
+
+    //用户所属部门id
+    private Integer orgPosId;
+
+    private List<UserOrgPosMetaRsp> leaderChainList;
+
+    //所属部门的级别
+    private Integer orgPosLevel;
+
+    //用户所属部门名称
+    private String orgPosName;
+
+    //所属一级部门id
+    private Integer rootOrgPosId;
+
+    //用户邮箱
+    private String uid;
+}

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

@@ -11,20 +11,27 @@ import java.util.List;
 @Data
 public class SecondaryDepartments {
 
-    private int identity;
+    //用户身份用户身份
+    private Integer identity;
 
     private List<leaderChain> leaderChainList;
 
-    private int orgPosId;
+    //用户所属部门id
+    private Integer orgPosId;
 
-    private int orgPosLevel;
+    //所属部门的级别
+    private Integer orgPosLevel;
 
+    //用户所属部门名称
     private String orgPosName;
 
+    //用户邮箱
     private String uid;
 
-    private int userId;
+    //用户ID
+    private Integer userId;
 
+    //用户姓名
     private String userName;
 
 

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

+package com.netease.mail.yanxuan.change.integration.flow.ius;
+
+import lombok.Data;
+
+@Data
+public class UserOrgPosMetaRsp {
+
+    //员工职责
+    private String duty;
+
+    //业务方附加信息
+    private String extInfo;
+
+    //部门的级别
+    private String level;
+
+    //锁定状态
+    private boolean locked;
+
+    //部门id
+    private Integer orgPosId;
+
+    //部门名称
+    private String orgPosName;
+
+    //上一级部门id
+    private Integer parentOrgPosId;
+
+    //上一级部门名称
+    private Integer posType;
+
+    //所属一级部门id
+    private Integer rootOrgPosId;
+
+    //关联类型0-普通职员, 1-外包, 2-实习
+    private Integer type;
+
+    //用户邮箱
+    private String uid;
+
+    //用户唯一id
+    private Integer userId;
+
+    //用户的真名
+    private String userName;
+}

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

@@ -8,33 +8,48 @@ import lombok.Data;
  */
 @Data
 public class leaderChain {
+
+    //创建时间
     private Long createTime;
 
+    //额外的邮件接收地址
     private String extEmail;
 
+    //首次登录时间、注册时间
     private Long firstLoginTime;
 
+    //用户身份
     private Integer identity;
 
+    //上次登录时间
     private Long lastLoginTime;
 
+    //是否被锁定
     private boolean locked;
 
+    //用户名称
     private String name;
 
     private OrgPos orgPos;
 
+    //所属部门
     private Integer orgPosId;
 
+    //所属部门级别
     private Integer orgPosLevel;
 
+    //用户来源编码
     private String srcCode;
 
+    //用户的身份信息，0 正式，1 试用，2 外包，3 派遣，4 实习-签三方，5 实习-未签三方，6 离职
     private Integer staffStatus;
 
+    //邮箱地址
     private String uid;
 
+    //用户唯一id
     private Integer userId;
 
+    //是否为虚拟用户 - 产品下没有该用户但是产品关联的组织身份包含该用户
     private boolean virtual;
 }

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

@@ -131,16 +131,8 @@ public class ChangeConfigController {
     }
 
     @GetMapping("/test2")
-    public AjaxResponse<Object> queryGoods2(){
-        AjaxResponse<Object> objectAjaxResponse = iusRpcService.queryLeaderChain("grp.gyhtest1001@corp.netease.com");
-        logger.error(objectAjaxResponse.getData().toString()+"\n\n\n\n\n\n\n\n\n\n\n\n");
-        HashMap<String,List<SecondaryDepartments>> jsonObject = JSONObject.parseObject(objectAjaxResponse.getData().toString(), HashMap.class);
-        logger.error(jsonObject.toString()+"\n\n\n\n\n\n\n\n\n\n\n\n");
-        List<SecondaryDepartments> secondaryDepartments  = new ArrayList<SecondaryDepartments>();
-        for (String s1 :jsonObject.keySet()){
-            secondaryDepartments = jsonObject.get(s1);
-        }
-        logger.error(secondaryDepartments.toString()+"\n\n\n\n\n\n\n\n\n\n\n\n");
+    public  AjaxResponse<List<OrgPosLeaderChainRsp>>  queryGoods2(){
+        AjaxResponse<List<OrgPosLeaderChainRsp>>  objectAjaxResponse = iusRpcService.queryLeaderChain("grp.gyhtest1001@corp.netease.com");
         return objectAjaxResponse;
     }