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

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

@@ -9,6 +9,9 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.HashMap;
+import java.util.List;
+
 /**
  * @author WangJiaXiang
  * @date 2022/11/24/024$
@@ -21,9 +24,9 @@ public interface FlowIusRpcService {
     AjaxResponse<IusUserInfoRsp> queryUserInfo(@RequestParam(name = "uid")String uid);
 
     @GetMapping("/v1/qc/allTeam/pos/queryLeaderChain")
-    AjaxResponse<IusDepartmentRsp> queryLeaderChain(@RequestParam(name = "uid")String uid);
+    AjaxResponse<Object> queryLeaderChain(@RequestParam(name = "uid")String uid);
 
     @PostMapping("/v1/qc/user/queryLeaderChain")
-    AjaxResponse<IusDepartmentRsp> queryDepartment(@RequestBody IusDepartmentReq uid);
+    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

@@ -10,15 +10,15 @@ import lombok.Data;
 public class OrgPos {
     private String deptId;
 
-    private int level;
+    private Integer level;
 
-    private int orgPosId;
+    private Integer orgPosId;
 
     private String orgPosName;
 
-    private int parentOrgPosId;
+    private Integer parentOrgPosId;
 
-    private int posStructType;
+    private Integer posStructType;
 
-    private int rootOrgPosId;
+    private Integer rootOrgPosId;
 }

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

@@ -8,15 +8,15 @@ import lombok.Data;
  */
 @Data
 public class leaderChain {
-    private int createTime;
+    private Long createTime;
 
     private String extEmail;
 
-    private int firstLoginTime;
+    private Long firstLoginTime;
 
-    private int identity;
+    private Integer identity;
 
-    private int lastLoginTime;
+    private Long lastLoginTime;
 
     private boolean locked;
 
@@ -24,17 +24,17 @@ public class leaderChain {
 
     private OrgPos orgPos;
 
-    private int orgPosId;
+    private Integer orgPosId;
 
-    private int orgPosLevel;
+    private Integer orgPosLevel;
 
     private String srcCode;
 
-    private int staffStatus;
+    private Integer staffStatus;
 
     private String uid;
 
-    private int userId;
+    private Integer 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.alibaba.fastjson.JSONObject;
 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;
@@ -8,15 +9,16 @@ 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.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.mail.yanxuan.change.integration.flow.ius.*;
 import com.netease.yanxuan.flowx.sdk.meta.controller.communal.AjaxResponse;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
 
 
 /**
@@ -119,16 +121,27 @@ public class ChangeConfigController {
         return iusRpcService.queryUserInfo("grp.gyhtest1001@corp.netease.com");
     }
 
+    private static Logger logger = LoggerFactory.getLogger(ChangeConfigController.class);
+
     @GetMapping("/test1")
-    public AjaxResponse<IusDepartmentRsp> queryGoods1(){
+    public AjaxResponse<HashMap<String, List<SecondaryDepartments>>> 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");
+    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");
+        return objectAjaxResponse;
     }