diff --git a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/CostCenterTaskImpl.java b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/CostCenterTaskImpl.java index 43697af..9b81182 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/CostCenterTaskImpl.java +++ b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/CostCenterTaskImpl.java @@ -34,6 +34,8 @@ public class CostCenterTaskImpl extends AbstractTask { @Override public void execute(RequestContext requestContext, Map map) throws KDException { + + String oaUrl = System.getProperty("OaUrl");//:10.157.226.9:8088 //构造请求体 QueryDTO queryDTO = new QueryDTO(); queryDTO.setPagesize(PAGESIZE); @@ -56,7 +58,7 @@ public class CostCenterTaskImpl extends AbstractTask { //创建人员对应成本中心集合 HashMap orgMap = new HashMap<>(); - JSONObject data = this.getOAUserData(query); + JSONObject data = this.getOAUserData(query,oaUrl); this.importOrgMap(orgMap,data);//填充人员数据（人员编码，成本中心编码） BigDecimal totalSize = data.getBigDecimal("totalSize");//获取查询到人员总数； BigDecimal size = new BigDecimal(PAGESIZE);//设置页大小为20 @@ -68,7 +70,7 @@ public class CostCenterTaskImpl extends AbstractTask { //修改CURPAGE当前页数 CURPAGE = i + 1; queryDTO.setCurpage(CURPAGE); - JSONObject dataNext = this.getOAUserData(query);//获取查询的数据 + JSONObject dataNext = this.getOAUserData(query,oaUrl);//获取查询的数据 this.importOrgMap(orgMap,dataNext);//填充人员数据（人员编码，成本中心编码） } } @@ -106,10 +108,10 @@ public class CostCenterTaskImpl extends AbstractTask { } - private JSONObject getOAUserData(Query query) { + private JSONObject getOAUserData(Query query,String oaUrl) { String requestBody = JSON.toJSONString(query); //返回参数 - String json = HttpRequest.post("http://" + "10.157.226.9:8088" + "/api/hrm/resful/getHrmUserInfoWithPage").body(requestBody).execute().body(); + String json = HttpRequest.post("http://" + oaUrl + "/api/hrm/resful/getHrmUserInfoWithPage").body(requestBody).execute().body(); JSONObject resultJson = JSONObject.parseObject(json);;//查询oa接口返回人员数据 String code = resultJson.getString("code");//第一次执行查询，判断接口调用是否成功，否则不执行后续逻辑 if (!Objects.equals("1",code)){//当code不为1时，调用失败 diff --git a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/HrmDepartmentTaskImpl.java b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/HrmDepartmentTaskImpl.java index 4e26bc9..26b147f 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/HrmDepartmentTaskImpl.java +++ b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/HrmDepartmentTaskImpl.java @@ -49,9 +49,7 @@ public class HrmDepartmentTaskImpl extends AbstractTask implements Plugin { @Override public void execute(RequestContext requestContext, Map map) throws KDException { - - String oaUrl = "10.157.226.9:8088";//暂时指定接口地址 - // String oaUrl = System.getProperty("OaUrl");//:10.157.226.9:8088 + String oaUrl = System.getProperty("OaUrl");//:10.157.226.9:8088 //初始化入参 Object isFull = map.get("isfull");//判断是否全量。 //构造请求体 diff --git a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/UserTaskImpl.java b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/UserTaskImpl.java index 8ef4a3e..c707cad 100644 --- a/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/UserTaskImpl.java +++ b/shkd-cosmic-debug/src/main/java/shkd/cosmic/cxkg/task/UserTaskImpl.java @@ -49,7 +49,7 @@ public class UserTaskImpl extends AbstractTask { @Override public void execute(RequestContext requestContext, Map map) throws KDException { - + String oaUrl = System.getProperty("OaUrl");//:10.157.226.9:8088 //bos_base_user_syn_weaver2kd //构造请求体 QueryDTO queryDTO = new QueryDTO(); @@ -69,7 +69,7 @@ public class UserTaskImpl extends AbstractTask { queryDTO.setCreated(time.toString()); } - JSONObject data = this.getOAUserData(query); + JSONObject data = this.getOAUserData(query,oaUrl); if(data != null) { //查询当前星瀚人员id集合 DynamicObjectCollection queryUsers = QueryServiceHelper.query("bos_user", @@ -101,7 +101,7 @@ public class UserTaskImpl extends AbstractTask { //修改CURPAGE当前页数 CURPAGE = i + 1; queryDTO.setCurpage(CURPAGE); - JSONObject dataNext = this.getOAUserData(query);//获取查询的数据 + JSONObject dataNext = this.getOAUserData(query,oaUrl);//获取查询的数据 this.buildUserParam(paramList,dataNext.getJSONArray("dataList"),userIds,orgIds); } } @@ -130,7 +130,7 @@ public class UserTaskImpl extends AbstractTask { for (int i = 1; i < pageNumber.intValue(); i++){//查询成功取第一轮数据同步 CURPAGE = i ; queryDTO.setCurpage(CURPAGE); - JSONObject dataNext = this.getOAUserData(query);//获取查询的数据 + JSONObject dataNext = this.getOAUserData(query,oaUrl);//获取查询的数据 this.buildUserParam(paramList,dataNext.getJSONArray("dataList"),userIds,orgIds); } UserServiceHelper.addOrUpdate(paramList);//新增或更新全量数据 @@ -147,10 +147,10 @@ public class UserTaskImpl extends AbstractTask { } - private JSONObject getOAUserData(Query query){ + private JSONObject getOAUserData(Query query,String oaUrl){ String requestBody = JSON.toJSONString(query); //返回参数 - String json = HttpRequest.post("http://" + "10.157.226.9:8088" + "/api/hrm/resful/getHrmUserInfoWithPage").body(requestBody).execute().body(); + String json = HttpRequest.post("http://" + oaUrl + "/api/hrm/resful/getHrmUserInfoWithPage").body(requestBody).execute().body(); JSONObject resultJson = JSONObject.parseObject(json);;//查询oa接口返回人员数据 String code = resultJson.getString("code");//第一次执行查询，判断接口调用是否成功，否则不执行后续逻辑 if (!Objects.equals("1",code)){//当code不为1时，调用失败