From fa9ca52023a0befe16d6b02c7fd0deb535295b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cv=E9=AD=94=E6=B3=95=E5=B8=88?= <1806839210@qq.com> Date: Fri, 17 Feb 2023 21:20:27 +0800 Subject: [PATCH 1/5] test --- .../cwf/common/entity/page/PageResult.java | 43 +++++++++++++++++++ .../controller/PermissionController.java | 2 - .../cwf/system/controller/RoleController.java | 11 +++++ 3 files changed, 54 insertions(+), 2 deletions(-) create mode 100644 cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java diff --git a/cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java b/cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java new file mode 100644 index 0000000..6529942 --- /dev/null +++ b/cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java @@ -0,0 +1,43 @@ +package com.cwf.common.entity.page; + +import com.github.pagehelper.PageInfo; +import lombok.Data; + +import java.util.ArrayList; +import java.util.List; + + +@Data +public class PageResult { + + + private Integer pageNum; + + private Integer pageSize; + + private Integer pages; + + private Long total; + + private List list; + + + public static PageResult Set(PageInfo pageInfo,List list){ + + + PageResult result = new PageResult(); + + result.pages = pageInfo.getPages(); + result.pageNum = pageInfo.getPageNum(); + + result.total = pageInfo.getTotal(); + + + result.list = list; + + return result; + + + + } +} diff --git a/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java b/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java index 1c92d73..9fd3fe6 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java +++ b/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java @@ -9,7 +9,6 @@ import com.cwf.common.enums.TokenInfoKeyEnum; import com.cwf.common.utils.auth.JwtUtil; import com.cwf.system.service.PermissionService; import com.cwf.system.vo.PermissionTreeVO; -import org.jasypt.encryption.StringEncryptor; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; @@ -44,7 +43,6 @@ public class PermissionController extends BaseController { public R selectRolePageList(){ List permissionTreeVOList = permissionService.getPermissionTreeVO(); - String userId = getUserId(); return R.success(permissionTreeVOList); } diff --git a/cvmagic-system/src/main/java/com/cwf/system/controller/RoleController.java b/cvmagic-system/src/main/java/com/cwf/system/controller/RoleController.java index a5b2a44..5a5e177 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/controller/RoleController.java +++ b/cvmagic-system/src/main/java/com/cwf/system/controller/RoleController.java @@ -3,10 +3,16 @@ package com.cwf.system.controller; import com.cwf.common.core.controller.BaseController; import com.cwf.common.entity.http.R; +import com.cwf.common.entity.page.PageResult; import com.cwf.system.dao.RoleDao; +import com.cwf.system.entity.Role; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.RequestMapping; +import java.util.ArrayList; +import java.util.List; + @RequestMapping("/system/role") public class RoleController extends BaseController { @@ -19,6 +25,11 @@ public class RoleController extends BaseController { @RequestMapping("/get/page/list") public R selectRolePageList(){ getToken(); + + List list = new ArrayList<>(); + + PageInfo of = PageInfo.of(list); + return R.delete(1); } } -- Gitee From 443603b2f58a448485b96901122cc29403719387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cv=E9=AD=94=E6=B3=95=E5=B8=88?= <1806839210@qq.com> Date: Sat, 18 Feb 2023 11:32:43 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=8E=A7=E5=88=B6?= =?UTF-8?q?=E5=B1=82=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5=E5=A4=84=E7=90=86?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../core/controller/BaseController.java | 52 ++++++++++++++----- 1 file changed, 39 insertions(+), 13 deletions(-) diff --git a/cvmagic-common/src/main/java/com/cwf/common/core/controller/BaseController.java b/cvmagic-common/src/main/java/com/cwf/common/core/controller/BaseController.java index 0e12442..7c62d10 100644 --- a/cvmagic-common/src/main/java/com/cwf/common/core/controller/BaseController.java +++ b/cvmagic-common/src/main/java/com/cwf/common/core/controller/BaseController.java @@ -4,40 +4,42 @@ package com.cwf.common.core.controller; import com.cwf.common.entity.auth.TokenInfo; import com.cwf.common.enums.TokenInfoKeyEnum; import com.cwf.common.utils.auth.JwtUtil; +import com.github.pagehelper.PageHelper; +import lombok.extern.slf4j.Slf4j; +import org.springframework.util.StringUtils; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; import java.util.Map; +@Slf4j public class BaseController { @Resource private HttpServletRequest req; - /** + * @return * @description 获取HttpServletRequest * @author 18068 * @date 2023/2/15 14:57 - * @return */ - public HttpServletRequest getHttpServletRequest(){ + public HttpServletRequest getHttpServletRequest() { HttpServletRequest httpServletRequest = req; return httpServletRequest; } - /** + * @return * @description 获取请求头值 * @author 18068 * @date 2023/2/15 14:57 - * @return */ - public String getHeaderValue(String key){ + public String getHeaderValue(String key) { String header = req.getHeader(key); - return header; + return header; } @@ -46,35 +48,59 @@ public class BaseController { * @author 18068 * @date 2023/2/15 14:36 */ - public String getToken(){ + public String getToken() { return req.getHeader("Authorization"); } /** - * @description 获取token * @param key key值 + * @return + * @description 获取token * @author 18068 * @date 2023/2/15 14:36 - * @return */ - public String getToken(String key){ + public String getToken(String key) { return req.getHeader(key); } /** + * @return * @description 从token获取用户id * @author 18068 * @date 2023/2/15 14:39 - * @return */ - public String getUserId(){ + public String getUserId() { TokenInfo tokenInfo = JwtUtil.getTokenInfo(getToken(), TokenInfoKeyEnum.OK.getCode()); return tokenInfo.getUserId(); } + public void pageStart() { + + String page = req.getParameter("page"); + String size = req.getParameter("size"); + + if (!StringUtils.hasLength(page)) { + page = "1"; + } + + if (!StringUtils.hasLength(size)) { + size = "5"; + } + + if (!StringUtils.hasLength(page) && !StringUtils.hasLength(size)) { + page = "1"; + size = "5"; + } + log.info("\npage: {} \nsize: {}", page, size); + + PageHelper.startPage(Integer.valueOf(page),Integer.valueOf(size)); + PageHelper.clearPage(); + + } + } -- Gitee From 112eee03aa840bb96a094bf6838769fb41daa540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cv=E9=AD=94=E6=B3=95=E5=B8=88?= <1806839210@qq.com> Date: Sat, 18 Feb 2023 11:33:24 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=86=E9=A1=B5?= =?UTF-8?q?=E5=A4=84=E7=90=86aop,=E6=B3=A8=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/cwf/framework/aspectj/PageAop.java | 61 +++++++++++++++++++ .../framework/aspectj/annotation/MyPage.java | 14 +++++ 2 files changed, 75 insertions(+) create mode 100644 cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java create mode 100644 cvmagic-framework/src/main/java/com/cwf/framework/aspectj/annotation/MyPage.java diff --git a/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java b/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java new file mode 100644 index 0000000..159b3e4 --- /dev/null +++ b/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java @@ -0,0 +1,61 @@ +package com.cwf.framework.aspectj; + +import com.cwf.framework.aspectj.annotation.MyPage; +import com.github.pagehelper.PageHelper; +import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.ProceedingJoinPoint; +import org.aspectj.lang.annotation.After; +import org.aspectj.lang.annotation.Around; +import org.aspectj.lang.annotation.Aspect; +import org.aspectj.lang.annotation.Pointcut; +import org.springframework.stereotype.Component; +import org.springframework.util.StringUtils; + +import javax.annotation.Resource; +import javax.servlet.http.HttpServletRequest; + +@Slf4j +@Aspect +@Component +public class PageAop { + + @Resource + private HttpServletRequest req; + + @Pointcut("@annotation(com.cwf.framework.aspectj.annotation.MyPage)") + public void doPointcut(){ + + } + + @Around("@annotation(myPage)") + public Object test(ProceedingJoinPoint pjp, MyPage myPage) throws Throwable { + + String page = req.getParameter("page"); + String size = req.getParameter("size"); + + if (!StringUtils.hasLength(page)) { + page = "1"; + } + + if (!StringUtils.hasLength(size)) { + size = "5"; + } + + if (!StringUtils.hasLength(page) && !StringUtils.hasLength(size)) { + page = "1"; + size = "5"; + } + log.info("\npage: {} \nsize: {}", page, size); + + PageHelper.startPage(Integer.valueOf(page),Integer.valueOf(size)); + + return pjp.proceed(); + } + + @After("doPointcut()") + public void after(){ + log.info("清除分页线程"); + PageHelper.clearPage(); + } + +} diff --git a/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/annotation/MyPage.java b/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/annotation/MyPage.java new file mode 100644 index 0000000..2f0a0ba --- /dev/null +++ b/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/annotation/MyPage.java @@ -0,0 +1,14 @@ +package com.cwf.framework.aspectj.annotation; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface MyPage { + int page() default 1; + + int size() default 5; +} -- Gitee From 644fa9a5fec1833254f7821f158cc1141e992110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cv=E9=AD=94=E6=B3=95=E5=B8=88?= <1806839210@qq.com> Date: Sat, 18 Feb 2023 11:33:51 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=9D=83=E9=99=90?= =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/PermissionController.java | 17 ++++++++++++++++- .../cwf/system/service/PermissionService.java | 2 ++ .../service/impl/PermissionServiceImpl.java | 18 ++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) diff --git a/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java b/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java index 9fd3fe6..9448ec5 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java +++ b/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java @@ -7,8 +7,11 @@ import com.cwf.common.entity.auth.TokenInfo; import com.cwf.common.entity.http.R; import com.cwf.common.enums.TokenInfoKeyEnum; import com.cwf.common.utils.auth.JwtUtil; +import com.cwf.framework.aspectj.annotation.MyPage; +import com.cwf.system.entity.Permission; import com.cwf.system.service.PermissionService; import com.cwf.system.vo.PermissionTreeVO; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; @@ -40,10 +43,22 @@ public class PermissionController extends BaseController { * @return */ @GetMapping("/tree/list") - public R selectRolePageList(){ + public R> selectRolePageList(){ List permissionTreeVOList = permissionService.getPermissionTreeVO(); return R.success(permissionTreeVOList); } + + + @MyPage + @GetMapping("/page/list") + public R getPermissionPageList(){ + + Permission permission = new Permission(); + PageInfo pageList = permissionService.getPermissionPageList(permission); + + + return R.success(pageList); + } } diff --git a/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java b/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java index 60b4f5f..7803f42 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java +++ b/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java @@ -3,6 +3,7 @@ package com.cwf.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.cwf.system.entity.Permission; import com.cwf.system.vo.PermissionTreeVO; +import com.github.pagehelper.PageInfo; import org.springframework.stereotype.Service; import java.util.List; @@ -27,6 +28,7 @@ public interface PermissionService extends IService { List getPermissionTreeVO(); + PageInfo getPermissionPageList(Permission permission); boolean add(Permission permission); } diff --git a/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java b/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java index 59dd068..c04eeba 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java +++ b/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java @@ -7,6 +7,7 @@ import com.cwf.system.dao.PermissionDao; import com.cwf.system.entity.Permission; import com.cwf.system.service.PermissionService; import com.cwf.system.vo.PermissionTreeVO; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -53,9 +54,26 @@ public class PermissionServiceImpl extends ServiceImpl getPermissionPageList(Permission permission) { + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + + + List list = this.list(lambdaQueryWrapper); + + PageInfo of = PageInfo.of(list); + + return of; + } + @Override public boolean add(Permission permission) { + + + + return false; } } -- Gitee From 07ad3a981837e6e9002551a47d20a1e3e8b9483a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?cv=E9=AD=94=E6=B3=95=E5=B8=88?= <1806839210@qq.com> Date: Sat, 18 Feb 2023 13:34:39 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=88=86=E9=A1=B5=E5=8D=87=E7=BA=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../cwf/common/entity/page/PageResult.java | 1 + .../com/cwf/framework/aspectj/PageAop.java | 80 +++++++++++++++---- .../cwf/framework/page/entity/PageParams.java | 17 ++++ .../controller/PermissionController.java | 30 +++++-- .../cwf/system/service/PermissionService.java | 4 +- .../service/impl/PermissionServiceImpl.java | 7 +- 6 files changed, 112 insertions(+), 27 deletions(-) create mode 100644 cvmagic-framework/src/main/java/com/cwf/framework/page/entity/PageParams.java diff --git a/cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java b/cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java index 6529942..03dba1e 100644 --- a/cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java +++ b/cvmagic-common/src/main/java/com/cwf/common/entity/page/PageResult.java @@ -29,6 +29,7 @@ public class PageResult { result.pages = pageInfo.getPages(); result.pageNum = pageInfo.getPageNum(); + result.pageSize = pageInfo.getPageSize(); result.total = pageInfo.getTotal(); diff --git a/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java b/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java index 159b3e4..5381a6f 100644 --- a/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java +++ b/cvmagic-framework/src/main/java/com/cwf/framework/aspectj/PageAop.java @@ -1,18 +1,25 @@ package com.cwf.framework.aspectj; +import com.alibaba.fastjson2.JSON; import com.cwf.framework.aspectj.annotation.MyPage; +import com.cwf.framework.page.entity.PageParams; import com.github.pagehelper.PageHelper; import lombok.extern.slf4j.Slf4j; +import org.aspectj.lang.JoinPoint; import org.aspectj.lang.ProceedingJoinPoint; -import org.aspectj.lang.annotation.After; -import org.aspectj.lang.annotation.Around; -import org.aspectj.lang.annotation.Aspect; -import org.aspectj.lang.annotation.Pointcut; +import org.aspectj.lang.annotation.*; import org.springframework.stereotype.Component; import org.springframework.util.StringUtils; import javax.annotation.Resource; +import javax.servlet.ServletInputStream; import javax.servlet.http.HttpServletRequest; +import java.io.BufferedReader; +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.InputStream; +import java.nio.charset.StandardCharsets; +import java.util.Map; @Slf4j @Aspect @@ -22,40 +29,79 @@ public class PageAop { @Resource private HttpServletRequest req; + + private String page; + + private String size; + + @Pointcut("@annotation(com.cwf.framework.aspectj.annotation.MyPage)") - public void doPointcut(){ + public void doPointcut() { } @Around("@annotation(myPage)") - public Object test(ProceedingJoinPoint pjp, MyPage myPage) throws Throwable { + public Object test(ProceedingJoinPoint point,MyPage myPage) throws Throwable { + + + if (req.getMethod().equals("POST")){ + PageParams params = new PageParams(); + for (Object arg : point.getArgs()){ + params = JSON.parseObject(JSON.toJSONString(arg), PageParams.class); + } + + page = params.getPage(); + size=params.getSize(); + System.out.println(params); + log.info("post请求"); + }else { + page = req.getParameter("page"); + size = req.getParameter("size"); + } - String page = req.getParameter("page"); - String size = req.getParameter("size"); if (!StringUtils.hasLength(page)) { - page = "1"; + page = myPage.page()+""; } if (!StringUtils.hasLength(size)) { - size = "5"; + size = myPage.size()+""; } if (!StringUtils.hasLength(page) && !StringUtils.hasLength(size)) { - page = "1"; - size = "5"; + page = myPage.page()+""; + size = myPage.size()+""; } - log.info("\npage: {} \nsize: {}", page, size); - PageHelper.startPage(Integer.valueOf(page),Integer.valueOf(size)); + PageHelper.startPage(Integer.valueOf(page), Integer.valueOf(size)); - return pjp.proceed(); + return point.proceed(); } @After("doPointcut()") - public void after(){ - log.info("清除分页线程"); + public void after() { + log.info("\npage: {} size: {}", page, size); + log.info("清除分页线程"); PageHelper.clearPage(); } + + private String inputStreamToString(InputStream is) { + ByteArrayOutputStream result = new ByteArrayOutputStream(); + byte[] buffer = new byte[1024]; + int length; + String str = ""; + try { + while ((length = is.read( buffer )) != -1) { + result.write( buffer, 0, length ); + } + str = result.toString( StandardCharsets.UTF_8.name() ); + return str; + } catch (IOException e) { + e.printStackTrace(); + } + return str; + } + + } diff --git a/cvmagic-framework/src/main/java/com/cwf/framework/page/entity/PageParams.java b/cvmagic-framework/src/main/java/com/cwf/framework/page/entity/PageParams.java new file mode 100644 index 0000000..39b5598 --- /dev/null +++ b/cvmagic-framework/src/main/java/com/cwf/framework/page/entity/PageParams.java @@ -0,0 +1,17 @@ +package com.cwf.framework.page.entity; + +import lombok.Data; +import lombok.ToString; + +@Data +@ToString +public class PageParams { + + private String page; + + private String size; + + + private T data; + +} diff --git a/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java b/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java index 9448ec5..aa8b579 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java +++ b/cvmagic-system/src/main/java/com/cwf/system/controller/PermissionController.java @@ -5,9 +5,11 @@ import com.alibaba.fastjson2.JSON; import com.cwf.common.core.controller.BaseController; import com.cwf.common.entity.auth.TokenInfo; import com.cwf.common.entity.http.R; +import com.cwf.common.entity.page.PageResult; import com.cwf.common.enums.TokenInfoKeyEnum; import com.cwf.common.utils.auth.JwtUtil; import com.cwf.framework.aspectj.annotation.MyPage; +import com.cwf.framework.page.entity.PageParams; import com.cwf.system.entity.Permission; import com.cwf.system.service.PermissionService; import com.cwf.system.vo.PermissionTreeVO; @@ -15,9 +17,7 @@ import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.redis.core.RedisTemplate; import org.springframework.security.access.prepost.PreAuthorize; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import java.util.List; @@ -53,12 +53,30 @@ public class PermissionController extends BaseController { @MyPage @GetMapping("/page/list") - public R getPermissionPageList(){ - + public R getPermissionPageList( + @RequestParam(required = false) String name, + @RequestParam(required = false) Integer rank, + @RequestParam(required = false) Integer category, + @RequestParam(required = false) Integer state + ){ Permission permission = new Permission(); - PageInfo pageList = permissionService.getPermissionPageList(permission); + PageResult pageList = permissionService.getPermissionPageList(permission); + + return R.success(pageList); + } + @MyPage(size = 6) + @PostMapping("/page/list") + public R getPermissionPageList1( + @RequestBody PageParams params + ){ + + Permission data = params.getData(); + + PageResult pageList = permissionService.getPermissionPageList(data); + return R.success(pageList); } + } diff --git a/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java b/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java index 7803f42..0925e67 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java +++ b/cvmagic-system/src/main/java/com/cwf/system/service/PermissionService.java @@ -1,9 +1,9 @@ package com.cwf.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.cwf.common.entity.page.PageResult; import com.cwf.system.entity.Permission; import com.cwf.system.vo.PermissionTreeVO; -import com.github.pagehelper.PageInfo; import org.springframework.stereotype.Service; import java.util.List; @@ -28,7 +28,7 @@ public interface PermissionService extends IService { List getPermissionTreeVO(); - PageInfo getPermissionPageList(Permission permission); + PageResult getPermissionPageList(Permission permission); boolean add(Permission permission); } diff --git a/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java b/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java index c04eeba..001ee4d 100644 --- a/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java +++ b/cvmagic-system/src/main/java/com/cwf/system/service/impl/PermissionServiceImpl.java @@ -2,6 +2,7 @@ package com.cwf.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.cwf.common.entity.page.PageResult; import com.cwf.common.enums.IsDeleteEnum; import com.cwf.system.dao.PermissionDao; import com.cwf.system.entity.Permission; @@ -55,7 +56,7 @@ public class PermissionServiceImpl extends ServiceImpl getPermissionPageList(Permission permission) { + public PageResult getPermissionPageList(Permission permission) { LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); @@ -64,7 +65,9 @@ public class PermissionServiceImpl extends ServiceImpl of = PageInfo.of(list); - return of; + + + return PageResult.Set(of,list); } @Override -- Gitee