hz/java-servers
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/per-boe/java-servers.git synced 2025-12-12 04:16:51 +08:00
Code Issues Packages Projects Releases Wiki Activity

推荐pageNo

Browse Source
This commit is contained in:
lims1@hunktimes.com
2023-08-06 16:17:32 +08:00
parent 9c5ddb25ae
commit d620900bc1
4 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
servers/boe-server-all/src/main/java/com/xboe/api/ThirdApi.java
View File

@@ -35,7 +35,7 @@ public class ThirdApi {
public List<UserInfoList> getAllUserList(UserListParam userListParam, String token) { public List<UserInfoList> getAllUserList(UserListParam userListParam, String token) {
log.info("获取用户"); log.info("获取用户");
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(searchUserListUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败"));
log.info("获取用户返回值 {}",resp); log.info("获取用户返回值1 {}",resp);
return Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(resp, UserInfoListRootBean.class).success()) return Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(resp, UserInfoListRootBean.class).success())
.map(UserInfoListRootBean::getResult) .map(UserInfoListRootBean::getResult)
.map(result -> Opt.ofEmptyAble(result.getUserInfoList()).peek(t -> nextPage(userListParam, token, t, result)).orElse(ListUtil.toList())) .map(result -> Opt.ofEmptyAble(result.getUserInfoList()).peek(t -> nextPage(userListParam, token, t, result)).orElse(ListUtil.toList()))
@@ -45,15 +45,15 @@ public class ThirdApi {
private void getAllUserList(UserListParam userListParam, String token, List<UserInfoList> userInfoLists) { private void getAllUserList(UserListParam userListParam, String token, List<UserInfoList> userInfoLists) {
log.info("获取用户2"); 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(searchUserListUrl).body(JSONUtil.toJsonStr(userListParam)).header("token", token).execute().body()).orElseThrow(() -> new RuntimeException("token校验失败"));
log.info("获取用户返回值 {}",resp); log.info("获取用户返回值2 {}",resp);
Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, UserInfoListRootBean.class).success()).map(UserInfoListRootBean::getResult).map(UserInfoListRootBean.ResultData::getUserInfoList).stream().flatMap(Collection::stream).forEach(userInfoLists::add); Opt.ofBlankAble(resp).map(t -> JSONUtil.toBean(t, UserInfoListRootBean.class).success()).map(UserInfoListRootBean::getResult).map(UserInfoListRootBean.ResultData::getUserInfoList).stream().flatMap(Collection::stream).forEach(userInfoLists::add);
} }
private void nextPage(UserListParam userListParam, String token, List<UserInfoList> userInfoLists, UserInfoListRootBean.ResultData t) { private void nextPage(UserListParam userListParam, String token, List<UserInfoList> userInfoLists, UserInfoListRootBean.ResultData t) {
log.info("获取用户--" + userListParam.getPage()); log.info("获取用户--" + userListParam.getPageNo());
if (t.getTotalPage() > userListParam.getPage()) { if (t.getTotalPage() > userListParam.getPageNo()) {
REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPage(), t.getTotalPage()).parallel().forEach(i -> getAllUserList(userListParam.withPage(i + 1), token, userInfoLists))).join(); REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPageNo(), t.getTotalPage()).parallel().forEach(i -> getAllUserList(userListParam.withPageNo(i + 1), token, userInfoLists))).join();
} }
} }
@@ -73,8 +73,8 @@ public class ThirdApi {
} }
private void nextPage(AuditListParam userListParam, List<AuditList> t, Result result, String token) { private void nextPage(AuditListParam userListParam, List<AuditList> t, Result result, String token) {
if (result.getTotalPage() > userListParam.getPage()) { if (result.getTotalPage() > userListParam.getPageNo()) {
REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPage(), result.getTotalPage()).parallel().forEach(i -> getAllAudienceList(userListParam.withPage(i + 1), t, token))).join(); REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPageNo(), result.getTotalPage()).parallel().forEach(i -> getAllAudienceList(userListParam.withPageNo(i + 1), t, token))).join();
} }
} }

2
servers/boe-server-all/src/main/java/com/xboe/api/vo/AuditListParam.java
View File

@@ -9,6 +9,6 @@ import lombok.*;
@AllArgsConstructor @AllArgsConstructor
public class AuditListParam implements Cloneable { public class AuditListParam implements Cloneable {
private String audienceId; private String audienceId;
private Integer page; private Integer pageNo;
private Integer pageSize; private Integer pageSize;
} }

4
servers/boe-server-all/src/main/java/com/xboe/api/vo/UserListParam.java
View File

@@ -12,8 +12,8 @@ public class UserListParam {
private String departId; private String departId;
private String userNo; private String userNo;
private String realName; private String realName;
@Builder.Default // @Builder.Default
private int page = 1; // private int page = 1;
@Builder.Default @Builder.Default
private int pageNo = 1; private int pageNo = 1;
@Builder.Default @Builder.Default

17
servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java
View File

@@ -178,6 +178,12 @@ public class CasesServiceImpl implements ICasesService {
@Override @Override
public PageList<Cases> queryPageCasesV2(CasePageVo caseVo) { public PageList<Cases> queryPageCasesV2(CasePageVo caseVo) {
String type = caseVo.getType();
if (!StrUtil.equals(type,"excellent")) {
caseVo.setOrderField("");
caseVo.setOrderAsc(null);
}
String keyword = caseVo.getKeyWord(); String keyword = caseVo.getKeyWord();
QueryBuilder query = QueryBuilder.from(Cases.class); QueryBuilder query = QueryBuilder.from(Cases.class);
PageList<Cases> page = null; PageList<Cases> page = null;
@@ -285,10 +291,15 @@ public class CasesServiceImpl implements ICasesService {
} else { } else {
order = OrderCondition.desc(caseVo.getOrderField()); order = OrderCondition.desc(caseVo.getOrderField());
} }
} else {
order = OrderCondition.desc("sysCreateTime");
} }
query.addOrder(order); if (StrUtil.equals(type,"new")) {
order = OrderCondition.desc("sysCreateTime");
} else if (StrUtil.equals(type,"hot")) {
order = OrderCondition.desc("views");
}
if(Objects.nonNull(order)) {
query.addOrder(order);
}
query.addFilters(filters); query.addFilters(filters);
query.setPageIndex(caseVo.getPageIndex()); query.setPageIndex(caseVo.getPageIndex());
query.setPageSize(caseVo.getPageSize()); query.setPageSize(caseVo.getPageSize());