Rename classes

src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RPowerRole.kt

@@ -10,7 +10,7 @@ import java.io.Serializable
  * @since 1.0.0
  */
 @TableName("t_r_power_role")
-class PowerRole : Serializable {
+class RPowerRole : Serializable {
     /**
      * ID
      *
@@ -59,6 +59,6 @@ class PowerRole : Serializable {
     var version: Int? = null
 
     override fun toString(): String {
-        return "PowerRole(id=$id, powerId=$powerId, roleId=$roleId, deleted=$deleted, version=$version)"
+        return "RPowerRole(id=$id, powerId=$powerId, roleId=$roleId, deleted=$deleted, version=$version)"
     }
 }

src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RRoleGroup.kt

@@ -10,7 +10,7 @@ import java.io.Serializable
  * @since 1.0.0
  */
 @TableName("t_r_role_group")
-class RoleGroup : Serializable {
+class RRoleGroup : Serializable {
     /**
      * ID
      *
@@ -59,6 +59,6 @@ class RoleGroup : Serializable {
     var version: Int? = null
 
     override fun toString(): String {
-        return "RoleGroup(id=$id, roleId=$roleId, groupId=$groupId, deleted=$deleted, version=$version)"
+        return "RRoleGroup(id=$id, roleId=$roleId, groupId=$groupId, deleted=$deleted, version=$version)"
     }
 }

src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RUserGroup.kt

@@ -10,7 +10,7 @@ import java.io.Serializable
  * @since 1.0.0
  */
 @TableName("t_r_user_group")
-class UserGroup : Serializable {
+class RUserGroup : Serializable {
     /**
      * ID
      *
@@ -59,6 +59,6 @@ class UserGroup : Serializable {
     var version: Int? = null
 
     override fun toString(): String {
-        return "UserGroup(id=$id, userId=$userId, groupId=$groupId, deleted=$deleted, version=$version)"
+        return "RUserGroup(id=$id, userId=$userId, groupId=$groupId, deleted=$deleted, version=$version)"
     }
 }

src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RUserRole.kt

@@ -10,7 +10,7 @@ import java.io.Serializable
  * @since 1.0.0
  */
 @TableName("t_r_user_role")
-class UserRole : Serializable {
+class RUserRole : Serializable {
     /**
      * ID
      *
@@ -59,6 +59,6 @@ class UserRole : Serializable {
     var version: Int? = null
 
     override fun toString(): String {
-        return "UserRole(id=$id, userId=$userId, roleId=$roleId, deleted=$deleted, version=$version)"
+        return "RUserRole(id=$id, userId=$userId, roleId=$roleId, deleted=$deleted, version=$version)"
     }
 }

src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RPowerRoleMapper.kt

@@ -2,7 +2,7 @@ package top.fatweb.oxygen.api.mapper.permission
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.apache.ibatis.annotations.Mapper
-import top.fatweb.oxygen.api.entity.permission.PowerRole
+import top.fatweb.oxygen.api.entity.permission.RPowerRole
 
 /**
  * Power role intermediate mapper
@@ -10,7 +10,7 @@ import top.fatweb.oxygen.api.entity.permission.PowerRole
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see BaseMapper
- * @see PowerRole
+ * @see RPowerRole
  */
 @Mapper
-interface PowerRoleMapper : BaseMapper<PowerRole>
+interface RPowerRoleMapper : BaseMapper<RPowerRole>

src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RRoleGroupMapper.kt

@@ -2,7 +2,7 @@ package top.fatweb.oxygen.api.mapper.permission
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.apache.ibatis.annotations.Mapper
-import top.fatweb.oxygen.api.entity.permission.RoleGroup
+import top.fatweb.oxygen.api.entity.permission.RRoleGroup
 
 /**
  * Role group intermediate mapper
@@ -10,7 +10,7 @@ import top.fatweb.oxygen.api.entity.permission.RoleGroup
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see BaseMapper
- * @see RoleGroup
+ * @see RRoleGroup
  */
 @Mapper
-interface RoleGroupMapper : BaseMapper<RoleGroup>
+interface RRoleGroupMapper : BaseMapper<RRoleGroup>

src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RUserGroupMapper.kt

@@ -2,7 +2,7 @@ package top.fatweb.oxygen.api.mapper.permission
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.apache.ibatis.annotations.Mapper
-import top.fatweb.oxygen.api.entity.permission.UserGroup
+import top.fatweb.oxygen.api.entity.permission.RUserGroup
 
 /**
  * User group intermediate mapper
@@ -10,7 +10,7 @@ import top.fatweb.oxygen.api.entity.permission.UserGroup
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see BaseMapper
- * @see UserGroup
+ * @see RUserGroup
  */
 @Mapper
-interface UserGroupMapper : BaseMapper<UserGroup>
+interface RUserGroupMapper : BaseMapper<RUserGroup>

src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RUserRoleMapper.kt

@@ -2,7 +2,7 @@ package top.fatweb.oxygen.api.mapper.permission
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper
 import org.apache.ibatis.annotations.Mapper
-import top.fatweb.oxygen.api.entity.permission.UserRole
+import top.fatweb.oxygen.api.entity.permission.RUserRole
 
 /**
  * User role intermediate mapper
@@ -10,7 +10,7 @@ import top.fatweb.oxygen.api.entity.permission.UserRole
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see BaseMapper
- * @see UserRole
+ * @see RUserRole
  */
 @Mapper
-interface UserRoleMapper : BaseMapper<UserRole>
+interface RUserRoleMapper : BaseMapper<RUserRole>

src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRPowerRoleService.kt

@@ -1,7 +1,7 @@
 package top.fatweb.oxygen.api.service.permission
 
 import com.baomidou.mybatisplus.extension.service.IService
-import top.fatweb.oxygen.api.entity.permission.PowerRole
+import top.fatweb.oxygen.api.entity.permission.RPowerRole
 
 /**
  * Power role intermediate service interface
@@ -9,6 +9,6 @@ import top.fatweb.oxygen.api.entity.permission.PowerRole
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see IService
- * @see PowerRole
+ * @see RPowerRole
  */
-interface IPowerRoleService : IService<PowerRole>
+interface IRPowerRoleService : IService<RPowerRole>

src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRRoleGroupService.kt

@@ -1,7 +1,7 @@
 package top.fatweb.oxygen.api.service.permission
 
 import com.baomidou.mybatisplus.extension.service.IService
-import top.fatweb.oxygen.api.entity.permission.RoleGroup
+import top.fatweb.oxygen.api.entity.permission.RRoleGroup
 
 /**
  * Role group intermediate service interface
@@ -9,6 +9,6 @@ import top.fatweb.oxygen.api.entity.permission.RoleGroup
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see IService
- * @see RoleGroup
+ * @see RRoleGroup
  */
-interface IRoleGroupService : IService<RoleGroup>
+interface IRRoleGroupService : IService<RRoleGroup>

src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRUserGroupService.kt

@@ -1,7 +1,7 @@
 package top.fatweb.oxygen.api.service.permission
 
 import com.baomidou.mybatisplus.extension.service.IService
-import top.fatweb.oxygen.api.entity.permission.UserGroup
+import top.fatweb.oxygen.api.entity.permission.RUserGroup
 
 /**
  * User group intermediate service interface
@@ -9,6 +9,6 @@ import top.fatweb.oxygen.api.entity.permission.UserGroup
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see IService
- * @see UserGroup
+ * @see RUserGroup
  */
-interface IUserGroupService : IService<UserGroup>
+interface IRUserGroupService : IService<RUserGroup>

src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRUserRoleService.kt

@@ -1,7 +1,7 @@
 package top.fatweb.oxygen.api.service.permission
 
 import com.baomidou.mybatisplus.extension.service.IService
-import top.fatweb.oxygen.api.entity.permission.UserRole
+import top.fatweb.oxygen.api.entity.permission.RUserRole
 
 /**
  * User role intermediate service interface
@@ -9,6 +9,6 @@ import top.fatweb.oxygen.api.entity.permission.UserRole
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see IService
- * @see UserRole
+ * @see RUserRole
  */
-interface IUserRoleService : IService<UserRole>
+interface IRUserRoleService : IService<RUserRole>

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

@@ -7,11 +7,11 @@ import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import top.fatweb.oxygen.api.converter.permission.GroupConverter
 import top.fatweb.oxygen.api.entity.permission.Group
-import top.fatweb.oxygen.api.entity.permission.RoleGroup
+import top.fatweb.oxygen.api.entity.permission.RRoleGroup
 import top.fatweb.oxygen.api.mapper.permission.GroupMapper
 import top.fatweb.oxygen.api.param.permission.group.*
 import top.fatweb.oxygen.api.service.permission.IGroupService
-import top.fatweb.oxygen.api.service.permission.IRoleGroupService
+import top.fatweb.oxygen.api.service.permission.IRRoleGroupService
 import top.fatweb.oxygen.api.service.permission.IUserService
 import top.fatweb.oxygen.api.util.PageUtil
 import top.fatweb.oxygen.api.util.RedisUtil
@@ -26,7 +26,7 @@ import top.fatweb.oxygen.api.vo.permission.base.GroupVo
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see RedisUtil
- * @see IRoleGroupService
+ * @see IRRoleGroupService
  * @see IUserService
  * @see ServiceImpl
  * @see GroupMapper
@@ -36,7 +36,7 @@ import top.fatweb.oxygen.api.vo.permission.base.GroupVo
 @Service
 class GroupServiceImpl(
     private val redisUtil: RedisUtil,
-    private val roleGroupService: IRoleGroupService,
+    private val rRoleGroupService: IRRoleGroupService,
     private val userService: IUserService
 ) : ServiceImpl<GroupMapper, Group>(), IGroupService {
     override fun getPage(groupGetParam: GroupGetParam?): PageVo<GroupWithRoleVo> {
@@ -72,8 +72,8 @@ class GroupServiceImpl(
                 return GroupConverter.groupToGroupVo(group)
             }
 
-            if (roleGroupService.saveBatch(group.roles!!.map {
+            if (rRoleGroupService.saveBatch(group.roles!!.map {
-                    RoleGroup().apply {
+                    RRoleGroup().apply {
                         groupId = group.id
                         roleId = it.id
                     }
@@ -88,8 +88,8 @@ class GroupServiceImpl(
     @Transactional
     override fun update(groupUpdateParam: GroupUpdateParam): GroupVo? {
         val group = GroupConverter.groupUpdateParamToGroup(groupUpdateParam)
-        val oldRoleList = roleGroupService.list(
+        val oldRoleList = rRoleGroupService.list(
-            KtQueryWrapper(RoleGroup()).select(RoleGroup::roleId).eq(RoleGroup::groupId, groupUpdateParam.id)
+            KtQueryWrapper(RRoleGroup()).select(RRoleGroup::roleId).eq(RRoleGroup::groupId, groupUpdateParam.id)
         ).map { it.roleId }
         val addRoleIds = HashSet<Long>()
         val removeRoleIds = HashSet<Long>()
@@ -105,15 +105,15 @@ class GroupServiceImpl(
         baseMapper.updateById(group)
 
         removeRoleIds.forEach {
-            roleGroupService.remove(
+            rRoleGroupService.remove(
-                KtQueryWrapper(RoleGroup()).eq(
+                KtQueryWrapper(RRoleGroup()).eq(
-                    RoleGroup::groupId, groupUpdateParam.id
+                    RRoleGroup::groupId, groupUpdateParam.id
-                ).eq(RoleGroup::roleId, it)
+                ).eq(RRoleGroup::roleId, it)
             )
         }
 
         addRoleIds.forEach {
-            roleGroupService.save(RoleGroup().apply {
+            rRoleGroupService.save(RRoleGroup().apply {
                 groupId = groupUpdateParam.id
                 roleId = it
             })
@@ -142,7 +142,7 @@ class GroupServiceImpl(
     @Transactional
     override fun delete(groupDeleteParam: GroupDeleteParam) {
         baseMapper.deleteBatchIds(groupDeleteParam.ids)
-        roleGroupService.remove(KtQueryWrapper(RoleGroup()).`in`(RoleGroup::groupId, groupDeleteParam.ids))
+        rRoleGroupService.remove(KtQueryWrapper(RRoleGroup()).`in`(RRoleGroup::groupId, groupDeleteParam.ids))
         offlineUser(*groupDeleteParam.ids.toLongArray())
     }
 

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

@@ -1,20 +0,0 @@
-package top.fatweb.oxygen.api.service.permission.impl
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-import top.fatweb.oxygen.api.entity.permission.PowerRole
-import top.fatweb.oxygen.api.mapper.permission.PowerRoleMapper
-import top.fatweb.oxygen.api.service.permission.IPowerRoleService
-
-/**
- * Power role intermediate service implement
- *
- * @author FatttSnake, fatttsnake@gmail.com
- * @since 1.0.0
- * @see ServiceImpl
- * @see PowerRoleMapper
- * @see PowerRole
- * @see IPowerRoleService
- */
-@Service
-class PowerRoleServiceImpl : ServiceImpl<PowerRoleMapper, PowerRole>(), IPowerRoleService

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

@@ -0,0 +1,20 @@
+package top.fatweb.oxygen.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.oxygen.api.entity.permission.RPowerRole
+import top.fatweb.oxygen.api.mapper.permission.RPowerRoleMapper
+import top.fatweb.oxygen.api.service.permission.IRPowerRoleService
+
+/**
+ * Power role intermediate service implement
+ *
+ * @author FatttSnake, fatttsnake@gmail.com
+ * @since 1.0.0
+ * @see ServiceImpl
+ * @see RPowerRoleMapper
+ * @see RPowerRole
+ * @see IRPowerRoleService
+ */
+@Service
+class RPowerRoleServiceImpl : ServiceImpl<RPowerRoleMapper, RPowerRole>(), IRPowerRoleService

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

@@ -0,0 +1,20 @@
+package top.fatweb.oxygen.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.oxygen.api.entity.permission.RRoleGroup
+import top.fatweb.oxygen.api.mapper.permission.RRoleGroupMapper
+import top.fatweb.oxygen.api.service.permission.IRRoleGroupService
+
+/**
+ * Role group intermediate service implement
+ *
+ * @author FatttSnake, fatttsnake@gmail.com
+ * @since 1.0.0
+ * @see ServiceImpl
+ * @see RRoleGroupMapper
+ * @see RRoleGroup
+ * @see IRRoleGroupService
+ */
+@Service
+class RRoleGroupServiceImpl : ServiceImpl<RRoleGroupMapper, RRoleGroup>(), IRRoleGroupService

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

@@ -0,0 +1,20 @@
+package top.fatweb.oxygen.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.oxygen.api.entity.permission.RUserGroup
+import top.fatweb.oxygen.api.mapper.permission.RUserGroupMapper
+import top.fatweb.oxygen.api.service.permission.IRUserGroupService
+
+/**
+ * User group intermediate service implement
+ *
+ * @author FatttSnake, fatttsnake@gmail.com
+ * @since 1.0.0
+ * @see ServiceImpl
+ * @see RUserGroupMapper
+ * @see RUserGroup
+ * @see IRUserGroupService
+ */
+@Service
+class RUserGroupServiceImpl : ServiceImpl<RUserGroupMapper, RUserGroup>(), IRUserGroupService

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

@@ -0,0 +1,19 @@
+package top.fatweb.oxygen.api.service.permission.impl
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
+import org.springframework.stereotype.Service
+import top.fatweb.oxygen.api.entity.permission.RUserRole
+import top.fatweb.oxygen.api.mapper.permission.RUserRoleMapper
+import top.fatweb.oxygen.api.service.permission.IRUserRoleService
+
+/**
+ * User role intermediate service implement
+ *
+ * @author FatttSnake, fatttsnake@gmail.com
+ * @since 1.0.0
+ * @see ServiceImpl
+ * @see RUserRoleMapper
+ * @see IRUserRoleService
+ */
+@Service
+class RUserRoleServiceImpl : ServiceImpl<RUserRoleMapper, RUserRole>(), IRUserRoleService

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

@@ -1,20 +0,0 @@
-package top.fatweb.oxygen.api.service.permission.impl
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-import top.fatweb.oxygen.api.entity.permission.RoleGroup
-import top.fatweb.oxygen.api.mapper.permission.RoleGroupMapper
-import top.fatweb.oxygen.api.service.permission.IRoleGroupService
-
-/**
- * Role group intermediate service implement
- *
- * @author FatttSnake, fatttsnake@gmail.com
- * @since 1.0.0
- * @see ServiceImpl
- * @see RoleGroupMapper
- * @see RoleGroup
- * @see IRoleGroupService
- */
-@Service
-class RoleGroupServiceImpl : ServiceImpl<RoleGroupMapper, RoleGroup>(), IRoleGroupService

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

@@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
 import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import top.fatweb.oxygen.api.converter.permission.RoleConverter
-import top.fatweb.oxygen.api.entity.permission.PowerRole
+import top.fatweb.oxygen.api.entity.permission.RPowerRole
 import top.fatweb.oxygen.api.entity.permission.Role
 import top.fatweb.oxygen.api.mapper.permission.RoleMapper
 import top.fatweb.oxygen.api.param.permission.role.*
@@ -24,7 +24,7 @@ import top.fatweb.oxygen.api.vo.permission.base.RoleVo
  * @author FatttSnake, fatttsnake@gmail.com
  * @since 1.0.0
  * @see RedisUtil
- * @see IPowerRoleService
+ * @see IRPowerRoleService
  * @see IFuncService
  * @see IMenuService
  * @see IUserService
@@ -36,7 +36,7 @@ import top.fatweb.oxygen.api.vo.permission.base.RoleVo
 @Service
 class RoleServiceImpl(
     private val redisUtil: RedisUtil,
-    private val powerRoleService: IPowerRoleService,
+    private val rPowerRoleService: IRPowerRoleService,
     private val funcService: IFuncService,
     private val menuService: IMenuService,
     private val userService: IUserService
@@ -79,8 +79,8 @@ class RoleServiceImpl(
                 return RoleConverter.roleToRoleVo(role)
             }
 
-            if (powerRoleService.saveBatch(fullPowerIds.map {
+            if (rPowerRoleService.saveBatch(fullPowerIds.map {
-                    PowerRole().apply {
+                    RPowerRole().apply {
                         roleId = role.id
                         powerId = it
                     }
@@ -97,8 +97,8 @@ class RoleServiceImpl(
         val fullPowerIds = roleUpdateParam.powerIds?.let { getFullPowerIds(it) }
 
         val role = RoleConverter.roleUpdateParamToRole(roleUpdateParam)
-        val oldPowerList = powerRoleService.list(
+        val oldPowerList = rPowerRoleService.list(
-            KtQueryWrapper(PowerRole()).select(PowerRole::powerId).eq(PowerRole::roleId, roleUpdateParam.id)
+            KtQueryWrapper(RPowerRole()).select(RPowerRole::powerId).eq(RPowerRole::roleId, roleUpdateParam.id)
         ).map { it.powerId }
         val addPowerIds = HashSet<Long>()
         val removePowerIds = HashSet<Long>()
@@ -114,15 +114,15 @@ class RoleServiceImpl(
         baseMapper.updateById(role)
 
         removePowerIds.forEach {
-            powerRoleService.remove(
+            rPowerRoleService.remove(
-                KtQueryWrapper(PowerRole()).eq(
+                KtQueryWrapper(RPowerRole()).eq(
-                    PowerRole::roleId, roleUpdateParam.id
+                    RPowerRole::roleId, roleUpdateParam.id
-                ).eq(PowerRole::powerId, it)
+                ).eq(RPowerRole::powerId, it)
             )
         }
 
         addPowerIds.forEach {
-            powerRoleService.save(PowerRole().apply {
+            rPowerRoleService.save(RPowerRole().apply {
                 roleId = roleUpdateParam.id
                 powerId = it
             })
@@ -151,7 +151,7 @@ class RoleServiceImpl(
     @Transactional
     override fun delete(roleDeleteParam: RoleDeleteParam) {
         baseMapper.deleteBatchIds(roleDeleteParam.ids)
-        powerRoleService.remove(KtQueryWrapper(PowerRole()).`in`(PowerRole::roleId, roleDeleteParam.ids))
+        rPowerRoleService.remove(KtQueryWrapper(RPowerRole()).`in`(RPowerRole::roleId, roleDeleteParam.ids))
         offlineUser(*roleDeleteParam.ids.toLongArray())
     }
 

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

@@ -1,20 +0,0 @@
-package top.fatweb.oxygen.api.service.permission.impl
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-import top.fatweb.oxygen.api.entity.permission.UserGroup
-import top.fatweb.oxygen.api.mapper.permission.UserGroupMapper
-import top.fatweb.oxygen.api.service.permission.IUserGroupService
-
-/**
- * User group intermediate service implement
- *
- * @author FatttSnake, fatttsnake@gmail.com
- * @since 1.0.0
- * @see ServiceImpl
- * @see UserGroupMapper
- * @see UserGroup
- * @see IUserGroupService
- */
-@Service
-class UserGroupServiceImpl : ServiceImpl<UserGroupMapper, UserGroup>(), IUserGroupService

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

@@ -1,19 +0,0 @@
-package top.fatweb.oxygen.api.service.permission.impl
-
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl
-import org.springframework.stereotype.Service
-import top.fatweb.oxygen.api.entity.permission.UserRole
-import top.fatweb.oxygen.api.mapper.permission.UserRoleMapper
-import top.fatweb.oxygen.api.service.permission.IUserRoleService
-
-/**
- * User role intermediate service implement
- *
- * @author FatttSnake, fatttsnake@gmail.com
- * @since 1.0.0
- * @see ServiceImpl
- * @see UserRoleMapper
- * @see IUserRoleService
- */
-@Service
-class UserRoleServiceImpl : ServiceImpl<UserRoleMapper, UserRole>(), IUserRoleService

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

@@ -12,9 +12,9 @@ import org.springframework.stereotype.Service
 import org.springframework.transaction.annotation.Transactional
 import top.fatweb.oxygen.api.converter.permission.UserConverter
 import top.fatweb.oxygen.api.entity.permission.User
-import top.fatweb.oxygen.api.entity.permission.UserGroup
+import top.fatweb.oxygen.api.entity.permission.RUserGroup
 import top.fatweb.oxygen.api.entity.permission.UserInfo
-import top.fatweb.oxygen.api.entity.permission.UserRole
+import top.fatweb.oxygen.api.entity.permission.RUserRole
 import top.fatweb.oxygen.api.exception.NoRecordFoundException
 import top.fatweb.oxygen.api.mapper.permission.UserMapper
 import top.fatweb.oxygen.api.param.permission.user.*
@@ -42,8 +42,8 @@ import java.util.*
  * @see IMenuService
  * @see IFuncService
  * @see IOperationService
- * @see IUserRoleService
+ * @see IRUserRoleService
- * @see IUserGroupService
+ * @see IRUserGroupService
  * @see ServiceImpl
  * @see UserMapper
  * @see User
@@ -59,8 +59,8 @@ class UserServiceImpl(
     private val menuService: IMenuService,
     private val funcService: IFuncService,
     private val operationService: IOperationService,
-    private val userRoleService: IUserRoleService,
+    private val rUserRoleService: IRUserRoleService,
-    private val userGroupService: IUserGroupService
+    private val rUserGroupService: IRUserGroupService
 ) : ServiceImpl<UserMapper, User>(), IUserService {
     override fun getUserWithPowerByAccount(account: String): User? {
         val user = baseMapper.selectOneWithPowerInfoByAccount(account)
@@ -121,8 +121,8 @@ class UserServiceImpl(
             user.userInfo?.let { userInfoService.save(it.apply { userId = user.id }) }
 
             if (!user.roles.isNullOrEmpty()) {
-                userRoleService.saveBatch(user.roles!!.map {
+                rUserRoleService.saveBatch(user.roles!!.map {
-                    UserRole().apply {
+                    RUserRole().apply {
                         userId = user.id
                         roleId = it.id
                     }
@@ -130,8 +130,8 @@ class UserServiceImpl(
             }
 
             if (!user.groups.isNullOrEmpty()) {
-                userGroupService.saveBatch(user.groups!!.map {
+                rUserGroupService.saveBatch(user.groups!!.map {
-                    UserGroup().apply {
+                    RUserGroup().apply {
                         userId = user.id
                         groupId = it.id
                     }
@@ -151,8 +151,8 @@ class UserServiceImpl(
         val user = UserConverter.userUpdateParamToUser(userUpdateParam)
         user.updateTime = LocalDateTime.now(ZoneOffset.UTC)
 
-        val oldRoleList = userRoleService.list(
+        val oldRoleList = rUserRoleService.list(
-            KtQueryWrapper(UserRole()).select(UserRole::roleId).eq(UserRole::userId, userUpdateParam.id)
+            KtQueryWrapper(RUserRole()).select(RUserRole::roleId).eq(RUserRole::userId, userUpdateParam.id)
         ).map { it.roleId }
         val addRoleIds = HashSet<Long>()
         val removeRoleIds = HashSet<Long>()
@@ -165,8 +165,8 @@ class UserServiceImpl(
         removeRoleIds.removeAll(addRoleIds)
         oldRoleList.toSet().let { addRoleIds.removeAll(it) }
 
-        val oldGroupList = userGroupService.list(
+        val oldGroupList = rUserGroupService.list(
-            KtQueryWrapper(UserGroup()).select(UserGroup::groupId).eq(UserGroup::userId, userUpdateParam.id)
+            KtQueryWrapper(RUserGroup()).select(RUserGroup::groupId).eq(RUserGroup::userId, userUpdateParam.id)
         ).map { it.groupId }
         val addGroupIds = HashSet<Long>()
         val removeGroupIds = HashSet<Long>()
@@ -202,30 +202,30 @@ class UserServiceImpl(
         }
 
         removeRoleIds.forEach {
-            userRoleService.remove(
+            rUserRoleService.remove(
-                KtQueryWrapper(UserRole()).eq(
+                KtQueryWrapper(RUserRole()).eq(
-                    UserRole::userId, userUpdateParam.id
+                    RUserRole::userId, userUpdateParam.id
-                ).eq(UserRole::roleId, it)
+                ).eq(RUserRole::roleId, it)
             )
         }
 
         addRoleIds.forEach {
-            userRoleService.save(UserRole().apply {
+            rUserRoleService.save(RUserRole().apply {
                 userId = userUpdateParam.id
                 roleId = it
             })
         }
 
         removeGroupIds.forEach {
-            userGroupService.remove(
+            rUserGroupService.remove(
-                KtQueryWrapper(UserGroup()).eq(
+                KtQueryWrapper(RUserGroup()).eq(
-                    UserGroup::userId, userUpdateParam.id
+                    RUserGroup::userId, userUpdateParam.id
-                ).eq(UserGroup::groupId, it)
+                ).eq(RUserGroup::groupId, it)
             )
         }
 
         addGroupIds.forEach {
-            userGroupService.save(UserGroup().apply {
+            rUserGroupService.save(RUserGroup().apply {
                 userId = userUpdateParam.id
                 groupId = it
             })
@@ -278,8 +278,8 @@ class UserServiceImpl(
 
         this.removeBatchByIds(ids)
         userInfoService.remove(KtQueryWrapper(UserInfo()).`in`(UserInfo::userId, ids))
-        userRoleService.remove(KtQueryWrapper(UserRole()).`in`(UserRole::userId, ids))
+        rUserRoleService.remove(KtQueryWrapper(RUserRole()).`in`(RUserRole::userId, ids))
-        userGroupService.remove(KtQueryWrapper(UserGroup()).`in`(UserGroup::userId, ids))
+        rUserGroupService.remove(KtQueryWrapper(RUserGroup()).`in`(RUserGroup::userId, ids))
 
         WebUtil.offlineUser(redisUtil, *ids.toLongArray())
     }

src/main/resources/mapper/permission/PowerRoleMapper.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.oxygen.api.mapper.permission.PowerRoleMapper">
+<mapper namespace="top.fatweb.oxygen.api.mapper.permission.RPowerRoleMapper">
 
 </mapper>

src/main/resources/mapper/permission/RoleGroupMapper.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.oxygen.api.mapper.permission.RoleGroupMapper">
+<mapper namespace="top.fatweb.oxygen.api.mapper.permission.RRoleGroupMapper">
 
 </mapper>

src/main/resources/mapper/permission/UserGroupMapper.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.oxygen.api.mapper.permission.UserGroupMapper">
+<mapper namespace="top.fatweb.oxygen.api.mapper.permission.RUserGroupMapper">
 
 </mapper>

src/main/resources/mapper/permission/UserRoleMapper.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.oxygen.api.mapper.permission.UserRoleMapper">
+<mapper namespace="top.fatweb.oxygen.api.mapper.permission.RUserRoleMapper">
 
 </mapper>