From 6983e272285d0686dc3cf273ab0d4a5f7237742e Mon Sep 17 00:00:00 2001 From: JoverZhang Date: Wed, 28 Jun 2023 18:48:10 +0800 Subject: [PATCH] refactor: rename APage -> PageResult --- .../me/zhengjie/utils/{APage.java => PageResult.java} | 2 +- .../src/main/java/me/zhengjie/utils/PageUtil.java | 8 ++++---- .../modules/security/service/OnlineUserService.java | 4 ++-- .../me/zhengjie/modules/system/rest/UserController.java | 4 ++-- .../modules/system/service/DictDetailService.java | 4 ++-- .../me/zhengjie/modules/system/service/DictService.java | 4 ++-- .../me/zhengjie/modules/system/service/JobService.java | 4 ++-- .../me/zhengjie/modules/system/service/UserService.java | 4 ++-- .../system/service/impl/DictDetailServiceImpl.java | 4 ++-- .../modules/system/service/impl/DictServiceImpl.java | 4 ++-- .../modules/system/service/impl/JobServiceImpl.java | 4 ++-- .../modules/system/service/impl/UserServiceImpl.java | 4 ++-- 12 files changed, 25 insertions(+), 25 deletions(-) rename eladmin-common/src/main/java/me/zhengjie/utils/{APage.java => PageResult.java} (90%) diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/APage.java b/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java similarity index 90% rename from eladmin-common/src/main/java/me/zhengjie/utils/APage.java rename to eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java index 346b49d5..6e29f571 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/APage.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/PageResult.java @@ -8,7 +8,7 @@ import java.util.List; @Getter @RequiredArgsConstructor(access = AccessLevel.PACKAGE) -public class APage { +public class PageResult { private final List content; diff --git a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java b/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java index c2ada1a3..72c5e10b 100644 --- a/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java +++ b/eladmin-common/src/main/java/me/zhengjie/utils/PageUtil.java @@ -43,15 +43,15 @@ public class PageUtil extends cn.hutool.core.util.PageUtil { /** * Page 数据处理，预防redis反序列化报错 */ - public static APage toPage(Page page) { - return new APage<>(page.getContent(), page.getTotalElements()); + public static PageResult toPage(Page page) { + return new PageResult<>(page.getContent(), page.getTotalElements()); } /** * 自定义分页 */ - public static APage toPage(List list, long totalElements) { - return new APage<>(list, totalElements); + public static PageResult toPage(List list, long totalElements) { + return new PageResult<>(list, totalElements); } } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java index e496a67d..b9ac48f8 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/security/service/OnlineUserService.java @@ -16,7 +16,7 @@ package me.zhengjie.modules.security.service; import lombok.extern.slf4j.Slf4j; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.modules.security.config.bean.SecurityProperties; import me.zhengjie.modules.security.service.dto.JwtUserDto; import me.zhengjie.modules.security.service.dto.OnlineUserDto; @@ -71,7 +71,7 @@ public class OnlineUserService { * @param pageable / * @return / */ - public APage getAll(String filter, Pageable pageable){ + public PageResult getAll(String filter, Pageable pageable){ List onlineUserDtos = getAll(filter); return PageUtil.toPage( PageUtil.paging(pageable.getPageNumber(),pageable.getPageSize(), onlineUserDtos), diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java index 77a26474..d9860b5e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/rest/UserController.java @@ -20,7 +20,7 @@ import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import me.zhengjie.annotation.Log; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.config.RsaProperties; import me.zhengjie.modules.system.domain.Dept; import me.zhengjie.modules.system.service.DataService; @@ -78,7 +78,7 @@ public class UserController { @ApiOperation("查询用户") @GetMapping @PreAuthorize("@el.check('user:list')") - public ResponseEntity> queryUser(UserQueryCriteria criteria, Pageable pageable){ + public ResponseEntity> queryUser(UserQueryCriteria criteria, Pageable pageable){ if (!ObjectUtils.isEmpty(criteria.getDeptId())) { criteria.getDeptIds().add(criteria.getDeptId()); // 先查找是否存在子节点 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java index 708554ca..7e2efb7f 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictDetailService.java @@ -15,7 +15,7 @@ */ package me.zhengjie.modules.system.service; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.service.dto.DictDetailDto; import me.zhengjie.modules.system.service.dto.DictDetailQueryCriteria; @@ -52,7 +52,7 @@ public interface DictDetailService { * @param pageable 分页参数 * @return / */ - APage queryAll(DictDetailQueryCriteria criteria, Pageable pageable); + PageResult queryAll(DictDetailQueryCriteria criteria, Pageable pageable); /** * 根据字典名称获取字典详情 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java index 77a20370..05077b7e 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/DictService.java @@ -15,7 +15,7 @@ */ package me.zhengjie.modules.system.service; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.service.dto.DictDto; import me.zhengjie.modules.system.service.dto.DictQueryCriteria; @@ -37,7 +37,7 @@ public interface DictService { * @param pageable 分页参数 * @return / */ - APage queryAll(DictQueryCriteria criteria, Pageable pageable); + PageResult queryAll(DictQueryCriteria criteria, Pageable pageable); /** * 查询全部数据 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java index 01371078..dab9f586 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/JobService.java @@ -15,7 +15,7 @@ */ package me.zhengjie.modules.system.service; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.modules.system.domain.Job; import me.zhengjie.modules.system.service.dto.JobDto; import me.zhengjie.modules.system.service.dto.JobQueryCriteria; @@ -63,7 +63,7 @@ public interface JobService { * @param pageable 分页参数 * @return / */ - APage queryAll(JobQueryCriteria criteria, Pageable pageable); + PageResult queryAll(JobQueryCriteria criteria, Pageable pageable); /** * 查询全部数据 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java index f42f1b4b..24fc6677 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/UserService.java @@ -15,7 +15,7 @@ */ package me.zhengjie.modules.system.service; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.modules.system.domain.User; import me.zhengjie.modules.system.service.dto.UserDto; import me.zhengjie.modules.system.service.dto.UserLoginDto; @@ -101,7 +101,7 @@ public interface UserService { * @param pageable 分页参数 * @return / */ - APage queryAll(UserQueryCriteria criteria, Pageable pageable); + PageResult queryAll(UserQueryCriteria criteria, Pageable pageable); /** * 查询全部不分页 diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java index fba2fbfe..5da4d056 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictDetailServiceImpl.java @@ -16,7 +16,7 @@ package me.zhengjie.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.domain.DictDetail; import me.zhengjie.modules.system.repository.DictRepository; @@ -49,7 +49,7 @@ public class DictDetailServiceImpl implements DictDetailService { private final RedisUtils redisUtils; @Override - public APage queryAll(DictDetailQueryCriteria criteria, Pageable pageable) { + public PageResult queryAll(DictDetailQueryCriteria criteria, Pageable pageable) { Page page = dictDetailRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); return PageUtil.toPage(page.map(dictDetailMapper::toDto)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java index bbd6052d..68265121 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/DictServiceImpl.java @@ -17,7 +17,7 @@ package me.zhengjie.modules.system.service.impl; import cn.hutool.core.collection.CollectionUtil; import lombok.RequiredArgsConstructor; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.modules.system.domain.Dict; import me.zhengjie.modules.system.service.dto.DictDetailDto; import me.zhengjie.modules.system.service.dto.DictQueryCriteria; @@ -49,7 +49,7 @@ public class DictServiceImpl implements DictService { private final RedisUtils redisUtils; @Override - public APage queryAll(DictQueryCriteria dict, Pageable pageable){ + public PageResult queryAll(DictQueryCriteria dict, Pageable pageable){ Page page = dictRepository.findAll((root, query, cb) -> QueryHelp.getPredicate(root, dict, cb), pageable); return PageUtil.toPage(page.map(dictMapper::toDto)); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java index 1ef38db7..a608b97a 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/JobServiceImpl.java @@ -16,7 +16,7 @@ package me.zhengjie.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.exception.BadRequestException; import me.zhengjie.exception.EntityExistException; import me.zhengjie.modules.system.domain.Job; @@ -53,7 +53,7 @@ public class JobServiceImpl implements JobService { private final UserRepository userRepository; @Override - public APage queryAll(JobQueryCriteria criteria, Pageable pageable) { + public PageResult queryAll(JobQueryCriteria criteria, Pageable pageable) { Page page = jobRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root,criteria,criteriaBuilder),pageable); return PageUtil.toPage(page.map(jobMapper::toDto).getContent(),page.getTotalElements()); } diff --git a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java index d98fb947..a9fef8c0 100644 --- a/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java +++ b/eladmin-system/src/main/java/me/zhengjie/modules/system/service/impl/UserServiceImpl.java @@ -16,7 +16,7 @@ package me.zhengjie.modules.system.service.impl; import lombok.RequiredArgsConstructor; -import me.zhengjie.utils.APage; +import me.zhengjie.utils.PageResult; import me.zhengjie.config.FileProperties; import me.zhengjie.exception.BadRequestException; import me.zhengjie.modules.security.service.OnlineUserService; @@ -62,7 +62,7 @@ public class UserServiceImpl implements UserService { private final UserLoginMapper userLoginMapper; @Override - public APage queryAll(UserQueryCriteria criteria, Pageable pageable) { + public PageResult queryAll(UserQueryCriteria criteria, Pageable pageable) { Page page = userRepository.findAll((root, criteriaQuery, criteriaBuilder) -> QueryHelp.getPredicate(root, criteria, criteriaBuilder), pageable); return PageUtil.toPage(page.map(userMapper::toDto)); }