权限表字段修改

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/config/UserAuthService.java

@@ -7,10 +7,7 @@ import com.hfln.portal.infrastructure.po.TblPermission;
 import com.hfln.portal.infrastructure.po.TblRole;
 import com.hfln.portal.infrastructure.po.TblRolePermission;
 import com.hfln.portal.infrastructure.po.TblUserRole;
-import com.hfln.portal.infrastructure.service.PermissionService;
-import com.hfln.portal.infrastructure.service.RolePermissionService;
-import com.hfln.portal.infrastructure.service.RoleService;
-import com.hfln.portal.infrastructure.service.UserRoleService;
+import com.hfln.portal.infrastructure.service.*;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -31,7 +28,7 @@ public class UserAuthService {
 
 
 	@Autowired
-	private RoleService roleService;
+	private TblRoleService tblRoleService;
 
 	@Autowired
 	private RolePermissionService rolePermissionService;
@@ -85,7 +82,7 @@ public class UserAuthService {
 		}
 
 		List<Long> userIds = userRoles.stream().map(TblUserRole::getRoleId).collect(Collectors.toList());
-		List<TblRole> roles = roleService.findAvailableByIds(userIds);
+		List<TblRole> roles = tblRoleService.findAvailableByIds(userIds);
 		if (CollectionUtils.isEmpty(roles)) {
 			log.info("角色配置异常, userIds :{}", roles);
 			return set;
@@ -123,7 +120,7 @@ public class UserAuthService {
 		}
 
 		List<Long> userIds = userRoles.stream().map(TblUserRole::getRoleId).collect(Collectors.toList());
-		List<TblRole> roles = roleService.findAvailableByIds(userIds);
+		List<TblRole> roles = tblRoleService.findAvailableByIds(userIds);
 		if (CollectionUtils.isEmpty(roles)) {
 			log.info("角色配置异常, userIds :{}", roles);
 			return set;
@@ -139,7 +136,7 @@ public class UserAuthService {
 
         Set<String> set = new HashSet<>();
 
-        TblRole role = roleService.findAvailableByCode(roleCode);
+        TblRole role = tblRoleService.findAvailableByCode(roleCode);
         if (role == null) {
             log.info("角色配置异常, userIds :{}", role);
             return set;

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/TblRoleMenuMapMapper.java

@@ -0,0 +1,13 @@
+package com.hfln.portal.infrastructure.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.hfln.portal.infrastructure.po.TblRoleMenuMap;
+import org.apache.ibatis.annotations.Mapper;
+
+
+/**
+ * 角色菜单映射表 接口
+ */
+@Mapper
+public interface TblRoleMenuMapMapper extends BaseMapper<TblRoleMenuMap> {
+}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/TblRoleMenuMapper.java

@@ -1,12 +0,0 @@
-package com.hfln.portal.infrastructure.mapper;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hfln.portal.infrastructure.po.TblRoleMenu;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 角色表 Mapper 接口
- */
-@Mapper
-public interface TblRoleMenuMapper extends BaseMapper<TblRoleMenu> {
-} 

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/TblMenuMapper.java → portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/mapper/TblSystemMenuMapper.java

@@ -1,12 +1,14 @@
 package com.hfln.portal.infrastructure.mapper;
 
+
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.hfln.portal.infrastructure.po.TblMenu;
+import com.hfln.portal.infrastructure.po.TblSystemMenu;
 import org.apache.ibatis.annotations.Mapper;
 
+
 /**
- * 菜单表 Mapper 接口
+ * 新菜单表 Mapper 接口
  */
 @Mapper
-public interface TblMenuMapper extends BaseMapper<TblMenu> {
-} 
+public interface TblSystemMenuMapper extends BaseMapper<TblSystemMenu> {
+}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblMenu.java

@@ -1,50 +1,58 @@
-package com.hfln.portal.infrastructure.po;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-
-/**
- * 菜单表
- */
-@Data
-@EqualsAndHashCode(callSuper = true)
-@TableName("tbl_menu")
-public class TblMenu extends BasePO {
-
-    /**
-     * 主键ID
-     */
-    @TableId(value = "menu_id", type = IdType.ASSIGN_ID)
-    private Long menuId;
-
-    /**
-     * 菜单编码
-     */
-    private String menuCode;
-
-    /**
-     * 菜单名称
-     */
-    private String menuName;
-
-    /**
-     * 父菜单编码
-     */
-    private String parentCode;
-
-    /**
-     * 菜单URL
-     */
-    private String menuUrl;
-
-    /**
-     * 菜单图标
-     */
-    private String menuIcon;
-
-    /**
-     * 排序号
-     */
-    private Integer sort;
-} 
+//package com.hfln.portal.infrastructure.po;
+//
+//import com.baomidou.mybatisplus.annotation.*;
+//import lombok.Data;
+//import lombok.EqualsAndHashCode;
+//
+//*
+// * 菜单表
+//
+//
+//@Data
+//@EqualsAndHashCode(callSuper = true)
+//@TableName("tbl_menu")
+//public class TblMenu extends BasePO {
+//
+//*
+//     * 主键ID
+//
+//
+//    @TableId(value = "menu_id", type = IdType.ASSIGN_ID)
+//    private Long menuId;
+//
+//*
+//     * 菜单编码
+//
+//
+//    private String menuCode;
+//
+//*
+//     * 菜单名称
+//
+//
+//    private String menuName;
+//
+//*
+//     * 父菜单编码
+//
+//
+//    private String parentCode;
+//
+//*
+//     * 菜单URL
+//
+//
+//    private String menuUrl;
+//
+//*
+//     * 菜单图标
+//
+//
+//    private String menuIcon;
+//
+//*
+//     * 排序号
+//
+//
+//    private Integer sort;
+//}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblRoleMenu.java → portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblRoleMenuMap.java

@@ -1,5 +1,6 @@
 package com.hfln.portal.infrastructure.po;
 
+
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
@@ -7,27 +8,27 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
- * 角色表
+ * 角色菜单映射表
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
-@TableName("tbl_role_menu")
-public class TblRoleMenu extends BasePO {
+@TableName("tbl_role_menu_map")
+public class TblRoleMenuMap extends BasePO{
+
 
     /**
-     * 主键 ID
+     * 主键ID
      */
-    @TableId(type = IdType.ASSIGN_ID)
+    @TableId(value = "role_menu_id", type = IdType.ASSIGN_ID)
     private Long roleMenuId;
 
     /**
-     * 角色编码
+     * 角色ID
      */
     private Long roleId;
 
     /**
-     * 角色名称
+     * 菜单ID
      */
     private Long menuId;
-
-} 
+}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/po/TblSystemMenu.java

@@ -0,0 +1,110 @@
+package com.hfln.portal.infrastructure.po;
+
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * 新菜单表
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+@TableName("tbl_system_menu")
+public class TblSystemMenu extends BasePO{
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "menu_id", type = IdType.ASSIGN_ID)
+    private Long menuId;
+
+    /**
+     * 菜单名称
+     */
+    private String menuName;
+
+    /**
+     * 菜单类型
+     */
+    private Long menuType;
+
+    /**
+     * 父级ID
+     */
+    private Long parentId;
+
+    /**
+     * 显示排序
+     */
+    private Long sort;
+
+    /**
+     * 路由地址
+     */
+    private String path;
+
+    /**
+     * API路径
+     */
+    private String apiPath;
+
+    /**
+     * 组件路径
+     */
+    private String component;
+
+    /**
+     * 权限类型
+     */
+    private Long permsType;
+
+    /**
+     * 后端权限字符串
+     */
+    private String apiPerms;
+
+
+    /**
+     * 前端权限字符串
+     */
+    private String webPerms;
+
+    /**
+     * 菜单图标
+     */
+    private String icon;
+
+    /**
+     * 功能点关联菜单ID
+     */
+    private Long contextMenuId;
+
+    /**
+     * 是否外链：0-是, 1-否
+     */
+    private Integer frameFlag;
+
+    /**
+     * 外链地址
+     */
+    private String frameUrl;
+
+    /**
+     * 是否缓存：0-是, 1-否
+     */
+    private Integer cacheFlag;
+
+    /**
+     * 显示状态：0-显示, 1-隐藏
+     */
+    private Integer visibleFlag;
+
+    /**
+     * 是否禁用：0-启用, 1-禁用
+     */
+    private Integer disabledFlag;
+
+}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/MenuService.java

@@ -1,24 +0,0 @@
-//package com.hfln.portal.infrastructure.service;
-//
-//
-//import com.hfln.portal.domain.entity.MenuEntity;
-//import com.hfln.portal.domain.tree.TreeSelect;
-//
-//import java.util.List;
-//
-//public interface MenuService {
-//    /**
-//     * 构建前端所需要下拉树结构
-//     *
-//     * @param menus 菜单列表
-//     * @return 下拉树结构列表
-//     */
-//    List<TreeSelect> buildMenuTreeSelect(List<MenuEntity> menus);
-//    /**
-//     * 构建前端所需要树结构
-//     *
-//     * @param menus 菜单列表
-//     * @return 树结构列表
-//     */
-//    List<MenuEntity> buildMenuTree(List<MenuEntity> menus);
-//}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/RoleMenuService.java

@@ -1,9 +0,0 @@
-package com.hfln.portal.infrastructure.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hfln.portal.infrastructure.po.TblRoleMenu;
-
-public interface RoleMenuService extends IService<TblRoleMenu> {
-
-
-}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/RoleService.java

@@ -1,14 +0,0 @@
-package com.hfln.portal.infrastructure.service;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.hfln.portal.infrastructure.po.TblRole;
-
-import java.util.List;
-
-public interface RoleService extends IService<TblRole> {
-
-
-    List<TblRole> findAvailableByIds(List<Long> roleIds);
-
-    TblRole findAvailableByCode(String roleCode);
-}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/TblRoleMenuMapService.java

@@ -0,0 +1,7 @@
+package com.hfln.portal.infrastructure.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hfln.portal.infrastructure.po.TblRoleMenuMap;
+
+public interface TblRoleMenuMapService extends IService<TblRoleMenuMap> {
+}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/TblRoleService.java

@@ -3,7 +3,14 @@ package com.hfln.portal.infrastructure.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.hfln.portal.infrastructure.po.TblRole;
 
+import java.util.List;
+
 public interface TblRoleService extends IService<TblRole> {
 
+
+    List<TblRole> findAvailableByIds(List<Long> roleIds);
+
+    TblRole findAvailableByCode(String roleCode);
+
     TblRole queryByRoleCode(String roleCode);
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/TblSystemMenuService.java

@@ -0,0 +1,9 @@
+package com.hfln.portal.infrastructure.service;
+
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.hfln.portal.infrastructure.po.TblSystemMenu;
+
+public interface TblSystemMenuService extends IService<TblSystemMenu> {
+
+}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/MenuServiceImpl.java

@@ -1,81 +0,0 @@
-//package com.hfln.portal.infrastructure.service.impl;
-//
-//import com.hfln.portal.domain.entity.MenuEntity;
-//import com.hfln.portal.domain.tree.TreeSelect;
-//import com.hfln.portal.infrastructure.service.MenuService;
-//import org.springframework.stereotype.Service;
-//
-//import java.util.ArrayList;
-//import java.util.List;
-//import java.util.stream.Collectors;
-//
-///**
-// * @BelongsProject: harryDev
-// * @BelongsPackage: com.hfln.portal.infrastructure.service.impl
-// * @Author: huangls
-// * @CreateTime: 2023-10-17  16:25
-// * @Description: TODO
-// * @Version: 1.0
-// */
-//@Service
-//public class MenuServiceImpl implements MenuService {
-//    @Override
-//    public List<TreeSelect> buildMenuTreeSelect(List<MenuEntity> menus) {
-//        List<MenuEntity> menuTrees = buildMenuTree(menus);
-//        return menuTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
-//    }
-//
-//    @Override
-//    public List<MenuEntity> buildMenuTree(List<MenuEntity> menus) {
-//        List<MenuEntity> menuList = new ArrayList<>();
-//        List<Long> tempList = menus.stream().map(MenuEntity::getMenuId).collect(Collectors.toList());
-//        for (MenuEntity menu : menus) {
-//            // 如果是顶级节点, 遍历该父节点的所有子节点
-//            if (!tempList.contains(menu.getParentId())) {
-//                recursionFn(menus, menu);
-//                menuList.add(menu);
-//            }
-//        }
-//        if (menuList.isEmpty()) {
-//            menuList = menus;
-//        }
-//        return menuList;
-//    }
-//
-//    /**
-//     * 递归列表
-//     *
-//     * @param list 分类表
-//     * @param t    子节点
-//     */
-//    private void recursionFn(List<MenuEntity> list, MenuEntity t) {
-//        // 得到子节点列表
-//        List<MenuEntity> childList = getChildList(list, t);
-//        t.setChildren(childList);
-//        for (MenuEntity tChild : childList) {
-//            if (hasChild(list, tChild)) {
-//                recursionFn(list, tChild);
-//            }
-//        }
-//    }
-//
-//    /**
-//     * 得到子节点列表
-//     */
-//    private List<MenuEntity> getChildList(List<MenuEntity> list, MenuEntity t) {
-//        List<MenuEntity> tlist = new ArrayList<>();
-//        for (MenuEntity n : list) {
-//            if (n.getParentId().longValue() == t.getMenuId().longValue()) {
-//                tlist.add(n);
-//            }
-//        }
-//        return tlist;
-//    }
-//
-//    /**
-//     * 判断是否有子节点
-//     */
-//    private boolean hasChild(List<MenuEntity> list, MenuEntity t) {
-//        return getChildList(list, t).size() > 0;
-//    }
-//}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/RoleMenuServiceImpl.java

@@ -1,15 +0,0 @@
-package com.hfln.portal.infrastructure.service.impl;
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hfln.portal.infrastructure.mapper.TblRoleMenuMapper;
-import com.hfln.portal.infrastructure.po.TblRoleMenu;
-import com.hfln.portal.infrastructure.service.RoleMenuService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-@Service
-@Slf4j
-public class RoleMenuServiceImpl extends ServiceImpl<TblRoleMenuMapper, TblRoleMenu> implements RoleMenuService {
-
-
-}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/RoleServiceImpl.java

@@ -1,34 +0,0 @@
-package com.hfln.portal.infrastructure.service.impl;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.hfln.portal.infrastructure.mapper.TblRoleMapper;
-import com.hfln.portal.infrastructure.po.BasePO;
-import com.hfln.portal.infrastructure.po.TblRole;
-import com.hfln.portal.infrastructure.service.RoleService;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.stereotype.Service;
-
-import java.util.List;
-
-@Service
-@Slf4j
-public class RoleServiceImpl extends ServiceImpl<TblRoleMapper, TblRole> implements RoleService {
-
-
-    @Override
-    public List<TblRole> findAvailableByIds(List<Long> roleIds) {
-        LambdaQueryWrapper<TblRole> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(TblRole::getRoleId, roleIds);
-        queryWrapper.eq(TblRole::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
-        return this.baseMapper.selectList(queryWrapper);
-    }
-
-    @Override
-    public TblRole findAvailableByCode(String roleCode) {
-        LambdaQueryWrapper<TblRole> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(TblRole::getRoleCode, roleCode);
-        queryWrapper.eq(TblRole::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
-        return this.baseMapper.selectOne(queryWrapper);
-    }
-}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/TblRoleMenuMapServiceImpl.java

@@ -0,0 +1,13 @@
+package com.hfln.portal.infrastructure.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hfln.portal.infrastructure.mapper.TblRoleMenuMapMapper;
+import com.hfln.portal.infrastructure.po.TblRoleMenuMap;
+import com.hfln.portal.infrastructure.service.TblRoleMenuMapService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+@Service
+@Slf4j
+public class TblRoleMenuMapServiceImpl extends ServiceImpl<TblRoleMenuMapMapper, TblRoleMenuMap> implements TblRoleMenuMapService {
+}

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/TblRoleServiceImpl.java

@@ -9,11 +9,31 @@ import com.hfln.portal.infrastructure.service.TblRoleService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 
 @Service
 @Slf4j
 public class TblRoleServiceImpl extends ServiceImpl<TblRoleMapper, TblRole> implements TblRoleService {
 
+
+    @Override
+    public List<TblRole> findAvailableByIds(List<Long> roleIds) {
+        LambdaQueryWrapper<TblRole> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(TblRole::getRoleId, roleIds);
+        queryWrapper.eq(TblRole::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
+        return this.baseMapper.selectList(queryWrapper);
+    }
+
+    @Override
+    public TblRole findAvailableByCode(String roleCode) {
+        LambdaQueryWrapper<TblRole> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(TblRole::getRoleCode, roleCode);
+        queryWrapper.eq(TblRole::getIsDeleted, BasePO.DeleteFlag.NOT_DELETED);
+        return this.baseMapper.selectOne(queryWrapper);
+    }
+
+    @Override
     public TblRole queryByRoleCode(String roleCode){
         LambdaQueryWrapper<TblRole> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(TblRole::getRoleCode, roleCode);
@@ -21,4 +41,6 @@ public class TblRoleServiceImpl extends ServiceImpl<TblRoleMapper, TblRole> impl
         TblRole tblRole = this.baseMapper.selectOne(queryWrapper);
         return tblRole;
     }
+
+
 }

portal-service-infrastructure/src/main/java/com/hfln/portal/infrastructure/service/impl/TblSystemMenuServiceImpl.java

@@ -0,0 +1,14 @@
+package com.hfln.portal.infrastructure.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.hfln.portal.infrastructure.mapper.TblSystemMenuMapper;
+import com.hfln.portal.infrastructure.po.TblSystemMenu;
+import com.hfln.portal.infrastructure.service.TblSystemMenuService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+
+@Service
+@Slf4j
+public class TblSystemMenuServiceImpl extends ServiceImpl<TblSystemMenuMapper, TblSystemMenu> implements TblSystemMenuService {
+}