diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java index ceb2bce..a51b447 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiListResult.java @@ -60,7 +60,7 @@ public class ApiListResult extends ApiCoreResult> { return new ApiListResult<>(code, message, data); } - @ConstructorProperties({"code", "msg", "data"}) + @ConstructorProperties({"code", "message", "data"}) public ApiListResult(Integer code, String message, List data) { super(code, message, data); } diff --git a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java index 2800bcc..970241a 100644 --- a/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java +++ b/axzo-common-domain/src/main/java/cn/axzo/framework/domain/web/result/ApiPageResult.java @@ -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 extends ApiCoreResult>{ public static ApiPageResult empty() { @@ -106,25 +104,19 @@ public class ApiPageResult extends ApiCoreResult>{ public static ApiPageResult build(Long total, Integer code, String message, List data, Integer pageNum, Integer pageSize) { - return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, null); + PageData pageData = new PageData<>(data, total, pageNum, pageSize); + return new ApiPageResult<>(code, message, pageData); } public static ApiPageResult build(Long total, Integer code, String message, List data, Integer pageNum, Integer pageSize, PageVerbose verbose) { - return new ApiPageResult<>(total, code, message, data, pageNum, pageSize, verbose); + PageData 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 list, Integer pageNum, Integer pageSize, - PageVerbose verbose) { - PageData data = new PageData(); - 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 data) { + super(code, message, data); } @Override