From 705449c5b1b1dfd808ba2de3ca52e099d9d78055 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Tue, 16 Jan 2024 16:12:47 +0800 Subject: [PATCH] Rename classes --- .../{PowerRole.kt => RPowerRole.kt} | 4 +- .../{RoleGroup.kt => RRoleGroup.kt} | 4 +- .../{UserGroup.kt => RUserGroup.kt} | 4 +- .../permission/{UserRole.kt => RUserRole.kt} | 4 +- ...PowerRoleMapper.kt => RPowerRoleMapper.kt} | 6 +-- ...RoleGroupMapper.kt => RRoleGroupMapper.kt} | 6 +-- ...UserGroupMapper.kt => RUserGroupMapper.kt} | 6 +-- .../{UserRoleMapper.kt => RUserRoleMapper.kt} | 6 +-- ...erRoleService.kt => IRPowerRoleService.kt} | 6 +-- ...eGroupService.kt => IRRoleGroupService.kt} | 6 +-- ...rGroupService.kt => IRUserGroupService.kt} | 6 +-- ...serRoleService.kt => IRUserRoleService.kt} | 6 +-- .../permission/impl/GroupServiceImpl.kt | 28 +++++----- .../permission/impl/PowerRoleServiceImpl.kt | 20 ------- .../permission/impl/RPowerRoleServiceImpl.kt | 20 +++++++ .../permission/impl/RRoleGroupServiceImpl.kt | 20 +++++++ .../permission/impl/RUserGroupServiceImpl.kt | 20 +++++++ .../permission/impl/RUserRoleServiceImpl.kt | 19 +++++++ .../permission/impl/RoleGroupServiceImpl.kt | 20 ------- .../permission/impl/RoleServiceImpl.kt | 26 +++++----- .../permission/impl/UserGroupServiceImpl.kt | 20 ------- .../permission/impl/UserRoleServiceImpl.kt | 19 ------- .../permission/impl/UserServiceImpl.kt | 52 +++++++++---------- .../mapper/permission/PowerRoleMapper.xml | 2 +- .../mapper/permission/RoleGroupMapper.xml | 2 +- .../mapper/permission/UserGroupMapper.xml | 2 +- .../mapper/permission/UserRoleMapper.xml | 2 +- 27 files changed, 168 insertions(+), 168 deletions(-) rename src/main/kotlin/top/fatweb/oxygen/api/entity/permission/{PowerRole.kt => RPowerRole.kt} (89%) rename src/main/kotlin/top/fatweb/oxygen/api/entity/permission/{RoleGroup.kt => RRoleGroup.kt} (89%) rename src/main/kotlin/top/fatweb/oxygen/api/entity/permission/{UserGroup.kt => RUserGroup.kt} (89%) rename src/main/kotlin/top/fatweb/oxygen/api/entity/permission/{UserRole.kt => RUserRole.kt} (89%) rename src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/{PowerRoleMapper.kt => RPowerRoleMapper.kt} (68%) rename src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/{RoleGroupMapper.kt => RRoleGroupMapper.kt} (68%) rename src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/{UserGroupMapper.kt => RUserGroupMapper.kt} (68%) rename src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/{UserRoleMapper.kt => RUserRoleMapper.kt} (69%) rename src/main/kotlin/top/fatweb/oxygen/api/service/permission/{IPowerRoleService.kt => IRPowerRoleService.kt} (65%) rename src/main/kotlin/top/fatweb/oxygen/api/service/permission/{IRoleGroupService.kt => IRRoleGroupService.kt} (65%) rename src/main/kotlin/top/fatweb/oxygen/api/service/permission/{IUserGroupService.kt => IRUserGroupService.kt} (65%) rename src/main/kotlin/top/fatweb/oxygen/api/service/permission/{IUserRoleService.kt => IRUserRoleService.kt} (65%) delete mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerRoleServiceImpl.kt create mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RPowerRoleServiceImpl.kt create mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RRoleGroupServiceImpl.kt create mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RUserGroupServiceImpl.kt create mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RUserRoleServiceImpl.kt delete mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleGroupServiceImpl.kt delete mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserGroupServiceImpl.kt delete mode 100644 src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserRoleServiceImpl.kt diff --git a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerRole.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RPowerRole.kt similarity index 89% rename from src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerRole.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RPowerRole.kt index d99b9a1..fc0da02 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/PowerRole.kt +++ b/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)" } } diff --git a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RoleGroup.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RRoleGroup.kt similarity index 89% rename from src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RoleGroup.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RRoleGroup.kt index a6363f2..a3af844 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RoleGroup.kt +++ b/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)" } } diff --git a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserGroup.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RUserGroup.kt similarity index 89% rename from src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserGroup.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RUserGroup.kt index 408a75c..60986f3 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserGroup.kt +++ b/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)" } } diff --git a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserRole.kt b/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RUserRole.kt similarity index 89% rename from src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserRole.kt rename to src/main/kotlin/top/fatweb/oxygen/api/entity/permission/RUserRole.kt index cc4b99b..a3f7d77 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/entity/permission/UserRole.kt +++ b/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)" } } diff --git a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerRoleMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RPowerRoleMapper.kt similarity index 68% rename from src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerRoleMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RPowerRoleMapper.kt index ec2af79..be569f3 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/PowerRoleMapper.kt +++ b/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 +interface RPowerRoleMapper : BaseMapper diff --git a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleGroupMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RRoleGroupMapper.kt similarity index 68% rename from src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleGroupMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RRoleGroupMapper.kt index 8010ae4..48f10da 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RoleGroupMapper.kt +++ b/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 +interface RRoleGroupMapper : BaseMapper diff --git a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserGroupMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RUserGroupMapper.kt similarity index 68% rename from src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserGroupMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RUserGroupMapper.kt index 4dbe85e..fa0b8bb 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserGroupMapper.kt +++ b/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 +interface RUserGroupMapper : BaseMapper diff --git a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserRoleMapper.kt b/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RUserRoleMapper.kt similarity index 69% rename from src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserRoleMapper.kt rename to src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/RUserRoleMapper.kt index ebc5eb6..b6a18f4 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/mapper/permission/UserRoleMapper.kt +++ b/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 +interface RUserRoleMapper : BaseMapper diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerRoleService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRPowerRoleService.kt similarity index 65% rename from src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerRoleService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRPowerRoleService.kt index 22787b0..9984d69 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IPowerRoleService.kt +++ b/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 +interface IRPowerRoleService : IService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleGroupService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRRoleGroupService.kt similarity index 65% rename from src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleGroupService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRRoleGroupService.kt index 0465468..f536395 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRoleGroupService.kt +++ b/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 +interface IRRoleGroupService : IService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserGroupService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRUserGroupService.kt similarity index 65% rename from src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserGroupService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRUserGroupService.kt index ec8765f..008aa4c 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserGroupService.kt +++ b/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 +interface IRUserGroupService : IService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserRoleService.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRUserRoleService.kt similarity index 65% rename from src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserRoleService.kt rename to src/main/kotlin/top/fatweb/oxygen/api/service/permission/IRUserRoleService.kt index debf680..969f3ee 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/IUserRoleService.kt +++ b/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 +interface IRUserRoleService : IService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/GroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/GroupServiceImpl.kt index ae197c4..246137c 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/GroupServiceImpl.kt +++ b/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(), IGroupService { override fun getPage(groupGetParam: GroupGetParam?): PageVo { @@ -72,8 +72,8 @@ class GroupServiceImpl( return GroupConverter.groupToGroupVo(group) } - if (roleGroupService.saveBatch(group.roles!!.map { - RoleGroup().apply { + if (rRoleGroupService.saveBatch(group.roles!!.map { + 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( - KtQueryWrapper(RoleGroup()).select(RoleGroup::roleId).eq(RoleGroup::groupId, groupUpdateParam.id) + val oldRoleList = rRoleGroupService.list( + KtQueryWrapper(RRoleGroup()).select(RRoleGroup::roleId).eq(RRoleGroup::groupId, groupUpdateParam.id) ).map { it.roleId } val addRoleIds = HashSet() val removeRoleIds = HashSet() @@ -105,15 +105,15 @@ class GroupServiceImpl( baseMapper.updateById(group) removeRoleIds.forEach { - roleGroupService.remove( - KtQueryWrapper(RoleGroup()).eq( - RoleGroup::groupId, groupUpdateParam.id - ).eq(RoleGroup::roleId, it) + rRoleGroupService.remove( + KtQueryWrapper(RRoleGroup()).eq( + RRoleGroup::groupId, groupUpdateParam.id + ).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()) } diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerRoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerRoleServiceImpl.kt deleted file mode 100644 index 5fa9d70..0000000 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/PowerRoleServiceImpl.kt +++ /dev/null @@ -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(), IPowerRoleService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RPowerRoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RPowerRoleServiceImpl.kt new file mode 100644 index 0000000..9522f91 --- /dev/null +++ b/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(), IRPowerRoleService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RRoleGroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RRoleGroupServiceImpl.kt new file mode 100644 index 0000000..e83e8b1 --- /dev/null +++ b/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(), IRRoleGroupService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RUserGroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RUserGroupServiceImpl.kt new file mode 100644 index 0000000..12b5100 --- /dev/null +++ b/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(), IRUserGroupService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RUserRoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RUserRoleServiceImpl.kt new file mode 100644 index 0000000..86f705c --- /dev/null +++ b/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(), IRUserRoleService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleGroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleGroupServiceImpl.kt deleted file mode 100644 index 897614c..0000000 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleGroupServiceImpl.kt +++ /dev/null @@ -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(), IRoleGroupService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleServiceImpl.kt index ea8a5b6..fdb70e6 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/RoleServiceImpl.kt +++ b/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 { - PowerRole().apply { + if (rPowerRoleService.saveBatch(fullPowerIds.map { + 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( - KtQueryWrapper(PowerRole()).select(PowerRole::powerId).eq(PowerRole::roleId, roleUpdateParam.id) + val oldPowerList = rPowerRoleService.list( + KtQueryWrapper(RPowerRole()).select(RPowerRole::powerId).eq(RPowerRole::roleId, roleUpdateParam.id) ).map { it.powerId } val addPowerIds = HashSet() val removePowerIds = HashSet() @@ -114,15 +114,15 @@ class RoleServiceImpl( baseMapper.updateById(role) removePowerIds.forEach { - powerRoleService.remove( - KtQueryWrapper(PowerRole()).eq( - PowerRole::roleId, roleUpdateParam.id - ).eq(PowerRole::powerId, it) + rPowerRoleService.remove( + KtQueryWrapper(RPowerRole()).eq( + RPowerRole::roleId, roleUpdateParam.id + ).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()) } diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserGroupServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserGroupServiceImpl.kt deleted file mode 100644 index 5664ba4..0000000 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserGroupServiceImpl.kt +++ /dev/null @@ -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(), IUserGroupService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserRoleServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserRoleServiceImpl.kt deleted file mode 100644 index b42ba8b..0000000 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserRoleServiceImpl.kt +++ /dev/null @@ -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(), IUserRoleService diff --git a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt b/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt index 6a8595e..1758246 100644 --- a/src/main/kotlin/top/fatweb/oxygen/api/service/permission/impl/UserServiceImpl.kt +++ b/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 IUserGroupService + * @see IRUserRoleService + * @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 userGroupService: IUserGroupService + private val rUserRoleService: IRUserRoleService, + private val rUserGroupService: IRUserGroupService ) : ServiceImpl(), 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 { - UserRole().apply { + rUserRoleService.saveBatch(user.roles!!.map { + RUserRole().apply { userId = user.id roleId = it.id } @@ -130,8 +130,8 @@ class UserServiceImpl( } if (!user.groups.isNullOrEmpty()) { - userGroupService.saveBatch(user.groups!!.map { - UserGroup().apply { + rUserGroupService.saveBatch(user.groups!!.map { + 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( - KtQueryWrapper(UserRole()).select(UserRole::roleId).eq(UserRole::userId, userUpdateParam.id) + val oldRoleList = rUserRoleService.list( + KtQueryWrapper(RUserRole()).select(RUserRole::roleId).eq(RUserRole::userId, userUpdateParam.id) ).map { it.roleId } val addRoleIds = HashSet() val removeRoleIds = HashSet() @@ -165,8 +165,8 @@ class UserServiceImpl( removeRoleIds.removeAll(addRoleIds) oldRoleList.toSet().let { addRoleIds.removeAll(it) } - val oldGroupList = userGroupService.list( - KtQueryWrapper(UserGroup()).select(UserGroup::groupId).eq(UserGroup::userId, userUpdateParam.id) + val oldGroupList = rUserGroupService.list( + KtQueryWrapper(RUserGroup()).select(RUserGroup::groupId).eq(RUserGroup::userId, userUpdateParam.id) ).map { it.groupId } val addGroupIds = HashSet() val removeGroupIds = HashSet() @@ -202,30 +202,30 @@ class UserServiceImpl( } removeRoleIds.forEach { - userRoleService.remove( - KtQueryWrapper(UserRole()).eq( - UserRole::userId, userUpdateParam.id - ).eq(UserRole::roleId, it) + rUserRoleService.remove( + KtQueryWrapper(RUserRole()).eq( + RUserRole::userId, userUpdateParam.id + ).eq(RUserRole::roleId, it) ) } addRoleIds.forEach { - userRoleService.save(UserRole().apply { + rUserRoleService.save(RUserRole().apply { userId = userUpdateParam.id roleId = it }) } removeGroupIds.forEach { - userGroupService.remove( - KtQueryWrapper(UserGroup()).eq( - UserGroup::userId, userUpdateParam.id - ).eq(UserGroup::groupId, it) + rUserGroupService.remove( + KtQueryWrapper(RUserGroup()).eq( + RUserGroup::userId, userUpdateParam.id + ).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)) - userGroupService.remove(KtQueryWrapper(UserGroup()).`in`(UserGroup::userId, ids)) + rUserRoleService.remove(KtQueryWrapper(RUserRole()).`in`(RUserRole::userId, ids)) + rUserGroupService.remove(KtQueryWrapper(RUserGroup()).`in`(RUserGroup::userId, ids)) WebUtil.offlineUser(redisUtil, *ids.toLongArray()) } diff --git a/src/main/resources/mapper/permission/PowerRoleMapper.xml b/src/main/resources/mapper/permission/PowerRoleMapper.xml index 368771a..7cc22a5 100644 --- a/src/main/resources/mapper/permission/PowerRoleMapper.xml +++ b/src/main/resources/mapper/permission/PowerRoleMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/mapper/permission/RoleGroupMapper.xml b/src/main/resources/mapper/permission/RoleGroupMapper.xml index f265c74..4125e6e 100644 --- a/src/main/resources/mapper/permission/RoleGroupMapper.xml +++ b/src/main/resources/mapper/permission/RoleGroupMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/mapper/permission/UserGroupMapper.xml b/src/main/resources/mapper/permission/UserGroupMapper.xml index ba22a76..49b30ef 100644 --- a/src/main/resources/mapper/permission/UserGroupMapper.xml +++ b/src/main/resources/mapper/permission/UserGroupMapper.xml @@ -1,5 +1,5 @@ - + diff --git a/src/main/resources/mapper/permission/UserRoleMapper.xml b/src/main/resources/mapper/permission/UserRoleMapper.xml index 0db5478..5906666 100644 --- a/src/main/resources/mapper/permission/UserRoleMapper.xml +++ b/src/main/resources/mapper/permission/UserRoleMapper.xml @@ -1,5 +1,5 @@ - +