From 6915a39d07ed5aca8ef6466895108f4b5f719032 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Wed, 29 Nov 2023 12:04:27 +0800 Subject: [PATCH] Optimize param class --- .../fatweb/api/converter/permission/GroupConverter.kt | 2 +- .../fatweb/api/param/permission/group/GroupAddParam.kt | 4 ++-- .../param/permission/group/GroupChangeStatusParam.kt | 10 ++++------ .../fatweb/api/param/permission/group/GroupGetParam.kt | 2 +- .../api/param/permission/group/GroupUpdateParam.kt | 8 ++++---- .../fatweb/api/param/permission/role/RoleAddParam.kt | 4 ++-- .../api/param/permission/role/RoleChangeStatusParam.kt | 8 +++----- .../fatweb/api/param/permission/role/RoleGetParam.kt | 2 +- .../api/param/permission/role/RoleUpdateParam.kt | 8 ++++---- .../fatweb/api/param/permission/user/UserAddParam.kt | 4 ++-- .../fatweb/api/param/permission/user/UserGetParam.kt | 2 +- .../api/param/permission/user/UserUpdateParam.kt | 4 ++-- .../top/fatweb/api/param/system/SysLogGetParam.kt | 2 +- 13 files changed, 28 insertions(+), 32 deletions(-) diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt index 0d63bce..2b4afd9 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt @@ -46,7 +46,7 @@ object GroupConverter { fun groupAddParamToGroup(groupAddParam: GroupAddParam) = Group().apply { name = groupAddParam.name - enable = if (groupAddParam.enable == true) 1 else 0 + enable = if (groupAddParam.enable) 1 else 0 roles = groupAddParam.roleIds?.map { Role().apply { id = it } } } diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt index c7dcc82..5a2df85 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt @@ -15,8 +15,8 @@ data class GroupAddParam( @field:NotBlank(message = "Name can not be blank") val name: String?, - @Schema(description = "启用", allowableValues = ["true", "false"]) - val enable: Boolean? = true, + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") + val enable: Boolean = true, @Schema(description = "角色 ID 列表") val roleIds: List? = null diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupChangeStatusParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupChangeStatusParam.kt index e586c4b..9ff6129 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupChangeStatusParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupChangeStatusParam.kt @@ -1,7 +1,6 @@ package top.fatweb.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema -import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull /** @@ -13,10 +12,9 @@ import jakarta.validation.constraints.NotNull @Schema(description = "用户组更改状态请求参数") data class GroupChangeStatusParam( @Schema(description = "用户组 ID") - @field:Min(0) - val id: Long, + @field:NotNull(message = "ID can not be null") + val id: Long?, - @Schema(description = "启用", allowableValues = ["true", "false"]) - @field:NotNull - val enable: Boolean + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") + val enable: Boolean = true ) \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt index 41bd3fa..d2a4fac 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt @@ -14,6 +14,6 @@ data class GroupGetParam( @Schema(description = "查询用户组名称") val searchName: String? = null, - @Schema(description = "查询使用正则表达式", allowableValues = ["true", "false"]) + @Schema(description = "查询使用正则表达式", allowableValues = ["true", "false"], defaultValue = "false") val searchRegex: Boolean = false, ) : PageSortParam() diff --git a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt index c2980c1..d539375 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt @@ -1,8 +1,8 @@ package top.fatweb.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema -import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.NotNull /** * Group update param @@ -13,15 +13,15 @@ import jakarta.validation.constraints.NotBlank @Schema(description = "用户组更新请求参数") data class GroupUpdateParam( @Schema(description = "用户组 ID") - @field:Min(0) + @field:NotNull(message = "ID can not be null") val id: Long, @Schema(description = "用户组名称") @field:NotBlank(message = "Name can not be blank") val name: String?, - @Schema(description = "启用", allowableValues = ["true", "false"]) - val enable: Boolean? = true, + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") + val enable: Boolean = true, @Schema(description = "角色 ID 列表") val roleIds: List? = null diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt index 91255ae..2b92e60 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt @@ -15,8 +15,8 @@ data class RoleAddParam( @field:NotBlank(message = "Name can not be blank") val name: String?, - @Schema(description = "启用", allowableValues = ["true", "false"]) - val enable: Boolean? = true, + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") + val enable: Boolean = true, @Schema(description = "权限 ID 列表") val powerIds: List? = null diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleChangeStatusParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleChangeStatusParam.kt index 163dc80..ba37b80 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleChangeStatusParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleChangeStatusParam.kt @@ -1,7 +1,6 @@ package top.fatweb.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema -import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotNull /** @@ -13,10 +12,9 @@ import jakarta.validation.constraints.NotNull @Schema(description = "角色更改状态请求参数") data class RoleChangeStatusParam( @Schema(description = "角色 ID") - @field:Min(0) + @field:NotNull(message = "Role id can not be null") val id: Long, - @Schema(description = "启用", allowableValues = ["true", "false"]) - @field:NotNull - val enable: Boolean + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") + val enable: Boolean = true ) \ No newline at end of file diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt index 57de6d7..9ca5acf 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt @@ -14,6 +14,6 @@ data class RoleGetParam( @Schema(description = "查询角色名称") val searchName: String? = null, - @Schema(description = "查询使用正则表达式", allowableValues = ["true", "false"]) + @Schema(description = "查询使用正则表达式", allowableValues = ["true", "false"], defaultValue = "false") val searchRegex: Boolean = false, ) : PageSortParam() diff --git a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt index b2904b9..9b3ead9 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt @@ -1,8 +1,8 @@ package top.fatweb.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema -import jakarta.validation.constraints.Min import jakarta.validation.constraints.NotBlank +import jakarta.validation.constraints.NotNull /** * Role update param @@ -13,15 +13,15 @@ import jakarta.validation.constraints.NotBlank @Schema(description = "角色更新请求参数") data class RoleUpdateParam( @Schema(description = "角色 ID") - @field:Min(0) + @field:NotNull(message = "Role id can not be null") val id: Long, @Schema(description = "角色名称") @field:NotBlank(message = "Name can not be blank") val name: String?, - @Schema(description = "启用", allowableValues = ["true", "false"]) - val enable: Boolean? = true, + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") + val enable: Boolean = true, @Schema(description = "权限 ID 列表") val powerIds: List? = null diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt index 94660e6..67d0048 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt @@ -13,7 +13,7 @@ data class UserAddParam( @Schema(description = "密码(为空自动生成随机密码)") val password: String?, - @Schema(description = "锁定") + @Schema(description = "锁定", allowableValues = ["true", "false"], defaultValue = "false") val locking: Boolean = false, @Schema(description = "过期时间") @@ -22,7 +22,7 @@ data class UserAddParam( @Schema(description = "认证过期时间") val credentialsExpiration: LocalDateTime?, - @Schema(description = "启用") + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") val enable: Boolean = true, @Schema(description = "昵称") diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt index f14fcd7..2b67b0b 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt @@ -14,6 +14,6 @@ data class UserGetParam( @Schema(description = "查询内容") val searchValue: String? = null, - @Schema(description = "查询使用正则表达式", allowableValues = ["true", "false"]) + @Schema(description = "查询使用正则表达式", allowableValues = ["true", "false"], defaultValue = "false") val searchRegex: Boolean = false, ) : PageSortParam() diff --git a/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt index a968987..99364ad 100644 --- a/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt @@ -13,7 +13,7 @@ data class UserUpdateParam( @Schema(description = "用户名") val username: String?, - @Schema(description = "锁定") + @Schema(description = "锁定", allowableValues = ["true", "false"], defaultValue = "false") val locking: Boolean = false, @Schema(description = "过期时间") @@ -22,7 +22,7 @@ data class UserUpdateParam( @Schema(description = "认证过期时间") val credentialsExpiration: LocalDateTime?, - @Schema(description = "启用") + @Schema(description = "启用", allowableValues = ["true", "false"], defaultValue = "true") val enable: Boolean = true, @Schema(description = "昵称") diff --git a/src/main/kotlin/top/fatweb/api/param/system/SysLogGetParam.kt b/src/main/kotlin/top/fatweb/api/param/system/SysLogGetParam.kt index cf63028..63c4ea9 100644 --- a/src/main/kotlin/top/fatweb/api/param/system/SysLogGetParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/system/SysLogGetParam.kt @@ -26,7 +26,7 @@ data class SysLogGetParam( @Schema(description = "查询请求 Url") val searchRequestUrl: String? = null, - @Schema(description = "查询使用正则表达式") + @Schema(description = "查询使用正则表达式", allowableValues = ["true", "false"], defaultValue = "false") val searchRegex: Boolean = false, @Schema(description = "查询开始时间")