diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/ApolloTaskOrderClient.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/ApolloTaskOrderClient.java index 7e9731d..4640c9c 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/ApolloTaskOrderClient.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/ApolloTaskOrderClient.java @@ -1,10 +1,10 @@ package cn.axzo.orgmanax.infra.client.apollo; +import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloGetTaskProcessingDetailByAfterTimeReq; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloGetTaskProcessingDetailByAfterTimeResp; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloQueryEffectiveProjectTaskOrderReq; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloQueryEffectiveProjectTaskOrderResp; -import cn.axzo.orgmanax.infra.client.common.dto.PageResult; import java.util.List; @@ -27,5 +27,5 @@ public interface ApolloTaskOrderClient { * @param req * @return */ - PageResult getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req); + PageResp getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req); } diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/dto/ApolloGetTaskProcessingDetailByAfterTimeReq.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/dto/ApolloGetTaskProcessingDetailByAfterTimeReq.java index aff57af..1bdae44 100644 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/dto/ApolloGetTaskProcessingDetailByAfterTimeReq.java +++ b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/dto/ApolloGetTaskProcessingDetailByAfterTimeReq.java @@ -1,6 +1,6 @@ package cn.axzo.orgmanax.infra.client.apollo.dto; -import cn.axzo.orgmanax.infra.client.common.dto.PageRequest; +import cn.axzo.foundation.page.PageReq; import lombok.Data; import java.util.List; @@ -10,7 +10,7 @@ import java.util.List; * @date 2024/12/11 */ @Data -public class ApolloGetTaskProcessingDetailByAfterTimeReq extends PageRequest { +public class ApolloGetTaskProcessingDetailByAfterTimeReq extends PageReq { /** * 任务单号 支持批量 */ diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageRequest.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageRequest.java deleted file mode 100644 index 3f9a0eb..0000000 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageRequest.java +++ /dev/null @@ -1,48 +0,0 @@ -package cn.axzo.orgmanax.infra.client.common.dto; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.Setter; - -/** - * 分页请求 - * - * @author Smile - */ -@Setter -public class PageRequest { - - /** - * 当前页 - */ - protected Integer page; - - /** - * 页大小 - */ - protected Integer pageSize; - - public Integer getPage() { - return page == null ? 1 : page; - } - - public Integer getPageSize() { - return pageSize == null ? 10 : pageSize; - } - - public Integer getOffset() { - int offset = (getPage() - 1) * getPageSize(); - return Math.max(offset, 0); - } - - public IPage toPage() { - if (this.page == null) { - page = 1; - } - if (this.pageSize == null) { - pageSize = 10; - } - return new Page<>(page, pageSize); - } - -} \ No newline at end of file diff --git a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageResult.java b/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageResult.java deleted file mode 100644 index 573838f..0000000 --- a/orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageResult.java +++ /dev/null @@ -1,66 +0,0 @@ -package cn.axzo.orgmanax.infra.client.common.dto; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import lombok.Data; - -import java.util.Collections; -import java.util.List; - -/** - * 分页结果集 - * @author Smile - * @date 2019/6/29 16:13 - */ -@Data -public class PageResult { - - /** - * 总条数 - */ - private Long totalCount; - - /** - * 真实数量,去重 - */ - private Integer realCount; - - /** - * 数据 - */ - private List data; - - public PageResult() { - } - - public PageResult(List data, Long totalCount) { - this.data = data; - this.totalCount = totalCount; - } - - public static PageResult emptyResult() { - return new PageResult<>(Collections.emptyList(), 0L); - } - - public static PageResult restPage(Page pageInfo) { - PageResult result = new PageResult<>(); - result.setTotalCount(pageInfo.getTotal()); - result.setData(pageInfo.getRecords()); - return result; - } - - public static PageResult valueOfIPage(IPage pageInfo, List data) { - PageResult result = new PageResult<>(); - result.setTotalCount(pageInfo.getTotal()); - result.setData(data); - return result; - } - - public static PageResult valueOf(Long totalCount, List data) { - PageResult result = new PageResult<>(); - result.setTotalCount(totalCount); - result.setData(data); - return result; - } - -} diff --git a/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/sdk/apollo/ApolloTaskOrderClientImpl.java b/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/sdk/apollo/ApolloTaskOrderClientImpl.java index 06cda31..be6b575 100644 --- a/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/sdk/apollo/ApolloTaskOrderClientImpl.java +++ b/orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/sdk/apollo/ApolloTaskOrderClientImpl.java @@ -5,18 +5,19 @@ import cn.axzo.apollo.api.req.QueryEffectiveProjectTaskOrderReq; import cn.axzo.apollo.api.req.TaskOrderIncrByAfterTimeReq; import cn.axzo.apollo.api.res.QueryEffectiveTaskOrderRes; import cn.axzo.apollo.core.common.model.TaskProcessingDetail; +import cn.axzo.foundation.page.PageResp; import cn.axzo.orgmanax.infra.client.apollo.ApolloTaskOrderClient; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloQueryEffectiveProjectTaskOrderReq; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloGetTaskProcessingDetailByAfterTimeResp; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloQueryEffectiveProjectTaskOrderResp; import cn.axzo.orgmanax.infra.client.apollo.dto.ApolloGetTaskProcessingDetailByAfterTimeReq; -import cn.axzo.orgmanax.infra.client.common.dto.PageResult; import cn.axzo.orgmanax.integration.core.RpcWrapper; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import lombok.AllArgsConstructor; import org.springframework.stereotype.Component; +import java.util.Collections; import java.util.List; /** @@ -49,14 +50,21 @@ public class ApolloTaskOrderClientImpl implements ApolloTaskOrderClient { * @return */ @Override - public PageResult getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req) { + public PageResp getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req) { TaskOrderIncrByAfterTimeReq rpcReq = BeanUtil.copyProperties(req, TaskOrderIncrByAfterTimeReq.class); cn.axzo.apollo.core.domain.PageResult result = RpcWrapper.wrapApolloResult(() -> apolloTaskOrderApi.getTaskProcessingDetailByAfterTime(rpcReq)); + + PageResp pageResp = new PageResp(); + pageResp.setSize(req.getPageSize()); if (result == null || ObjectUtil.isEmpty(result.getData())) { - return PageResult.emptyResult(); + pageResp.setData(Collections.emptyList()); + pageResp.setTotal(0L); + return pageResp; } List list = result.getData(); List resps = BeanUtil.copyToList(list, ApolloGetTaskProcessingDetailByAfterTimeResp.class); - return new PageResult(resps, result.getTotalCount()); + pageResp.setData(resps); + pageResp.setTotal(result.getTotalCount()); + return pageResp; } }