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 7a55cd36..f0760b28 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 @@ -73,8 +73,8 @@ public class ThirdApi { private String getUserBasicInfo; //获取例外人员的id - public List getUserId(){ - String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl+"?pid=316&type=1").execute() //prod 316 + public List getUserId() { + String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl + "?pid=316&type=1").execute() //prod 316 .body()).orElseThrow(() -> new RuntimeException("token校验失败")); log.info("正在获取例外人员工号 responseBody = " + responseBody); try { @@ -88,21 +88,23 @@ public class ThirdApi { throw new RuntimeException("DictResult中的data字段为空。"); } return dictDtos.stream().map(DictDto::getValue).collect(Collectors.toList()); - }catch (Exception e){ + } catch (Exception e) { throw new RuntimeException("解析过程发生异常:" + e.getMessage(), e); } } + //获取面授课id - public ListgetOffCourseId(String userId,String token){ + public List getOffCourseId(String userId, String token) { log.info("正在获取面授课id"); - String s = Optional.ofNullable(HttpRequest.get(manageApiStu+"?userId="+userId).header("token", token).execute() + String s = Optional.ofNullable(HttpRequest.get(manageApiStu + "?userId=" + userId).header("token", token).execute() .body()).orElseThrow(() -> new RuntimeException("token校验失败")); return Opt.ofBlankAble(s).map(t -> JSONUtil.toBean(t, StringResult.class)).map(StringResult::getData).orElseThrow(); } + //获取离职教师信息 - public ListgetTeacherInfo(List teacherIds, String token){ - TeacherInfoVo teacherInfoVo=new TeacherInfoVo(); + public List getTeacherInfo(List teacherIds, String token) { + TeacherInfoVo teacherInfoVo = new TeacherInfoVo(); teacherInfoVo.setTeacherIds(teacherIds); log.info("获取离职教师信息"); log.info(JSONUtil.toJsonStr(teacherInfoVo)); @@ -113,11 +115,12 @@ public class ThirdApi { log.info("getTeacherIdsResult = " + getTeacherIdsResult.getResult()); return getTeacherIdsResult.getResult(); } - public ListgetTeacherInfoByCode(List teacherCode,String token){ - TeacherInfoVo teacherInfoVo=new TeacherInfoVo(); + + public List getTeacherInfoByCode(List teacherCode, String token) { + TeacherInfoVo teacherInfoVo = new TeacherInfoVo(); teacherInfoVo.setTeacherCode(teacherCode); log.info("获取离职教师信息"); - log.info("参数为"+JSONUtil.toJsonStr(teacherCode)); + log.info("参数为" + JSONUtil.toJsonStr(teacherCode)); String resp = Optional.ofNullable( HttpRequest.post(getTeacherIds).body(JSONUtil.toJsonStr(teacherInfoVo)).header("token", token).execute() .body()).orElseThrow(() -> new RuntimeException("token校验失败")); @@ -125,6 +128,7 @@ public class ThirdApi { log.info("getTeacherIdsResult = " + getTeacherIdsResult); return getTeacherIdsResult.getResult(); } + public List getAllUserList(UserListParam userListParam, String token) { log.info("获取用户:url:{}", searchOrgUsersUrl); log.info("获取用户:params:{}", JSONUtil.toJsonStr(userListParam)); @@ -135,7 +139,7 @@ public class ThirdApi { log.info("list = " + list); - log.info("获取用户返回值1 {}",resp); + log.info("获取用户返回值1 {}", resp); return Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(resp, UserInfoListRootBean.class).success()) .map(UserInfoListRootBean::getResult) .map(result -> Opt.ofEmptyAble(result.getList()).peek(t -> nextPage(userListParam, token, t, result)).orElse(ListUtil.toList())) @@ -145,7 +149,7 @@ public class ThirdApi { private void getAllUserList(UserListParam userListParam, String token, List userInfoLists) { log.info("获取用户2"); String resp = Optional.ofNullable(HttpRequest.post(searchOrgUsersUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); - log.info("获取用户返回值2 {}",resp); + 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); } @@ -185,26 +189,27 @@ public class ThirdApi { public List getAllUserdynamicList(UserdynamicParam userdynamicParam, String token) { String resp = Optional.ofNullable(HttpRequest.post(userdynamicListUrl).body(JSONUtil.toJsonStr(userdynamicParam)).header("XBOE-Access-Token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); - log.error("=1----getAllUserdynamicList----- 开始课程信息 ---------------------------------resp = " + resp ); + log.error("=1----getAllUserdynamicList----- 开始课程信息 ---------------------------------resp = " + resp); return Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(resp, DynamicBean.class).success()) .map(DynamicBean::getResult) .map(result -> Opt.ofEmptyAble(result.getList()).peek(t -> nextPage(userdynamicParam, t, result, token)).orElse(ListUtil.toList())) .orElse(ListUtil.toList()); } + private void nextPage(UserdynamicParam userdynamicParam, List t, UserDynamicResult result, String token) { - log.error("=2----getAllUserdynamicList----- 开始课程信息 ---------------------------------resp = " + userdynamicParam ); + log.error("=2----getAllUserdynamicList----- 开始课程信息 ---------------------------------resp = " + userdynamicParam); if (result.getTotalPages() > userdynamicParam.getPageIndex()) { REQUEST_TASK.submit(() -> IntStream.range(userdynamicParam.getPageIndex(), result.getTotalPages()).parallel().forEach(i -> getAllUserdynamicList(userdynamicParam.withPageIndex(i + 1), t, token))).join(); } } private void getAllUserdynamicList(UserdynamicParam userdynamicParam, List list, String token) { - log.error("=3----getAllUserdynamicList----- 开始课程信息 ---------------------------------resp = " + userdynamicParam ); + log.error("=3----getAllUserdynamicList----- 开始课程信息 ---------------------------------resp = " + userdynamicParam); String resp = Optional.ofNullable(HttpRequest.post(usersByAudienceList).body(JSONUtil.toJsonStr(userdynamicParam.builder().pageSize(1000).build())).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, DynamicBean.class).success()).map(DynamicBean::getResult).map(UserDynamicResult::getList).stream().flatMap(Collection::stream).forEach(list::add); } - public ListgetStudyCourseList(String studyId,String courseId, String token){ + public List getStudyCourseList(String studyId, String courseId, String token) { StudyCourseVo studyCourseVo = new StudyCourseVo(); studyCourseVo.setStudyId(studyId); studyCourseVo.setCourseId(courseId); @@ -228,16 +233,13 @@ public class ThirdApi { String token = "eyJ0eXBlIjoidG9rZW4iLCJhbGciOiJIUzI1NiJ9.eyJjb21wYW55Q29kZSI6IkMwMDEiLCJ1SWQiOiI5NjUzNDIwMjc0OTc2MDcxNjgiLCJjb21wYW55SWQiOiIxMDQxNjczOTc3Mzc5OTQ2NDk2IiwibG9naW5JZCI6IjE2ODg0NDg5MjIwNzY0OTE3NzgiLCJpc3MiOiJodHRwOi8vdS5ib2UuY29tIiwiR2l2ZW5OYW1lIjoiYm9ldSIsImV4cCI6MTY5MTM5OTc2NzU1OCwidXNlck5hbWUiOiLmnY7njonlhrAiLCJ1c2VySWQiOiI2QjA0OUZBRi1DMzE0LTdDQ0YtMEQyOC0wRDIzRjRDNDI1MzEifQ==.8b52dcf4d48a790ed258b9ca2b279bb269f5301722095382fbd352705b51c893"; String resp = Optional.ofNullable(HttpRequest.post("https://u-pre.boe.com/statApi/xboe/m/stat/userdynamic/list").body(JSONUtil.toJsonStr(UserdynamicParam.builder(). aid(Long.parseLong("965342027497607168")).pageSize(1000).pageIndex(1).build())).header("XBOE-Access-Token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); - System.out.println(" resp = " +resp); + System.out.println(" resp = " + resp); DynamicBean a = JSONUtil.toBean(resp, DynamicBean.class); - System.out.println(" a = " +a); + System.out.println(" a = " + a); System.out.println(" a = " + a.getResult().getCount()); List list = a.getResult().getList(); - System.out.println(" list = " +list.size()); - System.out.println(" list = " +list); - - - + System.out.println(" list = " + list.size()); + System.out.println(" list = " + list); } /** @@ -261,7 +263,6 @@ public class ThirdApi { StringBuilder builder = new StringBuilder(); try { builder.append("pageIndex=").append(URLEncoder.encode(param.getPageIndex().toString(), "UTF-8")); - builder.append("&pageSize=").append(URLEncoder.encode(param.getPageSize().toString(), "UTF-8")); builder.append("&contentType=").append(URLEncoder.encode(param.getContentType().toString(), "UTF-8")); builder.append("&aid=").append(URLEncoder.encode(param.getAid().toString(), "UTF-8")); @@ -290,7 +291,7 @@ public class ThirdApi { // 将userIds列表转换为逗号分隔的字符串 String userIdsStr = userIds.stream() .collect(Collectors.joining(",")); - String url = getUserBasicInfo +"?userIds=" + userIdsStr; + String url = getUserBasicInfo + "?userIds=" + userIdsStr; String respStr = Optional.ofNullable(HttpRequest .get(url)