From d620900bc1290f31360b13df1c35395c109d0d4d Mon Sep 17 00:00:00 2001 From: "lims1@hunktimes.com" Date: Sun, 6 Aug 2023 16:17:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E8=8D=90pageNo?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/xboe/api/ThirdApi.java | 14 +++++++------- .../java/com/xboe/api/vo/AuditListParam.java | 2 +- .../java/com/xboe/api/vo/UserListParam.java | 4 ++-- .../boecase/service/impl/CasesServiceImpl.java | 17 ++++++++++++++--- 4 files changed, 24 insertions(+), 13 deletions(-) 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 93dd6b78..39cdb58f 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 @@ -35,7 +35,7 @@ public class ThirdApi { public List getAllUserList(UserListParam userListParam, String token) { log.info("获取用户"); 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()) .map(UserInfoListRootBean::getResult) .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 userInfoLists) { log.info("获取用户2"); 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); } private void nextPage(UserListParam userListParam, String token, List userInfoLists, UserInfoListRootBean.ResultData t) { - log.info("获取用户--" + userListParam.getPage()); - if (t.getTotalPage() > userListParam.getPage()) { - REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPage(), t.getTotalPage()).parallel().forEach(i -> getAllUserList(userListParam.withPage(i + 1), token, userInfoLists))).join(); + log.info("获取用户--" + 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(); } } @@ -73,8 +73,8 @@ public class ThirdApi { } private void nextPage(AuditListParam userListParam, List t, Result result, String token) { - if (result.getTotalPage() > userListParam.getPage()) { - REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPage(), result.getTotalPage()).parallel().forEach(i -> getAllAudienceList(userListParam.withPage(i + 1), t, token))).join(); + if (result.getTotalPage() > userListParam.getPageNo()) { + REQUEST_TASK.submit(() -> IntStream.range(userListParam.getPageNo(), result.getTotalPage()).parallel().forEach(i -> getAllAudienceList(userListParam.withPageNo(i + 1), t, token))).join(); } } diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/vo/AuditListParam.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/AuditListParam.java index 32c80e17..fa554cf6 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/AuditListParam.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/AuditListParam.java @@ -9,6 +9,6 @@ import lombok.*; @AllArgsConstructor public class AuditListParam implements Cloneable { private String audienceId; - private Integer page; + private Integer pageNo; private Integer pageSize; } diff --git a/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserListParam.java b/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserListParam.java index 8b08e888..164bf818 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserListParam.java +++ b/servers/boe-server-all/src/main/java/com/xboe/api/vo/UserListParam.java @@ -12,8 +12,8 @@ public class UserListParam { private String departId; private String userNo; private String realName; - @Builder.Default - private int page = 1; +// @Builder.Default +// private int page = 1; @Builder.Default private int pageNo = 1; @Builder.Default diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java index 4f651266..b80ad0c4 100644 --- a/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java +++ b/servers/boe-server-all/src/main/java/com/xboe/module/boecase/service/impl/CasesServiceImpl.java @@ -178,6 +178,12 @@ public class CasesServiceImpl implements ICasesService { @Override public PageList queryPageCasesV2(CasePageVo caseVo) { + String type = caseVo.getType(); + if (!StrUtil.equals(type,"excellent")) { + caseVo.setOrderField(""); + caseVo.setOrderAsc(null); + } + String keyword = caseVo.getKeyWord(); QueryBuilder query = QueryBuilder.from(Cases.class); PageList page = null; @@ -285,10 +291,15 @@ public class CasesServiceImpl implements ICasesService { } else { 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.setPageIndex(caseVo.getPageIndex()); query.setPageSize(caseVo.getPageSize());