From 53bf85aa4ab75f60efc1f0ec78297ccc66a272f6 Mon Sep 17 00:00:00 2001 From: sunjiabei Date: Thu, 17 Jul 2025 11:52:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=9F=A5=E8=AF=A2=E9=83=A8?= =?UTF-8?q?=E5=88=86=E5=AE=9E=E7=8E=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/example/demo/controller/RoleController.java | 20 +++++++++++++++++++- src/main/java/com/example/demo/domain/vo/Page.java | 1 + .../java/com/example/demo/domain/vo/RoleVo.java | 1 + .../java/com/example/demo/mapper/RoleMapper.java | 3 +++ .../java/com/example/demo/service/RoleService.java | 6 ++++++ .../example/demo/serviceImpl/RoleServiceImpl.java | 11 +++++++++++ src/main/resources/mapper/RoleMapper.xml | 21 +++++++++++++++++++++ 7 files changed, 62 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/example/demo/controller/RoleController.java b/src/main/java/com/example/demo/controller/RoleController.java index 4265642..31531ad 100644 --- a/src/main/java/com/example/demo/controller/RoleController.java +++ b/src/main/java/com/example/demo/controller/RoleController.java @@ -48,10 +48,28 @@ public class RoleController { } //获取上级角色的下属角色列表 @PostMapping("/selectSub") - public List selectSub(Integer fatherId) { + public List selectSub(Integer fatherId) { return roleService.selectSubRole(fatherId); } + //角色明细筛选 + @PostMapping("/selectBy") + public Result selectBy(@RequestBody Page page) { + try { + //页码校验 + if (ObjectUtils.isEmpty(page.getPageNum())) { + return Result.error("页码数为空！"); + } + //页面大小校验 + if (ObjectUtils.isEmpty(page.getPageSize())) { + return Result.error("页大小为空！"); + } else { + return Result.success(roleService.selectBy(page.getPageNum(), page.getPageSize(), page.getRoleVo())); + } + } catch (Exception e) { + return Result.error("请检查筛选数据的格式"); + } + } } diff --git a/src/main/java/com/example/demo/domain/vo/Page.java b/src/main/java/com/example/demo/domain/vo/Page.java index 72b26bf..b9f4919 100644 --- a/src/main/java/com/example/demo/domain/vo/Page.java +++ b/src/main/java/com/example/demo/domain/vo/Page.java @@ -27,4 +27,5 @@ public class Page { private RechargeAudit rechargeAudit; private RefundAudit refundAudit; private RechargeUser rechargeUser; + private RoleVo roleVo; } diff --git a/src/main/java/com/example/demo/domain/vo/RoleVo.java b/src/main/java/com/example/demo/domain/vo/RoleVo.java index 17c9616..fdcf846 100644 --- a/src/main/java/com/example/demo/domain/vo/RoleVo.java +++ b/src/main/java/com/example/demo/domain/vo/RoleVo.java @@ -28,6 +28,7 @@ public class RoleVo implements Serializable { private String roleKey; // 角色标识符 private Integer priority;//优先级 private Integer fatherId;//上级角色id + private Integer fatherName;//上级角色名称 @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "Asia/Shanghai") private Date createTime; // 创建时间 diff --git a/src/main/java/com/example/demo/mapper/RoleMapper.java b/src/main/java/com/example/demo/mapper/RoleMapper.java index 1e9d624..282bbd6 100644 --- a/src/main/java/com/example/demo/mapper/RoleMapper.java +++ b/src/main/java/com/example/demo/mapper/RoleMapper.java @@ -33,4 +33,7 @@ public interface RoleMapper { void addRole(RoleVo roleVo); //根据父级id查下属角色 List selectByFatherId(Integer fatherId); + + //分页查找角色 + List selectBy(RoleVo roleVo); } diff --git a/src/main/java/com/example/demo/service/RoleService.java b/src/main/java/com/example/demo/service/RoleService.java index decce7e..1512e5b 100644 --- a/src/main/java/com/example/demo/service/RoleService.java +++ b/src/main/java/com/example/demo/service/RoleService.java @@ -1,8 +1,10 @@ package com.example.demo.service; +import com.example.demo.domain.vo.ConsumeUser; import com.example.demo.domain.vo.Result; import com.example.demo.domain.vo.RoleVo; +import com.github.pagehelper.PageInfo; import java.util.List; @@ -24,4 +26,8 @@ public interface RoleService { List selectAllRole(); //根据父级id查找下属角色 List selectSubRole(Integer fatherId); + + //分页查找角色 + PageInfo selectBy(Integer pageNum, Integer pageSize, RoleVo roleVo); + } diff --git a/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java b/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java index 2c18c4c..8651353 100644 --- a/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java +++ b/src/main/java/com/example/demo/serviceImpl/RoleServiceImpl.java @@ -1,12 +1,15 @@ package com.example.demo.serviceImpl; import com.example.demo.domain.entity.Role; +import com.example.demo.domain.vo.ConsumeUser; import com.example.demo.domain.vo.Result; import com.example.demo.domain.vo.RoleVo; import com.example.demo.mapper.RefundMapper; import com.example.demo.mapper.RoleMapper; import com.example.demo.service.MenuService; import com.example.demo.service.RoleService; +import com.github.pagehelper.PageHelper; +import com.github.pagehelper.PageInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -74,6 +77,14 @@ public class RoleServiceImpl implements RoleService { public List selectSubRole(Integer fatherId) { return roleMapper.selectByFatherId(fatherId); } + + //分页查找角色 + @Override + public PageInfo selectBy(Integer pageNum, Integer pageSize, RoleVo roleVo) { + PageHelper.startPage(pageNum, pageSize); + List roleVos = roleMapper.selectBy(roleVo); + return new PageInfo<>(roleVos); + } } diff --git a/src/main/resources/mapper/RoleMapper.xml b/src/main/resources/mapper/RoleMapper.xml index a5abfe4..51e0cad 100644 --- a/src/main/resources/mapper/RoleMapper.xml +++ b/src/main/resources/mapper/RoleMapper.xml @@ -35,4 +35,25 @@ VALUES (#{roleName}, #{priority}, #{fatherId}) + + + + + \ No newline at end of file