接口替换

This commit is contained in:
hui
2024-12-09 19:57:39 +08:00
parent 8c494c3c04
commit 72452d3dff

View File

@@ -14,10 +14,16 @@ import com.boe.feign.api.courseweb.remote.ProjectRemoteClient;
import com.boe.feign.api.infrastructure.entity.CommonSearchVo;
import com.boe.feign.api.infrastructure.entity.Dict;
import com.boe.feign.api.infrastructure.remote.DictRemoteClient;
import com.boe.feign.api.stat.remote.UserDynamicApiRemoteClient;
import com.boe.feign.api.usercenter.entity.*;
import com.boe.feign.api.usercenter.remote.AudienceRemoteClient;
import com.boe.feign.api.usercenter.remote.UserRemoteClient;
import com.boe.feign.api.usercenter.reps.AudienceMemberVo;
import com.boe.feign.api.usercenter.reps.Response;
import com.xboe.api.vo.*;
import com.xboe.common.PageList;
import com.xboe.common.Pagination;
import com.xboe.core.JsonResponse;
import com.xboe.module.course.vo.StudyCourseVo;
import com.xboe.module.course.vo.TeacherVo;
import com.xboe.module.dict.entity.DictDto;
@@ -48,18 +54,10 @@ public class ThirdApi {
public static final ForkJoinPool REQUEST_TASK = new ForkJoinPool(100);
//没有找到
@Value("${orgTree.orgChildTreeList}")
private String orgChildTreeListUrl;
@Value("${audience.usersByAudienceList}")
private String usersByAudienceList;
@Value("${userBasic.searchUserList}")
private String searchUserListUrl;
@Value("${statApi.userdynamicList}")
private String userdynamicListUrl;
@Autowired
UserDao userDao;
@@ -79,6 +77,12 @@ public class ThirdApi {
@Resource
private UserRemoteClient userRemoteClient;
@Resource
private AudienceRemoteClient audienceRemoteClient;
@Resource
private UserDynamicApiRemoteClient userDynamicApiRemoteClient;
//获取例外人员的id
public List<String> getUserId() {
// String responseBody = Optional.ofNullable(HttpRequest.get(infarasApiUrl + "?pid=316&type=1").execute() //prod 316
@@ -202,7 +206,13 @@ public class ThirdApi {
}
public List<AuditList> getAllAudienceList(AuditListParam userListParam, String token) {
String resp = Optional.ofNullable(HttpRequest.post(usersByAudienceList).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败"));
AudienceDto userMemberVo = new AudienceDto();
userMemberVo.setPageSize(userListParam.getPageSize());
userMemberVo.setPageNo(userListParam.getPageNo());
userMemberVo.setAudienceId(userListParam.getAudienceId());
PageList<AudienceMemberVo> 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()))
@@ -216,12 +226,27 @@ public class ThirdApi {
}
private void getAllAudienceList(AuditListParam userListParam, List<AuditList> list, String token) {
String resp = Optional.ofNullable(HttpRequest.post(usersByAudienceList).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败"));
AudienceDto userMemberVo = new AudienceDto();
userMemberVo.setPageSize(userListParam.getPageSize());
userMemberVo.setPageNo(userListParam.getPageNo());
userMemberVo.setAudienceId(userListParam.getAudienceId());
PageList<AudienceMemberVo> 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);
}
public List<UserDynamic> 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校验失败"));
Pagination pagination = new Pagination();
pagination.setPageSize(userdynamicParam.getPageSize());
pagination.setPageIndex(userdynamicParam.getPageIndex());
com.boe.feign.api.stat.entity.UserDynamic udd = new com.boe.feign.api.stat.entity.UserDynamic();
udd.setAid(userdynamicParam.getAid() == null ? null : userdynamicParam.getAid().toString());
udd.setHidden("true".equals(userdynamicParam.getHidden()));
udd.setContentType(userdynamicParam.getContentType() == null ? null : userdynamicParam.getContentType().toString());
JsonResponse<PageList<com.boe.feign.api.stat.entity.UserDynamic>> 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)
@@ -238,7 +263,12 @@ public class ThirdApi {
private void getAllUserdynamicList(UserdynamicParam userdynamicParam, List<UserDynamic> list, String token) {
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校验失败"));
AudienceDto userMemberVo = new AudienceDto();
userMemberVo.setPageSize(1000);
userMemberVo.setPageNo(userdynamicParam.getPageIndex());
PageList<AudienceMemberVo> 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);
}
@@ -290,12 +320,22 @@ public class ThirdApi {
*/
public UserDynamicResult getAllUserdynamicListOfCaseRead(UserdynamicParam userdynamicParam, String token) {
String s = buildFormData(userdynamicParam);
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校验失败"));
Pagination pagination = new Pagination();
pagination.setPageSize(userdynamicParam.getPageSize());
pagination.setPageIndex(userdynamicParam.getPageIndex());
com.boe.feign.api.stat.entity.UserDynamic udd = new com.boe.feign.api.stat.entity.UserDynamic();
udd.setAid(userdynamicParam.getAid() == null ? null : userdynamicParam.getAid().toString());
udd.setHidden("true".equals(userdynamicParam.getHidden()));
udd.setContentType(userdynamicParam.getContentType() == null ? null : userdynamicParam.getContentType().toString());
udd.setEventKey("ReadCase");
JsonResponse<PageList<com.boe.feign.api.stat.entity.UserDynamic>> 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();