Add group role tables

src/main/kotlin/top/fatweb/api/config/InitConfig.kt

@@ -7,7 +7,7 @@ import org.slf4j.LoggerFactory
 import org.springframework.security.crypto.password.PasswordEncoder
 import org.springframework.stereotype.Component
 import top.fatweb.api.entity.permission.User
-import top.fatweb.api.service.IUserService
+import top.fatweb.api.service.permission.IUserService
 import kotlin.random.Random
 
 @Component

src/main/kotlin/top/fatweb/api/entity/permission/Element.kt

@@ -0,0 +1,43 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.TableField
+import com.baomidou.mybatisplus.annotation.TableId
+import com.baomidou.mybatisplus.annotation.TableName
+import java.io.Serializable
+
+/**
+ * <p>
+ * 页面元素
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_element")
+class Element : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 元素名
+     */
+    @TableField("name")
+    var name: String? = null
+
+    /**
+     * 权限ID
+     */
+    @TableField("power_id")
+    var powerId: Long? = null
+
+    /**
+     * 菜单ID
+     */
+    @TableField("menu_id")
+    var menuId: Long? = null
+
+    override fun toString(): String {
+        return "Element(id=$id, name=$name, powerId=$powerId, menuId=$menuId)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/Group.kt

@@ -0,0 +1,46 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.*
+import java.io.Serializable
+
+/**
+ * <p>
+ * 用户组
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_group")
+class Group : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 用户组名
+     */
+    @TableField("name")
+    var name: String? = null
+
+    /**
+     * 启用
+     */
+    @TableField("enable")
+    var enable: Int? = null
+
+    @TableField("deleted")
+    @TableLogic
+    var deleted: Long? = null
+
+    @TableField("version")
+    @Version
+    var version: Int? = null
+
+    @TableField(exist = false)
+    var roles: List<Role>? = null
+
+    override fun toString(): String {
+        return "Group(id=$id, name=$name, enable=$enable, deleted=$deleted, version=$version, roles=$roles)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/Menu.kt

@@ -0,0 +1,49 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.TableField
+import com.baomidou.mybatisplus.annotation.TableId
+import com.baomidou.mybatisplus.annotation.TableName
+import java.io.Serializable
+
+/**
+ * <p>
+ * 菜单
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_menu")
+class Menu : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     *  菜单名
+     */
+    @TableField("name")
+    var name: String? = null
+
+    /**
+     * URL
+     */
+    @TableField("url")
+    var url: String? = null
+
+    /**
+     * 权限ID
+     */
+    @TableField("power_id")
+    var powerId: Long? = null
+
+    /**
+     * 父ID
+     */
+    @TableField("parent_id")
+    var parentId: Long? = null
+
+    override fun toString(): String {
+        return "Menu(id=$id, name=$name, url=$url, powerId=$powerId, parentId=$parentId)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/Operation.kt

@@ -0,0 +1,55 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.TableField
+import com.baomidou.mybatisplus.annotation.TableId
+import com.baomidou.mybatisplus.annotation.TableName
+import java.io.Serializable
+
+/**
+ * <p>
+ * 功能
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_operation")
+class Operation : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 功能名
+     */
+    @TableField("name")
+    var name: String? = null
+
+    /**
+     * 功能编码
+     */
+    @TableField("code")
+    var code: String? = null
+
+    /**
+     * 权限ID
+     */
+    @TableField("power_id")
+    var powerId: Long? = null
+
+    /**
+     * 父ID
+     */
+    @TableField("parent_id")
+    var parentId: Long? = null
+
+    /**
+     * 页面元素ID
+     */
+    @TableField("element_id")
+    var elementId: Long? = null
+
+    override fun toString(): String {
+        return "Operation(id=$id, name=$name, code=$code, powerId=$powerId, parentId=$parentId, elementId=$elementId)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/Power.kt

@@ -0,0 +1,31 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.TableField
+import com.baomidou.mybatisplus.annotation.TableId
+import com.baomidou.mybatisplus.annotation.TableName
+import java.io.Serializable
+
+/**
+ * <p>
+ * 权限
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_power")
+class Power : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 权限类型
+     */
+    @TableField("type_id")
+    var typeId: Long? = null
+
+    override fun toString(): String {
+        return "Power(id=$id, typeId=$typeId)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/PowerRole.kt

@@ -0,0 +1,43 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.*
+import java.io.Serializable
+
+/**
+ * <p>
+ * 中间表-权限-角色
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_power_role")
+class PowerRole : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 权限
+     */
+    @TableField("power_id")
+    var powerId: Long? = null
+
+    /**
+     * 角色
+     */
+    @TableField("role_id")
+    var roleId: Long? = null
+
+    @TableField("deleted")
+    @TableLogic
+    var deleted: Long? = null
+
+    @TableField("version")
+    @Version
+    var version: Int? = null
+
+    override fun toString(): String {
+        return "PowerRole(id=$id, powerId=$powerId, roleId=$roleId, deleted=$deleted, version=$version)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/PowerType.kt

@@ -0,0 +1,31 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.TableField
+import com.baomidou.mybatisplus.annotation.TableId
+import com.baomidou.mybatisplus.annotation.TableName
+import java.io.Serializable
+
+/**
+ * <p>
+ * 权限类型
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_power_type")
+class PowerType : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 权限类型名
+     */
+    @TableField("name")
+    var name: String? = null
+
+    override fun toString(): String {
+        return "PowerType(id=$id, name=$name)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/Role.kt

@@ -0,0 +1,55 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.*
+import java.io.Serializable
+
+/**
+ * <p>
+ * 角色
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_role")
+class Role : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 角色名
+     */
+    @TableField("name")
+    var name: String? = null
+
+    /**
+     * 启用
+     */
+    @TableField("enable")
+    var enable: Int? = null
+
+    @TableField("deleted")
+    @TableLogic
+    var deleted: Long? = null
+
+    @TableField("version")
+    @Version
+    var version: Int? = null
+
+    @TableField(exist = false)
+    var menus: List<Menu>? = null
+
+    @TableField(exist = false)
+    var elements: List<Element>? = null
+
+    @TableField(exist = false)
+    var operations: List<Operation>? = null
+
+    @TableField(exist = false)
+    var powers: List<Power>? = null
+
+    override fun toString(): String {
+        return "Role(id=$id, name=$name, enable=$enable, deleted=$deleted, version=$version, menus=$menus, elements=$elements, operations=$operations, powers=$powers)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/RoleGroup.kt

@@ -0,0 +1,43 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.*
+import java.io.Serializable
+
+/**
+ * <p>
+ * 中间表-角色-用户组
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_role_group")
+class RoleGroup : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 角色
+     */
+    @TableField("role_id")
+    var roleId: Long? = null
+
+    /**
+     * 群组
+     */
+    @TableField("group_id")
+    var groupId: Long? = null
+
+    @TableField("deleted")
+    @TableLogic
+    var deleted: Long? = null
+
+    @TableField("version")
+    @Version
+    var version: Int? = null
+
+    override fun toString(): String {
+        return "RoleGroup(id=$id, roleId=$roleId, groupId=$groupId, deleted=$deleted, version=$version)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/User.kt

@@ -92,7 +92,22 @@ class User() : Serializable {
     @Version
     var version: Int? = null
 
+    @TableField(exist = false)
+    var roles: List<Role>? = null
+
+    @TableField(exist = false)
+    var groups: List<Group>? = null
+
+    @TableField(exist = false)
+    var menus: List<Menu>? = null
+
+    @TableField(exist = false)
+    var elements: List<Element>? = null
+
+    @TableField(exist = false)
+    var operations: List<Operation>? = null
+
     override fun toString(): String {
-        return "User(id=$id, username=$username, password=$password, locking=$locking, expiration=$expiration, credentialsExpiration=$credentialsExpiration, enable=$enable, lastLoginTime=$lastLoginTime, lastLoginIp=$lastLoginIp, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version)"
+        return "User(id=$id, username=$username, password=$password, locking=$locking, expiration=$expiration, credentialsExpiration=$credentialsExpiration, enable=$enable, lastLoginTime=$lastLoginTime, lastLoginIp=$lastLoginIp, createTime=$createTime, updateTime=$updateTime, deleted=$deleted, version=$version, roles=$roles, groups=$groups, menus=$menus, elements=$elements, operations=$operations)"
     }
 }

src/main/kotlin/top/fatweb/api/entity/permission/UserGroup.kt

@@ -0,0 +1,43 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.*
+import java.io.Serializable
+
+/**
+ * <p>
+ * 中间表-用户-用户组
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_user_group")
+class UserGroup : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 用户
+     */
+    @TableField("user_id")
+    var userId: Long? = null
+
+    /**
+     * 用户组
+     */
+    @TableField("group_id")
+    var groupId: Long? = null
+
+    @TableField("deleted")
+    @TableLogic
+    var deleted: Long? = null
+
+    @TableField("version")
+    @Version
+    var version: Int? = null
+
+    override fun toString(): String {
+        return "UserGroup(id=$id, userId=$userId, groupId=$groupId, deleted=$deleted, version=$version)"
+    }
+}

src/main/kotlin/top/fatweb/api/entity/permission/UserRole.kt

@@ -0,0 +1,43 @@
+package top.fatweb.api.entity.permission
+
+import com.baomidou.mybatisplus.annotation.*
+import java.io.Serializable
+
+/**
+ * <p>
+ * 中间表-用户-角色
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@TableName("t_user_role")
+class UserRole : Serializable {
+
+    @TableId("id")
+    var id: Long? = null
+
+    /**
+     * 用户
+     */
+    @TableField("user_id")
+    var userId: Long? = null
+
+    /**
+     * 角色
+     */
+    @TableField("role_id")
+    var roleId: Long? = null
+
+    @TableField("deleted")
+    @TableLogic
+    var deleted: Long? = null
+
+    @TableField("version")
+    @Version
+    var version: Int? = null
+
+    override fun toString(): String {
+        return "UserRole(id=$id, userId=$userId, roleId=$roleId, deleted=$deleted, version=$version)"
+    }
+}

src/main/kotlin/top/fatweb/api/mapper/permission/ElementMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.Element
+
+/**
+ * <p>
+ * 页面元素 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface ElementMapper : BaseMapper<Element>

src/main/kotlin/top/fatweb/api/mapper/permission/GroupMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.Group
+
+/**
+ * <p>
+ * 用户组 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface GroupMapper : BaseMapper<Group>

src/main/kotlin/top/fatweb/api/mapper/permission/MenuMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.Menu
+
+/**
+ * <p>
+ * 菜单 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface MenuMapper : BaseMapper<Menu>

src/main/kotlin/top/fatweb/api/mapper/permission/OperationMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.Operation
+
+/**
+ * <p>
+ * 功能 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface OperationMapper : BaseMapper<Operation>

src/main/kotlin/top/fatweb/api/mapper/permission/PowerMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.Power
+
+/**
+ * <p>
+ * 权限 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface PowerMapper : BaseMapper<Power>

src/main/kotlin/top/fatweb/api/mapper/permission/PowerRoleMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.PowerRole
+
+/**
+ * <p>
+ * 中间表-权限-角色 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface PowerRoleMapper : BaseMapper<PowerRole>

src/main/kotlin/top/fatweb/api/mapper/permission/PowerTypeMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.PowerType
+
+/**
+ * <p>
+ * 权限类型 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface PowerTypeMapper : BaseMapper<PowerType>

src/main/kotlin/top/fatweb/api/mapper/permission/RoleGroupMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.RoleGroup
+
+/**
+ * <p>
+ * 中间表-角色-用户组 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface RoleGroupMapper : BaseMapper<RoleGroup>

src/main/kotlin/top/fatweb/api/mapper/permission/RoleMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.Role
+
+/**
+ * <p>
+ * 角色 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface RoleMapper : BaseMapper<Role>

src/main/kotlin/top/fatweb/api/mapper/permission/UserGroupMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.UserGroup
+
+/**
+ * <p>
+ * 中间表-用户-用户组 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface UserGroupMapper : BaseMapper<UserGroup>

src/main/kotlin/top/fatweb/api/mapper/permission/UserMapper.kt

@@ -1,4 +1,4 @@
-package top.fatweb.api.mapper
+package top.fatweb.api.mapper.permission
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.apache.ibatis.annotations.Mapper

src/main/kotlin/top/fatweb/api/mapper/permission/UserRoleMapper.kt

@@ -0,0 +1,16 @@
+package top.fatweb.api.mapper.permission
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper
+import org.apache.ibatis.annotations.Mapper
+import top.fatweb.api.entity.permission.UserRole
+
+/**
+ * <p>
+ * 中间表-用户-角色 Mapper 接口
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Mapper
+interface UserRoleMapper : BaseMapper<UserRole>

src/main/kotlin/top/fatweb/api/service/permission/IElementService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.Element
+
+/**
+ * <p>
+ * 页面元素 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IElementService : IService<Element>

src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.Group
+
+/**
+ * <p>
+ * 用户组 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IGroupService : IService<Group>

src/main/kotlin/top/fatweb/api/service/permission/IMenuService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.Menu
+
+/**
+ * <p>
+ * 菜单 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IMenuService : IService<Menu>

src/main/kotlin/top/fatweb/api/service/permission/IOperationService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.Operation
+
+/**
+ * <p>
+ * 功能 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IOperationService : IService<Operation>

src/main/kotlin/top/fatweb/api/service/permission/IPowerRoleService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.PowerRole
+
+/**
+ * <p>
+ * 中间表-权限-角色 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IPowerRoleService : IService<PowerRole>

src/main/kotlin/top/fatweb/api/service/permission/IPowerService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.Power
+
+/**
+ * <p>
+ * 权限 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IPowerService : IService<Power>

src/main/kotlin/top/fatweb/api/service/permission/IPowerTypeService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.PowerType
+
+/**
+ * <p>
+ * 权限类型 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IPowerTypeService : IService<PowerType>

src/main/kotlin/top/fatweb/api/service/permission/IRoleGroupService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.RoleGroup
+
+/**
+ * <p>
+ * 中间表-角色-用户组 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IRoleGroupService : IService<RoleGroup>

src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.Role
+
+/**
+ * <p>
+ * 角色 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IRoleService : IService<Role>

src/main/kotlin/top/fatweb/api/service/permission/IUserGroupService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.UserGroup
+
+/**
+ * <p>
+ * 中间表-用户-用户组 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IUserGroupService : IService<UserGroup>

src/main/kotlin/top/fatweb/api/service/permission/IUserRoleService.kt

@@ -0,0 +1,14 @@
+package top.fatweb.api.service.permission
+
+import com.baomidou.mybatisplus.extension.service.IService
+import top.fatweb.api.entity.permission.UserRole
+
+/**
+ * <p>
+ * 中间表-用户-角色 服务类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+interface IUserRoleService : IService<UserRole>

src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt

@@ -1,4 +1,4 @@
-package top.fatweb.api.service
+package top.fatweb.api.service.permission
 
 import com.baomidou.mybatisplus.extension.service.IService
 import top.fatweb.api.entity.permission.User

src/main/kotlin/top/fatweb/api/service/permission/impl/AuthenticationServiceImpl.kt

@@ -11,8 +11,8 @@ import top.fatweb.api.constant.SecurityConstants
 import top.fatweb.api.entity.permission.LoginUser
 import top.fatweb.api.entity.permission.User
 import top.fatweb.api.exception.TokenHasExpiredException
-import top.fatweb.api.service.IUserService
 import top.fatweb.api.service.permission.IAuthenticationService
+import top.fatweb.api.service.permission.IUserService
 import top.fatweb.api.util.JwtUtil
 import top.fatweb.api.util.RedisUtil
 import top.fatweb.api.util.WebUtil

src/main/kotlin/top/fatweb/api/service/permission/impl/ElementServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.Element
+import top.fatweb.api.mapper.permission.ElementMapper
+import top.fatweb.api.service.permission.IElementService
+
+/**
+ * <p>
+ * 页面元素 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class ElementServiceImpl : ServiceImpl<ElementMapper, Element>(), IElementService

src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.Group
+import top.fatweb.api.mapper.permission.GroupMapper
+import top.fatweb.api.service.permission.IGroupService
+
+/**
+ * <p>
+ * 用户组 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class GroupServiceImpl : ServiceImpl<GroupMapper, Group>(), IGroupService

src/main/kotlin/top/fatweb/api/service/permission/impl/MenuServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.Menu
+import top.fatweb.api.mapper.permission.MenuMapper
+import top.fatweb.api.service.permission.IMenuService
+
+/**
+ * <p>
+ * 菜单 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class MenuServiceImpl : ServiceImpl<MenuMapper, Menu>(), IMenuService

src/main/kotlin/top/fatweb/api/service/permission/impl/OperationServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.Operation
+import top.fatweb.api.mapper.permission.OperationMapper
+import top.fatweb.api.service.permission.IOperationService
+
+/**
+ * <p>
+ * 功能 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class OperationServiceImpl : ServiceImpl<OperationMapper, Operation>(), IOperationService

src/main/kotlin/top/fatweb/api/service/permission/impl/PowerRoleServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.PowerRole
+import top.fatweb.api.mapper.permission.PowerRoleMapper
+import top.fatweb.api.service.permission.IPowerRoleService
+
+/**
+ * <p>
+ * 中间表-权限-角色 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class PowerRoleServiceImpl : ServiceImpl<PowerRoleMapper, PowerRole>(), IPowerRoleService

src/main/kotlin/top/fatweb/api/service/permission/impl/PowerServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.Power
+import top.fatweb.api.mapper.permission.PowerMapper
+import top.fatweb.api.service.permission.IPowerService
+
+/**
+ * <p>
+ * 权限 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class PowerServiceImpl : ServiceImpl<PowerMapper, Power>(), IPowerService

src/main/kotlin/top/fatweb/api/service/permission/impl/PowerTypeServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.PowerType
+import top.fatweb.api.mapper.permission.PowerTypeMapper
+import top.fatweb.api.service.permission.IPowerTypeService
+
+/**
+ * <p>
+ * 权限类型 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class PowerTypeServiceImpl : ServiceImpl<PowerTypeMapper, PowerType>(), IPowerTypeService

src/main/kotlin/top/fatweb/api/service/permission/impl/RoleGroupServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.RoleGroup
+import top.fatweb.api.mapper.permission.RoleGroupMapper
+import top.fatweb.api.service.permission.IRoleGroupService
+
+/**
+ * <p>
+ * 中间表-角色-用户组 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class RoleGroupServiceImpl : ServiceImpl<RoleGroupMapper, RoleGroup>(), IRoleGroupService

src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.Role
+import top.fatweb.api.mapper.permission.RoleMapper
+import top.fatweb.api.service.permission.IRoleService
+
+/**
+ * <p>
+ * 角色 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class RoleServiceImpl : ServiceImpl<RoleMapper, Role>(), IRoleService

src/main/kotlin/top/fatweb/api/service/permission/impl/UserDetailsServiceImpl.kt

@@ -6,7 +6,7 @@ import org.springframework.security.core.userdetails.UserDetailsService
 import org.springframework.stereotype.Service
 import top.fatweb.api.entity.permission.LoginUser
 import top.fatweb.api.entity.permission.User
-import top.fatweb.api.service.IUserService
+import top.fatweb.api.service.permission.IUserService
 
 @Service
 class UserDetailsServiceImpl(val userService: IUserService) : UserDetailsService {

src/main/kotlin/top/fatweb/api/service/permission/impl/UserGroupServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.UserGroup
+import top.fatweb.api.mapper.permission.UserGroupMapper
+import top.fatweb.api.service.permission.IUserGroupService
+
+/**
+ * <p>
+ * 中间表-用户-用户组 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class UserGroupServiceImpl : ServiceImpl<UserGroupMapper, UserGroup>(), IUserGroupService

src/main/kotlin/top/fatweb/api/service/permission/impl/UserRoleServiceImpl.kt

@@ -0,0 +1,18 @@
+package top.fatweb.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.api.entity.permission.UserRole
+import top.fatweb.api.mapper.permission.UserRoleMapper
+import top.fatweb.api.service.permission.IUserRoleService
+
+/**
+ * <p>
+ * 中间表-用户-角色 服务实现类
+ * </p>
+ *
+ * @author FatttSnake
+ * @since 2023-10-25
+ */
+@Service
+class UserRoleServiceImpl : ServiceImpl<UserRoleMapper, UserRole>(), IUserRoleService

src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt

@@ -1,10 +1,10 @@
-package top.fatweb.api.service.impl
+package top.fatweb.api.service.permission.impl
 
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
 import top.fatweb.api.entity.permission.User
-import top.fatweb.api.mapper.UserMapper
+import top.fatweb.api.mapper.permission.UserMapper
-import top.fatweb.api.service.IUserService
+import top.fatweb.api.service.permission.IUserService
 
 /**
  * <p>

src/main/resources/db/migration/R__Basic_data.sql

@@ -41,9 +41,9 @@ on duplicate key update name      = values(name),
 
 insert into t_element(id, name, power_id, menu_id)
 values (1010100, '公用', id, 1010000),
-       (101010100, '基础', id, 101010000),
+       (101010100, '角色基础', id, 101010000),
-       (102010100, '基础', id, 102010000),
+       (102010100, '用户组基础', id, 102010000),
-       (103010100, '基础', id, 103010000)
+       (103010100, '用户基础', id, 103010000)
 on duplicate key update name    = values(name),
                         power_id=values(power_id),
                         menu_id = values(menu_id);

src/main/resources/db/migration/V1_0_0_231024__Add_table_'t_power'.sql

@@ -2,6 +2,6 @@ drop table if exists t_power;
 
 create table if not exists t_power
 (
-    `id`      bigint not null primary key,
+    id      bigint not null primary key,
-    `type_id` bigint not null comment '权限类型'
+    type_id bigint not null comment '权限类型'
 ) comment '权限';

src/main/resources/db/migration/V1_0_0_231025__Add_table_'t_menu'.sql

@@ -2,9 +2,9 @@ drop table if exists t_menu;
 
 create table if not exists t_menu
 (
-    `id`        bigint       not null primary key,
+    id        bigint       not null primary key,
-    `name`      varchar(30)  not null comment ' 菜单名',
+    name      varchar(30)  not null comment ' 菜单名',
-    `url`       varchar(100) null comment 'URL',
+    url       varchar(100) null comment 'URL',
-    `power_id`  bigint       not null comment '权限ID',
+    power_id  bigint       not null comment '权限ID',
-    `parent_id` bigint       null comment '父ID'
+    parent_id bigint       null comment '父ID'
 ) comment '菜单';

src/main/resources/db/migration/V1_0_0_231026__Add_table_'t_element'.sql

@@ -2,8 +2,8 @@ drop table if exists t_element;
 
 create table if not exists t_element
 (
-    `id`       bigint       not null primary key,
+    id       bigint       not null primary key,
-    `name`     varchar(100) not null comment '元素名',
+    name     varchar(100) not null comment '元素名',
-    `power_id` bigint       not null comment '权限ID',
+    power_id bigint       not null comment '权限ID',
-    `menu_id`  bigint       not null comment '菜单ID'
+    menu_id  bigint       not null comment '菜单ID'
 ) comment '页面元素';

src/main/resources/db/migration/V1_0_0_231027__Add_table_'t_operation'.sql

@@ -2,10 +2,10 @@ drop table if exists t_operation;
 
 create table if not exists t_operation
 (
-    `id`         bigint      not null primary key,
+    id         bigint      not null primary key,
-    `name`       varchar(50) not null comment '功能名',
+    name       varchar(50) not null comment '功能名',
-    `code`       varchar(50) null comment '功能编码',
+    code       varchar(50) null comment '功能编码',
-    `power_id`   bigint      not null comment '权限ID',
+    power_id   bigint      not null comment '权限ID',
-    `parent_id`  bigint      null comment '父ID',
+    parent_id  bigint      null comment '父ID',
-    `element_id` bigint      not null comment '页面元素ID'
+    element_id bigint      not null comment '页面元素ID'
 ) comment '功能';

src/main/resources/db/migration/V1_0_0_231028__Add_table_'t_group'.sql

@@ -0,0 +1,11 @@
+drop table if exists t_group;
+
+create table if not exists t_group
+(
+    id      bigint      not null primary key,
+    name    varchar(30) not null comment '用户组名',
+    enable  int         not null comment '启用',
+    deleted bigint      not null default 0,
+    version int         not null default 0,
+    constraint t_group_unique unique (name, deleted)
+) comment '用户组';

src/main/resources/db/migration/V1_0_0_231029__Add_table_'t_user_group'.sql

@@ -0,0 +1,10 @@
+drop table if exists t_user_group;
+
+create table if not exists t_user_group
+(
+    id       bigint not null primary key,
+    user_id  bigint not null comment '用户',
+    group_id bigint not null comment '用户组',
+    deleted  bigint not null default 0,
+    version  int    not null default 0
+) comment '中间表-用户-用户组';

src/main/resources/db/migration/V1_0_0_231030__Add_table_'t_role'.sql

@@ -0,0 +1,11 @@
+drop table if exists t_role;
+
+create table if not exists t_role
+(
+    id      bigint      not null primary key,
+    name    varchar(20) not null comment '角色名',
+    enable  int         not null comment '启用',
+    deleted bigint      not null default 0,
+    version int         not null default 0,
+    constraint t_role_unique unique (name, deleted)
+) comment '角色';

src/main/resources/db/migration/V1_0_0_231031__Add_table_'t_role_group'.sql

@@ -0,0 +1,10 @@
+drop table if exists t_role_group;
+
+create table if not exists t_role_group
+(
+    id       bigint not null primary key,
+    role_id  bigint not null comment '角色',
+    group_id bigint not null comment '群组',
+    deleted  bigint not null default 0,
+    version  int    not null default 0
+) comment '中间表-角色-用户组';

src/main/resources/db/migration/V1_0_0_231101__Add_table_'t_user_role'.sql

@@ -0,0 +1,10 @@
+drop table if exists t_user_role;
+
+create table if not exists t_user_role
+(
+    id      bigint not null primary key,
+    user_id bigint not null comment '用户',
+    role_id bigint not null comment '角色',
+    deleted bigint not null default 0,
+    version int    not null default 0
+) comment '中间表-用户-角色';

src/main/resources/db/migration/V1_0_0_231102__Add_table_'t_power_role'.sql

@@ -0,0 +1,10 @@
+drop table if exists t_power_role;
+
+create table if not exists t_power_role
+(
+    id       bigint not null primary key,
+    power_id bigint not null comment '权限',
+    role_id  bigint not null comment '角色',
+    deleted  bigint not null default 0,
+    version  int    not null default 0
+) comment '中间表-权限-角色';

src/main/resources/mapper/permission/ElementMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.ElementMapper">
+
+</mapper>

src/main/resources/mapper/permission/GroupMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.GroupMapper">
+
+</mapper>

src/main/resources/mapper/permission/MenuMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.MenuMapper">
+
+</mapper>

src/main/resources/mapper/permission/OperationMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.OperationMapper">
+
+</mapper>

src/main/resources/mapper/permission/PowerMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.PowerMapper">
+
+</mapper>

src/main/resources/mapper/permission/PowerRoleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.PowerRoleMapper">
+
+</mapper>

src/main/resources/mapper/permission/PowerTypeMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.PowerTypeMapper">
+
+</mapper>

src/main/resources/mapper/permission/RoleGroupMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.RoleGroupMapper">
+
+</mapper>

src/main/resources/mapper/permission/RoleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.RoleMapper">
+
+</mapper>

src/main/resources/mapper/permission/UserGroupMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.UserGroupMapper">
+
+</mapper>

src/main/resources/mapper/permission/UserMapper.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="top.fatweb.api.mapper.UserMapper">
+<mapper namespace="top.fatweb.api.mapper.permission.UserMapper">
 
 </mapper>

src/main/resources/mapper/permission/UserRoleMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="top.fatweb.api.mapper.permission.UserRoleMapper">
+
+</mapper>