From 592d998e0f580f292fb67f162ef8874f7ee27458 Mon Sep 17 00:00:00 2001 From: AprilWind <2100166581@qq.com> Date: Fri, 15 May 2026 12:48:53 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E6=B3=A8=E9=87=8A=E5=B9=B6=E7=A7=BB=E9=99=A4=E5=86=97=E4=BD=99?= =?UTF-8?q?=E6=9E=84=E9=80=A0=E5=87=BD=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/dromara/system/domain/SysCache.java | 47 ------------------- .../dromara/system/domain/SysDictData.java | 5 -- .../org/dromara/system/domain/SysRole.java | 4 -- .../dromara/system/domain/bo/SysRoleBo.java | 4 -- .../dromara/system/domain/bo/SysSocialBo.java | 2 - .../dromara/system/domain/bo/SysUserBo.java | 4 -- .../system/domain/vo/SysRoleMenuPermVo.java | 6 +++ .../dromara/system/mapper/SysMenuMapper.java | 15 +++++- 8 files changed, 20 insertions(+), 67 deletions(-) delete mode 100644 ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java deleted file mode 100644 index 6c956d529..000000000 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysCache.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.dromara.system.domain; - -import lombok.Data; -import lombok.NoArgsConstructor; -import org.dromara.common.core.utils.StringUtils; - -/** - * 缓存信息 - * - * @author Lion Li - */ -@Data -@NoArgsConstructor -public class SysCache { - - /** - * 缓存名称 - */ - private String cacheName = ""; - - /** - * 缓存键名 - */ - private String cacheKey = ""; - - /** - * 缓存内容 - */ - private String cacheValue = ""; - - /** - * 备注 - */ - private String remark = ""; - - public SysCache(String cacheName, String remark) { - this.cacheName = cacheName; - this.remark = remark; - } - - public SysCache(String cacheName, String cacheKey, String cacheValue) { - this.cacheName = StringUtils.replace(cacheName, ":", ""); - this.cacheKey = StringUtils.replace(cacheKey, cacheName, ""); - this.cacheValue = cacheValue; - } - -} diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java index 3493662bd..dbf15bd1a 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDictData.java @@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; -import org.dromara.common.core.constant.SystemConstants; import org.dromara.common.mybatis.core.domain.BaseEntity; /** @@ -64,8 +63,4 @@ public class SysDictData extends BaseEntity { */ private String remark; - public boolean getDefault() { - return SystemConstants.YES.equals(this.isDefault); - } - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java index d55a3a4c7..d59ab4c39 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysRole.java @@ -72,8 +72,4 @@ public class SysRole extends BaseEntity { */ private String remark; - public SysRole(Long roleId) { - this.roleId = roleId; - } - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java index b424dc8a3..d09a41f5c 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysRoleBo.java @@ -88,10 +88,6 @@ public class SysRoleBo implements Serializable { */ private Long[] deptIds; - public SysRoleBo(Long roleId) { - this.roleId = roleId; - } - public boolean isSuperAdmin() { return SystemConstants.SUPER_ADMIN_ROLE_ID.equals(this.roleId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java index 1f5e48866..e596da022 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysSocialBo.java @@ -140,6 +140,4 @@ public class SysSocialBo implements Serializable { */ private String oauthTokenSecret; - - } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java index 4dd279a8e..8ad804e08 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysUserBo.java @@ -133,10 +133,6 @@ public class SysUserBo implements Serializable { */ private Map params = new HashMap<>(); - public SysUserBo(Long userId) { - this.userId = userId; - } - public boolean isSuperAdmin() { return SystemConstants.SUPER_ADMIN_USER_ID.equals(this.userId); } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleMenuPermVo.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleMenuPermVo.java index 0254e1e9a..863dfe3c2 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleMenuPermVo.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysRoleMenuPermVo.java @@ -14,7 +14,13 @@ public class SysRoleMenuPermVo implements Serializable { @Serial private static final long serialVersionUID = 1L; + /** + * 角色ID + */ private Long roleId; + /** + * 权限字符串 + */ private String perms; } diff --git a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java index d0ccca37c..cd1539ead 100644 --- a/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java +++ b/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/mapper/SysMenuMapper.java @@ -91,7 +91,7 @@ public interface SysMenuMapper extends BaseMapperPlus, MPJBa } /** - * 根据用户ID查询菜单 + * 查询全部正常状态的目录和菜单 * * @return 菜单列表 */ @@ -128,6 +128,13 @@ public interface SysMenuMapper extends BaseMapperPlus, MPJBa .toList(); } + /** + * 根据用户ID和查询条件查询菜单列表 + * + * @param menu 菜单查询条件 + * @param userId 用户ID + * @return 菜单列表 + */ default List selectMenuListByUserId(SysMenuBo menu, Long userId) { return this.selectJoinList(SysMenuVo.class, JoinWrappers.lambda("m", SysMenu.class) .distinct() @@ -146,6 +153,12 @@ public interface SysMenuMapper extends BaseMapperPlus, MPJBa .orderByAsc("m", SysMenu::getOrderNum)); } + /** + * 根据用户ID查询正常状态的目录和菜单 + * + * @param userId 用户ID + * @return 菜单列表 + */ default List selectMenuTreeByUserId(Long userId) { return this.selectJoinList(SysMenu.class, JoinWrappers.lambda("m", SysMenu.class) .distinct()