wangli/orgmanax
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(REQ-3282): 修改Page基本dto

Browse Source
This commit is contained in:
zhanghongbo 2024-12-17 15:08:19 +08:00
parent ac6fb87706
commit 79f5b1729d
5 changed files with 16 additions and 122 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/ApolloTaskOrderClient.java
View File

@ -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<ApolloGetTaskProcessingDetailByAfterTimeResp> getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req);
PageResp<ApolloGetTaskProcessingDetailByAfterTimeResp> getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req);
}

4
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/apollo/dto/ApolloGetTaskProcessingDetailByAfterTimeReq.java
View File

@ -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 {
/**
* 任务单号 支持批量
*/

48
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageRequest.java
View File

@ -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 <T> IPage<T> toPage() {
if (this.page == null) {
page = 1;
}
if (this.pageSize == null) {
pageSize = 10;
}
return new Page<>(page, pageSize);
}
}

66
orgmanax-infra/src/main/java/cn/axzo/orgmanax/infra/client/common/dto/PageResult.java
View File

@ -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<T> {
/**
* 总条数
*/
private Long totalCount;
/**
* 真实数量，去重
*/
private Integer realCount;
/**
* 数据
*/
private List<T> data;
public PageResult() {
}
public PageResult(List<T> data, Long totalCount) {
this.data = data;
this.totalCount = totalCount;
}
public static <T> PageResult<T> emptyResult() {
return new PageResult<>(Collections.emptyList(), 0L);
}
public static <T> PageResult<T> restPage(Page<T> pageInfo) {
PageResult<T> result = new PageResult<>();
result.setTotalCount(pageInfo.getTotal());
result.setData(pageInfo.getRecords());
return result;
}
public static <T> PageResult<T> valueOfIPage(IPage<?> pageInfo, List<T> data) {
PageResult<T> result = new PageResult<>();
result.setTotalCount(pageInfo.getTotal());
result.setData(data);
return result;
}
public static <T> PageResult<T> valueOf(Long totalCount, List<T> data) {
PageResult<T> result = new PageResult<>();
result.setTotalCount(totalCount);
result.setData(data);
return result;
}
}

16
orgmanax-integration/src/main/java/cn/axzo/orgmanax/integration/sdk/apollo/ApolloTaskOrderClientImpl.java
View File

@ -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<ApolloGetTaskProcessingDetailByAfterTimeResp> getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req) {
public PageResp<ApolloGetTaskProcessingDetailByAfterTimeResp> getTaskProcessingDetailByAfterTime(ApolloGetTaskProcessingDetailByAfterTimeReq req) {
TaskOrderIncrByAfterTimeReq rpcReq = BeanUtil.copyProperties(req, TaskOrderIncrByAfterTimeReq.class);
cn.axzo.apollo.core.domain.PageResult<TaskProcessingDetail> 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<TaskProcessingDetail> list = result.getData();
List<ApolloGetTaskProcessingDetailByAfterTimeResp> resps = BeanUtil.copyToList(list, ApolloGetTaskProcessingDetailByAfterTimeResp.class);
return new PageResult(resps, result.getTotalCount());
pageResp.setData(resps);
pageResp.setTotal(result.getTotalCount());
return pageResp;
}
}