From d77a6752d01d549dbadba7da5efdd1cf703711cb Mon Sep 17 00:00:00 2001 From: stylefeng Date: Wed, 22 Jan 2025 18:16:41 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=908.3.3=E3=80=91=E3=80=90role=E3=80=91?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=96=B0=E5=A2=9E=E8=A7=92=E8=89=B2=E5=88=86?= =?UTF-8?q?=E7=B1=BB=E7=9A=84=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/modular/role/entity/RoleCategory.java | 24 ++++++++++++++++++- .../pojo/request/RoleCategoryRequest.java | 21 ---------------- .../service/impl/RoleCategoryServiceImpl.java | 24 ++++++++++++++++++- 3 files changed, 46 insertions(+), 23 deletions(-) diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java index fa282e5f6..291444888 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/entity/RoleCategory.java @@ -2,6 +2,7 @@ package cn.stylefeng.roses.kernel.sys.modular.role.entity; import cn.stylefeng.roses.kernel.db.api.pojo.entity.BaseEntity; import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription; +import cn.stylefeng.roses.kernel.rule.pidset.callback.PidSettable; import cn.stylefeng.roses.kernel.rule.tree.factory.base.AbstractTreeNode; import com.baomidou.mybatisplus.annotation.*; import lombok.Data; @@ -19,7 +20,7 @@ import java.util.List; @TableName("sys_role_category") @Data @EqualsAndHashCode(callSuper = true) -public class RoleCategory extends BaseEntity implements AbstractTreeNode { +public class RoleCategory extends BaseEntity implements AbstractTreeNode, PidSettable { /** * 主键id @@ -105,4 +106,25 @@ public class RoleCategory extends BaseEntity implements AbstractTreeNode childrenNodes) { this.children = childrenNodes; } + + @Override + public Long getCurrentId() { + return id; + } + + @Override + public Long getParentId() { + return categoryParentId; + } + + @Override + public void setParentIdListString(String parentIdListString) { + this.categoryPids = parentIdListString; + } + + @Override + public String getParentIdListString() { + return this.categoryPids; + } + } \ No newline at end of file diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java index 72a72de91..cc61eb4f4 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/pojo/request/RoleCategoryRequest.java @@ -8,7 +8,6 @@ import lombok.Data; import lombok.EqualsAndHashCode; import java.math.BigDecimal; -import java.util.List; /** * 角色分类封装类 @@ -34,13 +33,6 @@ public class RoleCategoryRequest extends BaseRequest { @ChineseDescription("父级角色分类id") private Long categoryParentId; - /** - * 父级角色分类id集合 - */ - @NotBlank(message = "父级角色分类id集合不能为空", groups = {add.class, edit.class}) - @ChineseDescription("父级角色分类id集合") - private String categoryPids; - /** * 角色分类名称 */ @@ -61,17 +53,4 @@ public class RoleCategoryRequest extends BaseRequest { @ChineseDescription("角色分类排序") private BigDecimal fldSort; - /** - * 租户号 - */ - @ChineseDescription("租户号") - private Long tenantId; - - /** - * 批量删除用的id集合 - */ - @NotNull(message = "批量删除id集合不能为空", groups = batchDelete.class) - @ChineseDescription("批量删除用的id集合") - private List batchDeleteIdList; - } \ No newline at end of file diff --git a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java index 576b2e9df..c6b7260fc 100644 --- a/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java +++ b/kernel-s-system/system-business-permission/src/main/java/cn/stylefeng/roses/kernel/sys/modular/role/service/impl/RoleCategoryServiceImpl.java @@ -3,6 +3,9 @@ package cn.stylefeng.roses.kernel.sys.modular.role.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.ObjectUtil; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; +import cn.stylefeng.roses.kernel.rule.pidset.CalcParentIdListUtil; +import cn.stylefeng.roses.kernel.rule.pidset.callback.PidGetterService; +import cn.stylefeng.roses.kernel.rule.pidset.pojo.ParentIdInfoPojo; import cn.stylefeng.roses.kernel.rule.tree.factory.DefaultTreeBuildFactory; import cn.stylefeng.roses.kernel.sys.modular.role.entity.RoleCategory; import cn.stylefeng.roses.kernel.sys.modular.role.enums.RoleCategoryExceptionEnum; @@ -23,7 +26,7 @@ import java.util.List; * @since 2025/01/22 17:40 */ @Service -public class RoleCategoryServiceImpl extends ServiceImpl implements RoleCategoryService { +public class RoleCategoryServiceImpl extends ServiceImpl implements RoleCategoryService, PidGetterService { @Override public List treeList(RoleCategoryRequest roleCategoryRequest) { @@ -41,6 +44,10 @@ public class RoleCategoryServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(RoleCategory::getId, itemId); + queryWrapper.select(RoleCategory::getId, RoleCategory::getCategoryPids); + RoleCategory roleCategory = this.getOne(queryWrapper, false); + if (roleCategory == null) { + return null; + } + return new ParentIdInfoPojo(roleCategory.getId(), roleCategory.getCategoryPids()); + } + }