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 bd38c235..dd8e728f 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 @@ -85,8 +85,6 @@ public class ThirdApi { //获取例外人员的id public List getUserId() { -// String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl + "?pid=316&type=1").execute() //prod 316 -// .body()).orElseThrow(() -> new RuntimeException("token校验失败")); CommonSearchVo searcher = new CommonSearchVo(); searcher.setPid(316L); searcher.setType(1); @@ -114,48 +112,32 @@ public class ThirdApi { public List getOffCourseId(String userId, String token) { log.info("正在获取面授课id"); return offCourseRemoteClient.getOffCourseId(userId); -// String s = Optional.ofNullable(HttpRequest.get("?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 List getTeacherInfo(List teacherIds, String token) { -// TeacherInfoVo teacherInfoVo = new TeacherInfoVo(); -// teacherInfoVo.setTeacherIds(teacherIds); log.info("获取离职教师信息"); -// log.info(JSONUtil.toJsonStr(teacherInfoVo)); com.boe.feign.api.usercenter.entity.TeacherInfoVo teacherInfoFeignVo = new com.boe.feign.api.usercenter.entity.TeacherInfoVo(); teacherInfoFeignVo.setTeacherIds(teacherIds); Response> response = userRemoteClient.getTeacherInfo(teacherInfoFeignVo); String resp = JSON.toJSONString(response); -// String resp = Optional.ofNullable( -// HttpRequest.post(getTeacherIds).body(JSONUtil.toJsonStr(teacherInfoVo)).header("token", token).execute() -// .body()).orElseThrow(() -> new RuntimeException("token校验失败")); GetTeacherIdsResult getTeacherIdsResult = JSONUtil.toBean(resp, GetTeacherIdsResult.class); log.info("getTeacherIdsResult = " + getTeacherIdsResult.getResult()); return getTeacherIdsResult.getResult(); } public List getTeacherInfoByCode(List teacherCode, String token) { -// TeacherInfoVo teacherInfoVo = new TeacherInfoVo(); -// teacherInfoVo.setTeacherCode(teacherCode); log.info("获取离职教师信息"); -// log.info("参数为" + JSONUtil.toJsonStr(teacherCode)); com.boe.feign.api.usercenter.entity.TeacherInfoVo teacherInfoFeignVo = new com.boe.feign.api.usercenter.entity.TeacherInfoVo(); teacherInfoFeignVo.setTeacherCode(teacherCode); Response> response = userRemoteClient.getTeacherInfo(teacherInfoFeignVo); String resp = JSON.toJSONString(response); -// String resp = Optional.ofNullable( -// HttpRequest.post(getTeacherIds).body(JSONUtil.toJsonStr(teacherInfoVo)).header("token", token).execute() -// .body()).orElseThrow(() -> new RuntimeException("token校验失败")); GetTeacherIdsResult getTeacherIdsResult = JSONUtil.toBean(resp, GetTeacherIdsResult.class); log.info("getTeacherIdsResult = " + getTeacherIdsResult); return getTeacherIdsResult.getResult(); } public List getAllUserList(UserListParam userListParam, String token) { -// log.info("获取用户:url:{}", searchOrgUsersUrl); log.info("获取用户:params:{}", JSONUtil.toJsonStr(userListParam)); UserQueryDto userQueryDto = new UserQueryDto(); userQueryDto.setOrganizationId(userListParam.getOrganizationId()); @@ -163,7 +145,6 @@ public class ThirdApi { userQueryDto.setPageSize(userListParam.getPageSize()); Response> response = userRemoteClient.getOrgUserForRpc(userQueryDto); String resp = JSON.toJSONString(response); -// 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(); @@ -185,7 +166,6 @@ public class ThirdApi { userQueryDto.setPageSize(userListParam.getPageSize()); Response> response = userRemoteClient.getOrgUserForRpc(userQueryDto); String resp = JSON.toJSONString(response); -// 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); } @@ -212,7 +192,6 @@ public class ThirdApi { userMemberVo.setAudienceId(userListParam.getAudienceId()); PageList pageList = audienceRemoteClient.memberList(userMemberVo); String resp = JSON.toJSONString(pageList); -// String resp = Optional.ofNullable(HttpRequest.post(usersByAudienceList).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); return Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(resp, AuditRootBean.class).success()) .map(AuditRootBean::getResult) .map(result -> Opt.ofEmptyAble(result.getList()).peek(t -> nextPage(userListParam, t, result, token)).orElse(ListUtil.toList())) @@ -232,7 +211,6 @@ public class ThirdApi { userMemberVo.setAudienceId(userListParam.getAudienceId()); PageList pageList = audienceRemoteClient.memberList(userMemberVo); String resp = JSON.toJSONString(pageList); -// String resp = Optional.ofNullable(HttpRequest.post(usersByAudienceList).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, AuditRootBean.class).success()).map(AuditRootBean::getResult).map(Result::getList).stream().flatMap(Collection::stream).forEach(list::add); } @@ -246,7 +224,6 @@ public class ThirdApi { udd.setContentType(userdynamicParam.getContentType() == null ? null : userdynamicParam.getContentType().toString()); JsonResponse> jsonResponse = userDynamicApiRemoteClient.pageList(pagination, udd, null); String resp = JSON.toJSONString(jsonResponse); -// 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); return Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(resp, DynamicBean.class).success()) .map(DynamicBean::getResult) @@ -268,7 +245,6 @@ public class ThirdApi { userMemberVo.setPageNo(userdynamicParam.getPageIndex()); PageList pageList = audienceRemoteClient.memberList(userMemberVo); String resp = JSON.toJSONString(pageList); -// 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); } @@ -280,12 +256,6 @@ public class ThirdApi { BeanUtil.copyProperties(studyCourseVo, studyCourseVo); projectRemoteClient.updateStudyStatus(null, projectStudyDto); return new ArrayList<>(); -// String resp = Optional.ofNullable( -// HttpRequest.post(getStudyStatus).body(JSONUtil.toJsonStr(studyCourseVo)).header("token", token).execute() -// .body()).orElseThrow(() -> new RuntimeException("token校验失败")); -// StudyCourseResult studyCourseResult = JSONUtil.toBean(resp, StudyCourseResult.class); -// log.info("getTeacherIdsResult = " + studyCourseResult); -// return studyCourseResult.getResult(); } public void sqlUpdate(ExamTest examTest, String token) { @@ -298,8 +268,6 @@ public class ThirdApi { examTestDto.setShowAnswer(examTest.getShowAnswer() ? "true" : "false"); projectAdminRemoteClient.editExam(examTestDto); -// String resp = Optional.ofNullable(HttpRequest.post(editExam).body(JSONUtil.toJsonStr(examTest)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); -// Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, DynamicBean.class).success()); } public static void main(String[] args) { @@ -330,13 +298,6 @@ public class ThirdApi { udd.setEventKey("ReadCase"); JsonResponse> jsonResponse = userDynamicApiRemoteClient.pageList(pagination, udd, udd.getAid()); String resp = JSON.toJSONString(jsonResponse); -// String resp = Optional.ofNullable(HttpRequest -// .post(userdynamicListUrl) -// .header("Content-Type", "application/x-www-form-urlencoded") -// .body(s) -// .header("XBOE-Access-Token", token) -// .execute().body()).orElseThrow(() -> new RuntimeException("token校验失败")); - DynamicBean dynamicBean = JSONUtil.toBean(resp, DynamicBean.class); UserDynamicResult userdynamicResult = dynamicBean.getResult(); return userdynamicResult; @@ -371,14 +332,10 @@ public class ThirdApi { token = request.getHeader("x-access-token"); } - // 将userIds列表转换为逗号分隔的字符串 -// String userIdsStr = userIds.stream().collect(Collectors.joining(",")); -// String url = getUserBasicInfo + "?userIds=" + userIdsStr; UserBasicInfoDto userBasicInfoDto = new UserBasicInfoDto(); userBasicInfoDto.setUserIds(userIds); Response> response = userRemoteClient.getUserBasicInfo(userBasicInfoDto); String respStr = JSON.toJSONString(response); -// String respStr = Optional.ofNullable(HttpRequest .get(url) .header("token", token) .execute().body()).orElseThrow(() -> new RuntimeException("用户中心用户数据获取失败")); UserBasicInfoResult userBasicInfoResult = JSONUtil.parseObj(respStr).toBean(UserBasicInfoResult.class); List basicInfos = userBasicInfoResult.getResult();