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 dafe7c8c..f7fd5168 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 @@ -34,10 +34,14 @@ public class ThirdApi { @Value("${statApi.userdynamicList}") private String userdynamicListUrl; + @Value("${audience.getOrgUsers}") + private String searchOrgUsersUrl; + public List getAllUserList(UserListParam userListParam, String token) { - log.info("获取用户:url:{}|params:{}|token:{}", searchUserListUrl, JSONUtil.toJsonStr(userListParam), token); - String resp = Optional.ofNullable(HttpRequest.post(searchUserListUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); + log.info("获取用户:url:{}", searchOrgUsersUrl); + log.info("获取用户:params:{}", JSONUtil.toJsonStr(userListParam)); + String resp = Optional.ofNullable(HttpRequest.post(searchOrgUsersUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); UserInfoListRootBean userInfoListRootBean1 = JSONUtil.toBean(resp, UserInfoListRootBean.class); log.info("userInfoListRootBean1 = " + userInfoListRootBean1); List list = userInfoListRootBean1.getResult().getList(); @@ -53,14 +57,14 @@ public class ThirdApi { 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校验失败")); + String resp = Optional.ofNullable(HttpRequest.post(searchOrgUsersUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("获取用户返回值2 {}",resp); Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, UserInfoListRootBean.class).success()).map(UserInfoListRootBean::getResult).map(UserInfoListRootBean.ResultData::getList).stream().flatMap(Collection::stream).forEach(userInfoLists::add); } private void nextPage(UserListParam userListParam, String token, List userInfoLists, UserInfoListRootBean.ResultData t) { - log.info("获取用户--" + userListParam.getPageNo()); + log.info("nextPage 获取用户--" + 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/UserInfoListVo.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserInfoListVo.java index 3f82037c..df2821bd 100644 --- 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 @@ -5,8 +5,10 @@ import lombok.Data; @Data public class UserInfoListVo { - - private long id; + private String userId; + private String workNum; + private String userName; + /*private long id; private String bandCode; private String bandDesc; private Boolean deleted; @@ -38,6 +40,6 @@ public class UserInfoListVo { private String userNo; private String email; private String avatar; - private String positionList; + private String positionList;*/ } \ 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 28c429f8..cd2ba3ba 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 @@ -82,15 +82,17 @@ public class CasesRecommendPushRecordServiceImpl implements ICasesRecommendPushR } // 组织 if (CollectionUtil.isNotEmpty(casesRecommendLaunch.getDeptIds())) { + log.info("--------开始查询组织下用户信息--------- 组织id: {}",casesRecommendLaunch.getDeptIds()); long tt = System.currentTimeMillis(); for (String orgId : casesRecommendLaunch.getDeptIds()) { UserListParam build = UserListParam.builder().departId(orgId).pageSize(100).build(); List allUserList = thirdApi.getAllUserList(build, token); + log.info("---------组织查询到数量 {}", allUserList.size()); log.info("---------组织查询 {}", allUserList); if (CollectionUtil.isNotEmpty(allUserList)) { for (UserInfoListVo userInfo : allUserList) { - log.info("---------userInfo.getId() {}", userInfo.getId()); - userIds.add(String.valueOf(userInfo.getId())); + log.info("---------userInfo.getId() {}", userInfo.getUserId()); + userIds.add(String.valueOf(userInfo.getUserId())); } } } diff --git a/servers/boe-server-all/src/main/resources/application-test.properties b/servers/boe-server-all/src/main/resources/application-test.properties index cc13d63b..74d42897 100644 --- a/servers/boe-server-all/src/main/resources/application-test.properties +++ b/servers/boe-server-all/src/main/resources/application-test.properties @@ -78,4 +78,6 @@ xboe.elasticsearch.server.password=Boe@es123 xboe.email.url=https://u-pre.boe.com/api/b1/email/send xboe.email.from=boeu_learning@boe.com.cn xboe.email.user= -xboe.email.security= \ No newline at end of file +xboe.email.security= + +boe.domain=https://u-pre.boe.com \ No newline at end of file diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties index aad1ebfe..d591c3cb 100644 --- a/servers/boe-server-all/src/main/resources/application.properties +++ b/servers/boe-server-all/src/main/resources/application.properties @@ -1,4 +1,5 @@ -spring.profiles.active=@profileActive@ +spring.profiles.active= test +#@profileActive@ spring.application.name=boe-server-all server.port=9090 server.servlet.session.timeout=30m @@ -63,4 +64,6 @@ orgTree.orgChildTreeList=${boe.domain}/userbasic/org/childOrgs userBasic.searchUserList=${boe.domain}/userbasic/user/list audience.usersByAudienceList=${boe.domain}/userbasic/audience/memberList #获取用户学习课程数据 -statApi.userdynamicList=${boe.domain}/statApi/xboe/m/stat/userdynamic/list \ No newline at end of file +statApi.userdynamicList=${boe.domain}/statApi/xboe/m/stat/userdynamic/list +#用户中心根据组织id查询用户信息接口（递归子组织） +audience.getOrgUsers=${boe.domain}/userbasic/user/getOrgUsers \ No newline at end of file