From 6768a2e33c14428c09bbf268d51182cd2dcea67a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=96=AF=E7=8B=82=E7=9A=84=E7=8B=AE=E5=AD=90Li?= <15040126243@163.com> Date: Tue, 7 Feb 2023 23:14:46 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E9=87=8D=E6=9E=84=20=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=20TreeEntity=20=E5=AE=9E=E4=BD=93=E7=B1=BB=20?= =?UTF-8?q?=E6=97=A0=E5=AE=9E=E9=99=85=E5=AD=98=E5=9C=A8=E5=BF=85=E8=A6=81?= =?UTF-8?q?=E4=BD=9C=E7=94=A8=E8=BE=83=E5=B0=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mybatis/core/domain/TreeEntity.java | 41 ------------------- .../java/com/ruoyi/demo/domain/TestTree.java | 9 +++- .../com/ruoyi/demo/domain/bo/TestTreeBo.java | 14 ++++--- .../java/com/ruoyi/system/domain/SysDept.java | 13 +++--- .../java/com/ruoyi/system/domain/SysMenu.java | 25 ++++++++++- .../com/ruoyi/system/domain/bo/SysDeptBo.java | 9 +++- .../com/ruoyi/system/domain/bo/SysMenuBo.java | 9 +++- 7 files changed, 60 insertions(+), 60 deletions(-) delete mode 100644 ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TreeEntity.java diff --git a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TreeEntity.java b/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TreeEntity.java deleted file mode 100644 index c3939164e..000000000 --- a/ruoyi-common/ruoyi-common-mybatis/src/main/java/com/ruoyi/common/mybatis/core/domain/TreeEntity.java +++ /dev/null @@ -1,41 +0,0 @@ -package com.ruoyi.common.mybatis.core.domain; - -import com.baomidou.mybatisplus.annotation.TableField; -import lombok.Data; -import lombok.EqualsAndHashCode; - -import java.io.Serial; -import java.util.ArrayList; -import java.util.List; - -/** - * Tree基类 - * - * @author Lion Li - */ - -@Data -@EqualsAndHashCode(callSuper = true) -public class TreeEntity extends TenantEntity { - - @Serial - private static final long serialVersionUID = 1L; - - /** - * 父菜单名称 - */ - @TableField(exist = false) - private String parentName; - - /** - * 父菜单ID - */ - private Long parentId; - - /** - * 子部门 - */ - @TableField(exist = false) - private List children = new ArrayList<>(); - -} diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java index 056700254..14f135571 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/TestTree.java @@ -4,7 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.Version; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; +import com.ruoyi.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -19,7 +19,7 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) @TableName("test_tree") -public class TestTree extends TreeEntity { +public class TestTree extends BaseEntity { @Serial private static final long serialVersionUID = 1L; @@ -30,6 +30,11 @@ public class TestTree extends TreeEntity { @TableId(value = "id") private Long id; + /** + * 父ID + */ + private Long parentId; + /** * 部门id */ diff --git a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java index 7e6daab12..8251b5b64 100644 --- a/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java +++ b/ruoyi-modules/ruoyi-demo/src/main/java/com/ruoyi/demo/domain/bo/TestTreeBo.java @@ -2,12 +2,11 @@ package com.ruoyi.demo.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; -import lombok.Data; -import lombok.EqualsAndHashCode; - +import com.ruoyi.common.mybatis.core.domain.BaseEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; +import lombok.Data; +import lombok.EqualsAndHashCode; /** * 测试树表业务对象 test_tree @@ -18,7 +17,7 @@ import jakarta.validation.constraints.NotNull; @Data @EqualsAndHashCode(callSuper = true) -public class TestTreeBo extends TreeEntity { +public class TestTreeBo extends BaseEntity { /** * 主键 @@ -26,6 +25,11 @@ public class TestTreeBo extends TreeEntity { @NotNull(message = "主键不能为空", groups = {EditGroup.class}) private Long id; + /** + * 父ID + */ + private Long parentId; + /** * 部门id */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java index eb3b1dc93..c602a35c8 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysDept.java @@ -3,11 +3,7 @@ package com.ruoyi.system.domain; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableLogic; import com.baomidou.mybatisplus.annotation.TableName; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; -import jakarta.validation.constraints.Email; -import jakarta.validation.constraints.NotBlank; -import jakarta.validation.constraints.NotNull; -import jakarta.validation.constraints.Size; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import lombok.Data; import lombok.EqualsAndHashCode; @@ -22,7 +18,7 @@ import java.io.Serial; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_dept") -public class SysDept extends TreeEntity { +public class SysDept extends TenantEntity { @Serial private static final long serialVersionUID = 1L; @@ -33,6 +29,11 @@ public class SysDept extends TreeEntity { @TableId(value = "dept_id") private Long deptId; + /** + * 父部门ID + */ + private Long parentId; + /** * 部门名称 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java index 0ba4ab0d4..b02d74f7e 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/SysMenu.java @@ -1,14 +1,18 @@ package com.ruoyi.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.ruoyi.common.core.constant.Constants; import com.ruoyi.common.core.constant.UserConstants; import com.ruoyi.common.core.utils.StringUtils; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; +import com.ruoyi.common.mybatis.core.domain.BaseEntity; import lombok.Data; import lombok.EqualsAndHashCode; +import java.util.ArrayList; +import java.util.List; + /** * 菜单权限表 sys_menu * @@ -18,7 +22,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) @TableName("sys_menu") -public class SysMenu extends TreeEntity { +public class SysMenu extends BaseEntity { /** * 菜单ID @@ -26,6 +30,11 @@ public class SysMenu extends TreeEntity { @TableId(value = "menu_id") private Long menuId; + /** + * 父菜单ID + */ + private Long parentId; + /** * 菜单名称 */ @@ -91,6 +100,18 @@ public class SysMenu extends TreeEntity { */ private String remark; + /** + * 父菜单名称 + */ + @TableField(exist = false) + private String parentName; + + /** + * 子菜单 + */ + @TableField(exist = false) + private List children = new ArrayList<>(); + /** * 获取路由名称 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java index c66d066c2..e0b7a1370 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysDeptBo.java @@ -2,7 +2,7 @@ package com.ruoyi.system.domain.bo; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; +import com.ruoyi.common.mybatis.core.domain.TenantEntity; import jakarta.validation.constraints.Email; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; @@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class SysDeptBo extends TreeEntity { +public class SysDeptBo extends TenantEntity { /** * 部门id @@ -26,6 +26,11 @@ public class SysDeptBo extends TreeEntity { @NotNull(message = "部门id不能为空", groups = { EditGroup.class }) private Long deptId; + /** + * 父部门ID + */ + private Long parentId; + /** * 部门名称 */ diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java index a8b154393..909088682 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/domain/bo/SysMenuBo.java @@ -3,7 +3,7 @@ package com.ruoyi.system.domain.bo; import com.fasterxml.jackson.annotation.JsonInclude; import com.ruoyi.common.core.validate.AddGroup; import com.ruoyi.common.core.validate.EditGroup; -import com.ruoyi.common.mybatis.core.domain.TreeEntity; +import com.ruoyi.common.mybatis.core.domain.BaseEntity; import jakarta.validation.constraints.NotBlank; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -18,7 +18,7 @@ import lombok.EqualsAndHashCode; @Data @EqualsAndHashCode(callSuper = true) -public class SysMenuBo extends TreeEntity { +public class SysMenuBo extends BaseEntity { /** * 菜单ID @@ -26,6 +26,11 @@ public class SysMenuBo extends TreeEntity { @NotNull(message = "菜单ID不能为空", groups = { EditGroup.class }) private Long menuId; + /** + * 父菜单ID + */ + private Long parentId; + /** * 菜单名称 */