wangli/axzo-framework-commons
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'feature/page_res' into 'master'

Browse Source 
Feature/page res

See merge request universal/framework/backend/axzo-framework-commons!65
This commit is contained in:
田立勇 2023-07-17 02:36:24 +00:00
commit 0868439db8
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java
View File

@ -60,7 +60,7 @@ public class ApiListResult<E> extends ApiCoreResult<List<E>> {
return new ApiListResult<>(code, message, data);
}
@ConstructorProperties({"code", "msg", "data"})
@ConstructorProperties({"code", "message", "data"})
public ApiListResult(Integer code, String message, List<E> data) {
super(code, message, data);
}

24
axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java
View File

@ -3,10 +3,9 @@ package cn.axzo.framework.domain.web.result;
import cn.axzo.framework.domain.page.*;
import cn.axzo.framework.domain.web.code.IRespCode;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.fasterxml.jackson.annotation.JsonPropertyOrder;
import com.github.pagehelper.PageInfo;
import com.google.common.collect.Lists;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.beans.ConstructorProperties;
@ -22,9 +21,8 @@ import static com.google.common.collect.Lists.newArrayList;
* @Author liyong.tian
* @Date 2020/9/7 20:32
**/
@Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@JsonPropertyOrder({"code", "msg", "data"})
public class ApiPageResult<E> extends ApiCoreResult<PageData<E>>{
public static <E> ApiPageResult<E> empty() {
@ -106,25 +104,19 @@ public class ApiPageResult<E> extends ApiCoreResult<PageData<E>>{
public static <E> ApiPageResult<E> build(Long total, Integer code, String message, List<E> data,
Integer pageNum, Integer pageSize) {
return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, null);
PageData<E> pageData = new PageData<>(data, total, pageNum, pageSize);
return new ApiPageResult<>(code, message, pageData);
}
public static <E> ApiPageResult<E> build(Long total, Integer code, String message, List<E> data,
Integer pageNum, Integer pageSize, PageVerbose verbose) {
return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, verbose);
PageData<E> pageData = new PageData<>(data, total, pageNum, pageSize);
return new ApiPageResult<>(code, message, pageData);
}
@ConstructorProperties({"code", "msg", "data"})
public ApiPageResult(Long total, Integer code, String message, List<E> list, Integer pageNum, Integer pageSize,
PageVerbose verbose) {
PageData<E> data = new PageData<E>();
data.setList(list);
data.setTotalCount(total);
data.setPage(pageNum);
data.setPageSize(pageSize);
this.code = code;
this.msg = message;
this.data = data;
public ApiPageResult(Integer code, String message, PageData<E> data) {
super(code, message, data);
}
@Override