From 0dc02ffad7590d2794c5dc960f6a2e63e7c76bdd Mon Sep 17 00:00:00 2001 From: none Date: Thu, 23 Feb 2023 11:47:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backend/AdminUserController.java | 15 ++++++-- .../backend/ResourceController.java | 6 +++- .../request/backend/PaginationRequest.java | 36 ------------------- .../playedu/api/service/AdminUserService.java | 4 +-- .../service/impl/AdminUserServiceImpl.java | 14 ++++++-- .../paginate/AdminUserPaginateFilter.java | 14 ++++++++ 6 files changed, 44 insertions(+), 45 deletions(-) delete mode 100644 src/main/java/xyz/playedu/api/request/backend/PaginationRequest.java create mode 100644 src/main/java/xyz/playedu/api/types/paginate/AdminUserPaginateFilter.java diff --git a/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java b/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java index 4dbc8ef..3fe167c 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/AdminUserController.java @@ -14,6 +14,7 @@ import xyz.playedu.api.request.backend.AdminUserRequest; import xyz.playedu.api.service.AdminRoleService; import xyz.playedu.api.service.AdminUserRoleService; import xyz.playedu.api.service.AdminUserService; +import xyz.playedu.api.types.paginate.AdminUserPaginateFilter; import xyz.playedu.api.types.paginate.PaginationResult; import xyz.playedu.api.types.JsonResponse; import xyz.playedu.api.util.HelperUtil; @@ -39,8 +40,17 @@ public class AdminUserController { @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_INDEX) @GetMapping("/index") - public JsonResponse Index(@RequestParam(name = "page", defaultValue = "1") Integer page, @RequestParam(name = "size", defaultValue = "10") Integer size) { - PaginationResult result = adminUserService.paginate(page, size, null); + public JsonResponse Index( + @RequestParam(name = "page", defaultValue = "1") Integer page, + @RequestParam(name = "size", defaultValue = "10") Integer size, + @RequestParam(name = "name", required = false) String name + ) { + AdminUserPaginateFilter filter = new AdminUserPaginateFilter(); + if (name != null && name.length() > 0) { + filter.setName(name); + } + + PaginationResult result = adminUserService.paginate(page, size, filter); ArrayList data = new ArrayList<>(); for (AdminUser adminUser : result.getData()) { @@ -60,7 +70,6 @@ public class AdminUserController { HashMap data = new HashMap<>(); data.put("roles", roles); return JsonResponse.data(data); - } @BackendPermissionMiddleware(slug = BPermissionConstant.ADMIN_USER_STORE) diff --git a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java index 70e886a..23c9a16 100644 --- a/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java +++ b/src/main/java/xyz/playedu/api/controller/backend/ResourceController.java @@ -34,7 +34,11 @@ public class ResourceController { private ResourceCategoryService categoryService; @GetMapping("/index") - public JsonResponse index(@RequestParam(name = "page", defaultValue = "1") Integer page, @RequestParam(name = "size", defaultValue = "10") Integer size, @RequestParam(name = "name", defaultValue = "") String name) { + public JsonResponse index( + @RequestParam(name = "page", defaultValue = "1") Integer page, + @RequestParam(name = "size", defaultValue = "10") Integer size, + @RequestParam(name = "name", defaultValue = "") String name + ) { ResourcePaginateFilter filter = new ResourcePaginateFilter(); if (name != null && name.length() > 0) { filter.setName(name); diff --git a/src/main/java/xyz/playedu/api/request/backend/PaginationRequest.java b/src/main/java/xyz/playedu/api/request/backend/PaginationRequest.java deleted file mode 100644 index 2be6700..0000000 --- a/src/main/java/xyz/playedu/api/request/backend/PaginationRequest.java +++ /dev/null @@ -1,36 +0,0 @@ -package xyz.playedu.api.request.backend; - -import jakarta.validation.constraints.Max; -import jakarta.validation.constraints.Min; - -import java.io.Serial; -import java.io.Serializable; - -public class PaginationRequest implements Serializable { - - @Serial - private static final long serialVersionUID = 1L; - - @Min(value = 1, message = "page参数值不能少于1") - public Integer page = 1; - - @Min(value = 1, message = "size参数值不能少于1") - @Max(value = 1000, message = "size参数值不能超过1000") - public Integer size = 10; - - public Integer getPage() { - return page; - } - - public void setPage(Integer page) { - this.page = page; - } - - public Integer getSize() { - return size; - } - - public void setSize(Integer size) { - this.size = size; - } -} diff --git a/src/main/java/xyz/playedu/api/service/AdminUserService.java b/src/main/java/xyz/playedu/api/service/AdminUserService.java index e549b65..3395028 100644 --- a/src/main/java/xyz/playedu/api/service/AdminUserService.java +++ b/src/main/java/xyz/playedu/api/service/AdminUserService.java @@ -1,8 +1,8 @@ package xyz.playedu.api.service; -import com.baomidou.mybatisplus.core.conditions.Wrapper; import xyz.playedu.api.domain.AdminUser; import com.baomidou.mybatisplus.extension.service.IService; +import xyz.playedu.api.types.paginate.AdminUserPaginateFilter; import xyz.playedu.api.types.paginate.PaginationResult; /** @@ -11,7 +11,7 @@ import xyz.playedu.api.types.paginate.PaginationResult; * @createDate 2023-02-11 10:58:52 */ public interface AdminUserService extends IService { - PaginationResult paginate(int page, int size, Wrapper queryWrapper); + PaginationResult paginate(int page, int size, AdminUserPaginateFilter filter); AdminUser findByEmail(String email); 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 ce85ff3..79ebdf1 100644 --- a/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java +++ b/src/main/java/xyz/playedu/api/service/impl/AdminUserServiceImpl.java @@ -1,6 +1,6 @@ package xyz.playedu.api.service.impl; -import com.baomidou.mybatisplus.core.conditions.Wrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -8,14 +8,22 @@ 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.paginate.AdminUserPaginateFilter; import xyz.playedu.api.types.paginate.PaginationResult; @Service public class AdminUserServiceImpl extends ServiceImpl implements AdminUserService { - public PaginationResult paginate(int page, int size, Wrapper queryWrapper) { + public PaginationResult paginate(int page, int size, AdminUserPaginateFilter filter) { + QueryWrapper wrapper = query().getWrapper().eq("1", "1"); + if (filter != null) { + if (filter.getName() != null) { + wrapper.like("name", "%" + filter.getName() + "%"); + } + } + IPage userPage = new Page<>(page, size); - userPage = this.getBaseMapper().selectPage(userPage, queryWrapper); + userPage = this.getBaseMapper().selectPage(userPage, wrapper); PaginationResult pageResult = new PaginationResult<>(); pageResult.setData(userPage.getRecords()); diff --git a/src/main/java/xyz/playedu/api/types/paginate/AdminUserPaginateFilter.java b/src/main/java/xyz/playedu/api/types/paginate/AdminUserPaginateFilter.java new file mode 100644 index 0000000..d2f2108 --- /dev/null +++ b/src/main/java/xyz/playedu/api/types/paginate/AdminUserPaginateFilter.java @@ -0,0 +1,14 @@ +package xyz.playedu.api.types.paginate; + +import lombok.Data; + +/** + * @Author 杭州白书科技有限公司 + * @create 2023/2/23 11:34 + */ +@Data +public class AdminUserPaginateFilter { + + private String name; + +}