From f4909257ae7722c2d0210ba4069039ed6bca6213 Mon Sep 17 00:00:00 2001 From: none Date: Tue, 7 Feb 2023 17:19:08 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=86=E9=A1=B5=E6=9F=A5=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../playedu/api/controller/admin/AdminUserController.java | 6 +++--- .../xyz/playedu/api/service/impl/AdminUserServiceImpl.java | 6 +++--- .../api/types/{PageResult.java => PaginationResult.java} | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename src/main/java/xyz/playedu/api/types/{PageResult.java => PaginationResult.java} (91%) diff --git a/src/main/java/xyz/playedu/api/controller/admin/AdminUserController.java b/src/main/java/xyz/playedu/api/controller/admin/AdminUserController.java index df0255f..7e67ee7 100644 --- a/src/main/java/xyz/playedu/api/controller/admin/AdminUserController.java +++ b/src/main/java/xyz/playedu/api/controller/admin/AdminUserController.java @@ -6,7 +6,7 @@ import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; import xyz.playedu.api.domain.AdminUser; import xyz.playedu.api.service.impl.AdminUserServiceImpl; -import xyz.playedu.api.types.PageResult; +import xyz.playedu.api.types.PaginationResult; @RestController public class AdminUserController { @@ -15,8 +15,8 @@ public class AdminUserController { private AdminUserServiceImpl adminUserService; @GetMapping("/admin/user/index") - public PageResult List(@RequestParam("page") Integer page, @RequestParam("size") Integer size) { - PageResult result = adminUserService.paginate(page, size, null); + public PaginationResult List(@RequestParam("page") Integer page, @RequestParam("size") Integer size) { + PaginationResult result = adminUserService.paginate(page, size, null); return result; } diff --git a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java b/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java index ec69fc7..4af9314 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java @@ -8,7 +8,7 @@ import xyz.playedu.api.domain.AdminUser; import xyz.playedu.api.service.AdminUserService; import xyz.playedu.api.mapper.AdminUserMapper; import org.springframework.stereotype.Service; -import xyz.playedu.api.types.PageResult; +import xyz.playedu.api.types.PaginationResult; /** * @author tengteng @@ -18,11 +18,11 @@ import xyz.playedu.api.types.PageResult; @Service public class AdminUserServiceImpl extends ServiceImpl implements AdminUserService { - public PageResult paginate(int page, int size, Wrapper queryWrapper) { + public PaginationResult paginate(int page, int size, Wrapper queryWrapper) { IPage userPage = new Page<>(page, size); userPage = this.getBaseMapper().selectPage(userPage, queryWrapper); - PageResult pageResult = new PageResult<>(); + PaginationResult pageResult = new PaginationResult<>(); pageResult.setData(userPage.getRecords()); pageResult.setTotal(userPage.getTotal()); diff --git a/src/main/java/xyz/playedu/api/types/PageResult.java b/src/main/java/xyz/playedu/api/types/PaginationResult.java similarity index 91% rename from src/main/java/xyz/playedu/api/types/PageResult.java rename to src/main/java/xyz/playedu/api/types/PaginationResult.java index 40b95ff..1797bb0 100644 --- a/src/main/java/xyz/playedu/api/types/PageResult.java +++ b/src/main/java/xyz/playedu/api/types/PaginationResult.java @@ -2,7 +2,7 @@ package xyz.playedu.api.types; import java.util.List; -public class PageResult { +public class PaginationResult { private List data;