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

19
src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt
View File

@@ -9,6 +9,7 @@ import top.fatweb.api.param.authentication.LoginParam
import top.fatweb.api.param.authentication.UserAddParam
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
@@ -81,6 +82,24 @@ object UserConverter {
}
)
fun userToUserWithInfoVo(user: User) = UserWithInfoVo(
id = user.id,
username = user.username,
locking = user.locking?.let { it == 1 },
expiration = user.expiration,
credentialsExpiration = user.credentialsExpiration,
enable = user.enable?.let { it == 1 },
currentLoginTime = user.currentLoginTime,
currentLoginIp = user.currentLoginIp,
lastLoginTime = user.lastLoginTime,
lastLoginIp = user.lastLoginIp,
createTime = user.createTime,
updateTime = user.updateTime,
userInfo = user.userInfo?.let {
UserInfoConverter.userInfoToUserInfoVo(it)
}
)
fun userToUserWithPasswordRoleInfoVo(user: User) = UserWithPasswordRoleInfoVo(
id = user.id,
username = user.username,