FatttSnake/oxygen-api
1
0
Fork 0
Code Pull Requests Activity

Optimize user management api

Browse Source
This commit is contained in:
Fat Snake
2023-11-29 10:55:44 +08:00
parent a0a6ce8f87
commit 7cf6b5cea2
8 changed files with 103 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7,6 +7,7 @@ import top.fatweb.api.param.authentication.UserDeleteParam
import top.fatweb.api.param.authentication.UserGetParam
import top.fatweb.api.param.authentication.UserUpdateParam
import top.fatweb.api.vo.PageVo
import top.fatweb.api.vo.permission.UserWithInfoVo
import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo
import top.fatweb.api.vo.permission.UserWithPowerInfoVo
import top.fatweb.api.vo.permission.UserWithRoleInfoVo
@@ -18,7 +19,7 @@ import top.fatweb.api.vo.permission.UserWithRoleInfoVo
* @since 1.0.0
*/
interface IUserService : IService<User> {
fun getUserWithPower(username: String): User?
fun getUserWithPowerByUsername(username: String): User?
fun getInfo(): UserWithPowerInfoVo?
@@ -26,7 +27,7 @@ interface IUserService : IService<User> {
fun getOne(id: Long): UserWithRoleInfoVo?
fun getList(): List<UserWithRoleInfoVo>
fun getList(): List<UserWithInfoVo>
fun add(userAddParam: UserAddParam): UserWithPasswordRoleInfoVo?

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

@@ -15,7 +15,7 @@ import top.fatweb.api.service.permission.IUserService
@Service
class UserDetailsServiceImpl(val userService: IUserService) : UserDetailsService {
override fun loadUserByUsername(username: String): UserDetails {
val user = userService.getUserWithPower(username)
val user = userService.getUserWithPowerByUsername(username)
user ?: let { throw Exception("Username not found") }
return LoginUser(user)

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

@@ -41,8 +41,8 @@ class UserServiceImpl(
private val userRoleService: IUserRoleService,
private val userGroupService: IUserGroupService
) : ServiceImpl<UserMapper, User>(), IUserService {
override fun getUserWithPower(username: String): User? {
val user = baseMapper.getOneWithPowerInfoByUsername(username)
override fun getUserWithPowerByUsername(username: String): User? {
val user = baseMapper.selectOneWithPowerInfoByUsername(username)
user ?: let { return null }
if (user.id == 0L) {
@@ -56,7 +56,7 @@ class UserServiceImpl(
}
override fun getInfo() = WebUtil.getLoginUsername()
?.let { username -> getUserWithPower(username)?.let { UserConverter.userToUserWithPowerInfoVo(it) } }
?.let { username -> getUserWithPowerByUsername(username)?.let { UserConverter.userToUserWithPowerInfoVo(it) } }
override fun getPage(userGetParam: UserGetParam?): PageVo<UserWithRoleInfoVo> {
val userIdsPage = Page<Long>(userGetParam?.currentPage ?: 1, userGetParam?.pageSize ?: 20)
@@ -67,16 +67,16 @@ class UserServiceImpl(
baseMapper.selectPage(userIdsPage, userGetParam?.searchValue, userGetParam?.searchRegex ?: false)
val userPage = Page<User>(userIdsIPage.current, userIdsIPage.size, userIdsIPage.total)
if (userIdsIPage.total > 0) {
userPage.setRecords(baseMapper.getWithRoleInfoByList(userIdsIPage.records))
userPage.setRecords(baseMapper.selectListWithRoleInfoByIds(userIdsIPage.records))
}
return UserConverter.userPageToUserWithRoleInfoPageVo(userPage)
}
override fun getOne(id: Long) =
baseMapper.getOneWithRoleInfo(id)?.let { UserConverter.userToUserWithRoleInfoVo(it) }
baseMapper.selectOneWithRoleInfoById(id)?.let { UserConverter.userToUserWithRoleInfoVo(it) }
override fun getList() = baseMapper.getListWithRoleInfo().map { UserConverter.userToUserWithRoleInfoVo(it) }
override fun getList() = baseMapper.selectListWithInfo().map { UserConverter.userToUserWithInfoVo(it) }
@Transactional
override fun add(userAddParam: UserAddParam): UserWithPasswordRoleInfoVo? {