diff --git a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplatePageQuery.java b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplatePageQuery.java index 665b19c..d958332 100644 --- a/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplatePageQuery.java +++ b/im-center-api/src/main/java/cn/axzo/im/center/api/vo/req/RobotMsgTemplatePageQuery.java @@ -1,6 +1,5 @@ package cn.axzo.im.center.api.vo.req; -import cn.axzo.im.center.common.util.PageRequest; import lombok.Data; import javax.validation.constraints.NotNull; @@ -13,7 +12,18 @@ import javax.validation.constraints.NotNull; * @date 2023/10/9 16:01 */ @Data -public class RobotMsgTemplatePageQuery extends PageRequest { +public class RobotMsgTemplatePageQuery { + + /** + * 当前第几页 + */ + private int page = 1; + + /** + * 每页数据量 默认pageSize=20 + */ + private int pageSize = 20; + /** * 机器人ID diff --git a/im-center-common/src/main/java/cn/axzo/im/center/common/util/PageRequest.java b/im-center-common/src/main/java/cn/axzo/im/center/common/util/PageRequest.java deleted file mode 100644 index ccb4dc7..0000000 --- a/im-center-common/src/main/java/cn/axzo/im/center/common/util/PageRequest.java +++ /dev/null @@ -1,30 +0,0 @@ -package cn.axzo.im.center.common.util; - -import com.baomidou.mybatisplus.core.metadata.IPage; -import lombok.Getter; -import lombok.Setter; - -/** - * 分页请求 - * - * @author Smile - */ -@Setter -@Getter -public class PageRequest { - - /** - * 当前第几页 - */ - protected int page = 1; - - /** - * 每页数据量 默认pageSize=20 - */ - protected int pageSize = 20; - - public IPage toPage() { - return new com.baomidou.mybatisplus.extension.plugins.pagination.Page<>(page, pageSize); - } - -} diff --git a/im-center-common/src/main/java/cn/axzo/im/center/common/util/PageResp.java b/im-center-common/src/main/java/cn/axzo/im/center/common/util/PageResp.java deleted file mode 100644 index e9f17e3..0000000 --- a/im-center-common/src/main/java/cn/axzo/im/center/common/util/PageResp.java +++ /dev/null @@ -1,43 +0,0 @@ -package cn.axzo.im.center.common.util; - -import lombok.Builder; -import lombok.Getter; -import lombok.Setter; -import org.apache.commons.collections.CollectionUtils; - -import java.util.ArrayList; -import java.util.List; - - -/** - * 分页工具类 - * - * @author zuoqinbo - * @version V1.0 - * @date 2023/10/13 10:52 - */ -@Getter -@Setter -@Builder -public class PageResp { - private int page; - private int pageSize; - private int totalCount; - private List list; - - public PageResp(final int page, final int pageSize, final int totalCount, final List list) { - this.page = page; - this.pageSize = pageSize; - this.totalCount = totalCount; - this.list = list; - } - - - public static PageResp zero(int pageNum, int pageSize) { - return new PageResp(pageNum, pageSize, 0, new ArrayList()); - } - - public static PageResp list(int pageNum, int pageSize, int totalCount, List data) { - return CollectionUtils.isEmpty(data) ? zero(pageNum, pageSize) : new PageResp(pageNum, pageSize, totalCount, data); - } -} \ No newline at end of file