diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java index 39cdb58f..56ef60b5 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java @@ -32,7 +32,7 @@ public class ThirdApi { private String searchUserListUrl; - public List getAllUserList(UserListParam userListParam, String token) { + public List getAllUserList(UserListParam userListParam, String token) { log.info("获取用户"); String resp = Optional.ofNullable(HttpRequest.post(searchUserListUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("获取用户返回值1 {}",resp); @@ -42,7 +42,7 @@ public class ThirdApi { .orElse(ListUtil.toList()); } - private void getAllUserList(UserListParam userListParam, String token, List userInfoLists) { + private void getAllUserList(UserListParam userListParam, String token, List userInfoLists) { log.info("获取用户2"); String resp = Optional.ofNullable(HttpRequest.post(searchUserListUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("获取用户返回值2 {}",resp); @@ -50,7 +50,7 @@ public class ThirdApi { } - private void nextPage(UserListParam userListParam, String token, List userInfoLists, UserInfoListRootBean.ResultData t) { + private void nextPage(UserListParam userListParam, String token, List userInfoLists, UserInfoListRootBean.ResultData t) { log.info("获取用户--" + userListParam.getPageNo()); if (t.getTotalPage() > userListParam.getPageNo()) { REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPageNo(), t.getTotalPage()).parallel().forEach(i -> getAllUserList(userListParam.withPageNo(i + 1), token, userInfoLists))).join(); diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListRootBean.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListRootBean.java index 2c4be964..120438ad 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListRootBean.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListRootBean.java @@ -31,7 +31,7 @@ public class UserInfoListRootBean { private int totalElement; private int totalPage; - private List userInfoList; + private List userInfoList; } } \ No newline at end of file diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListVo.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListVo.java new file mode 100644 index 00000000..33e2a6b9 --- /dev/null +++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListVo.java @@ -0,0 +1,41 @@ +package com.xboe.api.vo; + + +import lombok.Data; + +@Data +public class UserInfoListVo { + + private long id; + private String bandCode; + private String bandDesc; + private Boolean deleted; + private String departId; + private String description; + private String domainId; + private String departName; + private String duty; + private int employeeStatus; + private String companyId; + private String orgName; + private Integer gender; + private String jobName; + private String kid; + private int learningDuration; + private String mobile; + private String realName; + private String oldDepartId; + private String orgNamePath; + private String orgTreeType; + private String payrollPlaceId; + private String payrollPlaceName; + private long personId; + private String positionMgrLevel; + private String rank; + private long sassId; + private int status; + private String telephoneNo; + private String userNo; + private String email; + private String avatar; +} \ No newline at end of file diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java index 913d06d1..28c429f8 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesRecommendPushRecordServiceImpl.java @@ -85,10 +85,10 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR long tt = System.currentTimeMillis(); for (String orgId : casesRecommendLaunch.getDeptIds()) { UserListParam build = UserListParam.builder().departId(orgId).pageSize(100).build(); - List allUserList = thirdApi.getAllUserList(build, token); + List allUserList = thirdApi.getAllUserList(build, token); log.info("---------组织查询 {}", allUserList); if (CollectionUtil.isNotEmpty(allUserList)) { - for (UserInfoList userInfo : allUserList) { + for (UserInfoListVo userInfo : allUserList) { log.info("---------userInfo.getId() {}", userInfo.getId()); userIds.add(String.valueOf(userInfo.getId())); }