From 557f7ff4ceae0375ef048f6b551838db7a8dec83 Mon Sep 17 00:00:00 2001 From: FatttSnake Date: Wed, 29 Nov 2023 11:55:15 +0800 Subject: [PATCH] Optimize class structure --- .../api/controller/permission/AuthenticationController.kt | 2 +- .../fatweb/api/controller/permission/GroupController.kt | 4 ++-- .../fatweb/api/controller/permission/RoleController.kt | 4 ++-- .../fatweb/api/controller/permission/UserController.kt | 8 ++++---- .../fatweb/api/converter/permission/ElementConverter.kt | 2 +- .../top/fatweb/api/converter/permission/GroupConverter.kt | 8 ++++---- .../top/fatweb/api/converter/permission/MenuConverter.kt | 2 +- .../fatweb/api/converter/permission/ModuleConverter.kt | 2 +- .../fatweb/api/converter/permission/OperationConverter.kt | 2 +- .../top/fatweb/api/converter/permission/RoleConverter.kt | 8 ++++---- .../top/fatweb/api/converter/permission/UserConverter.kt | 6 +++--- .../fatweb/api/converter/permission/UserInfoConverter.kt | 2 +- .../param/{authentication => permission}/LoginParam.kt | 2 +- .../{authentication => permission/group}/GroupAddParam.kt | 2 +- .../group}/GroupChangeStatusParam.kt | 2 +- .../group}/GroupDeleteParam.kt | 2 +- .../{authentication => permission/group}/GroupGetParam.kt | 2 +- .../group}/GroupUpdateParam.kt | 2 +- .../{authentication => permission/role}/RoleAddParam.kt | 2 +- .../role}/RoleChangeStatusParam.kt | 2 +- .../role}/RoleDeleteParam.kt | 2 +- .../{authentication => permission/role}/RoleGetParam.kt | 2 +- .../role}/RoleUpdateParam.kt | 2 +- .../{authentication => permission/user}/UserAddParam.kt | 2 +- .../user}/UserDeleteParam.kt | 2 +- .../{authentication => permission/user}/UserGetParam.kt | 2 +- .../user}/UserUpdateParam.kt | 2 +- .../top/fatweb/api/service/permission/IGroupService.kt | 4 ++-- .../top/fatweb/api/service/permission/IRoleService.kt | 4 ++-- .../top/fatweb/api/service/permission/IUserService.kt | 8 ++++---- .../api/service/permission/impl/GroupServiceImpl.kt | 4 ++-- .../fatweb/api/service/permission/impl/RoleServiceImpl.kt | 4 ++-- .../fatweb/api/service/permission/impl/UserServiceImpl.kt | 8 ++++---- .../top/fatweb/api/vo/permission/GroupWithRoleVo.kt | 1 + .../kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt | 4 ++++ .../top/fatweb/api/vo/permission/RoleWithPowerVo.kt | 4 ++++ .../kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt | 1 + .../api/vo/permission/UserWithPasswordRoleInfoVo.kt | 3 +++ .../top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt | 1 + .../top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt | 3 +++ .../top/fatweb/api/vo/permission/{ => base}/ElementVo.kt | 2 +- .../top/fatweb/api/vo/permission/{ => base}/GroupVo.kt | 2 +- .../top/fatweb/api/vo/permission/{ => base}/MenuVo.kt | 2 +- .../top/fatweb/api/vo/permission/{ => base}/ModuleVo.kt | 2 +- .../fatweb/api/vo/permission/{ => base}/OperationVo.kt | 2 +- .../top/fatweb/api/vo/permission/{ => base}/RoleVo.kt | 2 +- .../top/fatweb/api/vo/permission/{ => base}/UserInfoVo.kt | 2 +- 47 files changed, 80 insertions(+), 63 deletions(-) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission}/LoginParam.kt (93%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/group}/GroupAddParam.kt (92%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/group}/GroupChangeStatusParam.kt (92%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/group}/GroupDeleteParam.kt (86%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/group}/GroupGetParam.kt (91%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/group}/GroupUpdateParam.kt (93%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/role}/RoleAddParam.kt (92%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/role}/RoleChangeStatusParam.kt (92%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/role}/RoleDeleteParam.kt (86%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/role}/RoleGetParam.kt (91%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/role}/RoleUpdateParam.kt (93%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/user}/UserAddParam.kt (96%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/user}/UserDeleteParam.kt (86%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/user}/UserGetParam.kt (91%) rename src/main/kotlin/top/fatweb/api/param/{authentication => permission/user}/UserUpdateParam.kt (95%) rename src/main/kotlin/top/fatweb/api/vo/permission/{ => base}/ElementVo.kt (91%) rename src/main/kotlin/top/fatweb/api/vo/permission/{ => base}/GroupVo.kt (95%) rename src/main/kotlin/top/fatweb/api/vo/permission/{ => base}/MenuVo.kt (92%) rename src/main/kotlin/top/fatweb/api/vo/permission/{ => base}/ModuleVo.kt (88%) rename src/main/kotlin/top/fatweb/api/vo/permission/{ => base}/OperationVo.kt (92%) rename src/main/kotlin/top/fatweb/api/vo/permission/{ => base}/RoleVo.kt (95%) rename src/main/kotlin/top/fatweb/api/vo/permission/{ => base}/UserInfoVo.kt (96%) diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/AuthenticationController.kt b/src/main/kotlin/top/fatweb/api/controller/permission/AuthenticationController.kt index 97c1d00..9698d40 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/AuthenticationController.kt +++ b/src/main/kotlin/top/fatweb/api/controller/permission/AuthenticationController.kt @@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RestController import top.fatweb.api.converter.permission.UserConverter import top.fatweb.api.entity.common.ResponseCode import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.authentication.LoginParam +import top.fatweb.api.param.permission.LoginParam import top.fatweb.api.service.permission.IAuthenticationService import top.fatweb.api.util.WebUtil diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/GroupController.kt b/src/main/kotlin/top/fatweb/api/controller/permission/GroupController.kt index cef4577..14a2eac 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/GroupController.kt +++ b/src/main/kotlin/top/fatweb/api/controller/permission/GroupController.kt @@ -6,10 +6,10 @@ import jakarta.validation.Valid import org.springframework.web.bind.annotation.* import top.fatweb.api.entity.common.ResponseCode import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.authentication.* +import top.fatweb.api.param.permission.group.* import top.fatweb.api.service.permission.IGroupService import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.GroupVo +import top.fatweb.api.vo.permission.base.GroupVo import top.fatweb.api.vo.permission.GroupWithRoleVo /** diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/RoleController.kt b/src/main/kotlin/top/fatweb/api/controller/permission/RoleController.kt index 7c526fe..bab674b 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/RoleController.kt +++ b/src/main/kotlin/top/fatweb/api/controller/permission/RoleController.kt @@ -6,10 +6,10 @@ import jakarta.validation.Valid import org.springframework.web.bind.annotation.* import top.fatweb.api.entity.common.ResponseCode import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.authentication.* +import top.fatweb.api.param.permission.role.* import top.fatweb.api.service.permission.IRoleService import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.RoleVo +import top.fatweb.api.vo.permission.base.RoleVo import top.fatweb.api.vo.permission.RoleWithPowerVo /** diff --git a/src/main/kotlin/top/fatweb/api/controller/permission/UserController.kt b/src/main/kotlin/top/fatweb/api/controller/permission/UserController.kt index 75ca1a8..47ce79e 100644 --- a/src/main/kotlin/top/fatweb/api/controller/permission/UserController.kt +++ b/src/main/kotlin/top/fatweb/api/controller/permission/UserController.kt @@ -6,10 +6,10 @@ import jakarta.validation.Valid import org.springframework.web.bind.annotation.* import top.fatweb.api.entity.common.ResponseCode import top.fatweb.api.entity.common.ResponseResult -import top.fatweb.api.param.authentication.UserAddParam -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.param.permission.user.UserAddParam +import top.fatweb.api.param.permission.user.UserDeleteParam +import top.fatweb.api.param.permission.user.UserGetParam +import top.fatweb.api.param.permission.user.UserUpdateParam import top.fatweb.api.service.permission.IUserService import top.fatweb.api.vo.PageVo import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/ElementConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/ElementConverter.kt index 4eb7fa6..2a7f5b6 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/ElementConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/ElementConverter.kt @@ -1,7 +1,7 @@ package top.fatweb.api.converter.permission import top.fatweb.api.entity.permission.Element -import top.fatweb.api.vo.permission.ElementVo +import top.fatweb.api.vo.permission.base.ElementVo /** * Element converter 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 4a7e230..0d63bce 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/GroupConverter.kt @@ -3,11 +3,11 @@ package top.fatweb.api.converter.permission import com.baomidou.mybatisplus.core.metadata.IPage import top.fatweb.api.entity.permission.Group import top.fatweb.api.entity.permission.Role -import top.fatweb.api.param.authentication.GroupAddParam -import top.fatweb.api.param.authentication.GroupChangeStatusParam -import top.fatweb.api.param.authentication.GroupUpdateParam +import top.fatweb.api.param.permission.group.GroupAddParam +import top.fatweb.api.param.permission.group.GroupChangeStatusParam +import top.fatweb.api.param.permission.group.GroupUpdateParam import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.GroupVo +import top.fatweb.api.vo.permission.base.GroupVo import top.fatweb.api.vo.permission.GroupWithRoleVo /** diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/MenuConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/MenuConverter.kt index daceb47..489381e 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/MenuConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/MenuConverter.kt @@ -1,7 +1,7 @@ package top.fatweb.api.converter.permission import top.fatweb.api.entity.permission.Menu -import top.fatweb.api.vo.permission.MenuVo +import top.fatweb.api.vo.permission.base.MenuVo /** * Menu converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/ModuleConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/ModuleConverter.kt index ae8ba82..5b6c381 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/ModuleConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/ModuleConverter.kt @@ -1,7 +1,7 @@ package top.fatweb.api.converter.permission import top.fatweb.api.entity.permission.Module -import top.fatweb.api.vo.permission.ModuleVo +import top.fatweb.api.vo.permission.base.ModuleVo /** * Module converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/OperationConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/OperationConverter.kt index 51ed816..43c87b4 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/OperationConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/OperationConverter.kt @@ -1,7 +1,7 @@ package top.fatweb.api.converter.permission import top.fatweb.api.entity.permission.Operation -import top.fatweb.api.vo.permission.OperationVo +import top.fatweb.api.vo.permission.base.OperationVo /** * Operation converter diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt index 5357ca7..66363f2 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/RoleConverter.kt @@ -3,11 +3,11 @@ package top.fatweb.api.converter.permission import com.baomidou.mybatisplus.core.metadata.IPage import top.fatweb.api.entity.permission.Power import top.fatweb.api.entity.permission.Role -import top.fatweb.api.param.authentication.RoleAddParam -import top.fatweb.api.param.authentication.RoleChangeStatusParam -import top.fatweb.api.param.authentication.RoleUpdateParam +import top.fatweb.api.param.permission.role.RoleAddParam +import top.fatweb.api.param.permission.role.RoleChangeStatusParam +import top.fatweb.api.param.permission.role.RoleUpdateParam import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.RoleVo +import top.fatweb.api.vo.permission.base.RoleVo import top.fatweb.api.vo.permission.RoleWithPowerVo /** diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt index 1b0887c..fbb8c24 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/UserConverter.kt @@ -5,9 +5,9 @@ import top.fatweb.api.entity.permission.Group import top.fatweb.api.entity.permission.Role import top.fatweb.api.entity.permission.User import top.fatweb.api.entity.permission.UserInfo -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.param.permission.LoginParam +import top.fatweb.api.param.permission.user.UserAddParam +import top.fatweb.api.param.permission.user.UserUpdateParam import top.fatweb.api.vo.PageVo import top.fatweb.api.vo.permission.UserWithInfoVo import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo diff --git a/src/main/kotlin/top/fatweb/api/converter/permission/UserInfoConverter.kt b/src/main/kotlin/top/fatweb/api/converter/permission/UserInfoConverter.kt index ab332ca..dd5c3db 100644 --- a/src/main/kotlin/top/fatweb/api/converter/permission/UserInfoConverter.kt +++ b/src/main/kotlin/top/fatweb/api/converter/permission/UserInfoConverter.kt @@ -1,7 +1,7 @@ package top.fatweb.api.converter.permission import top.fatweb.api.entity.permission.UserInfo -import top.fatweb.api.vo.permission.UserInfoVo +import top.fatweb.api.vo.permission.base.UserInfoVo /** * User information converter diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/LoginParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/LoginParam.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/param/authentication/LoginParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/LoginParam.kt index 0d522ad..1c99518 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/LoginParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/LoginParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/GroupAddParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/param/authentication/GroupAddParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt index 610f261..c7dcc82 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/GroupAddParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupAddParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/GroupChangeStatusParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupChangeStatusParam.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/param/authentication/GroupChangeStatusParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/group/GroupChangeStatusParam.kt index c8edd3c..e586c4b 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/GroupChangeStatusParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupChangeStatusParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Min diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/GroupDeleteParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupDeleteParam.kt similarity index 86% rename from src/main/kotlin/top/fatweb/api/param/authentication/GroupDeleteParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/group/GroupDeleteParam.kt index b46e6c9..91077a5 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/GroupDeleteParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupDeleteParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/GroupGetParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/param/authentication/GroupGetParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt index 3b134b4..41bd3fa 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/GroupGetParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupGetParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema import top.fatweb.api.param.PageSortParam diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/GroupUpdateParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/param/authentication/GroupUpdateParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt index 554ae98..c2980c1 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/GroupUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/group/GroupUpdateParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.group import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Min diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/RoleAddParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/param/authentication/RoleAddParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt index 6b39e73..91255ae 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/RoleAddParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleAddParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/RoleChangeStatusParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleChangeStatusParam.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/param/authentication/RoleChangeStatusParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/role/RoleChangeStatusParam.kt index d79b8b4..163dc80 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/RoleChangeStatusParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleChangeStatusParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Min diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/RoleDeleteParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleDeleteParam.kt similarity index 86% rename from src/main/kotlin/top/fatweb/api/param/authentication/RoleDeleteParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/role/RoleDeleteParam.kt index ceced0c..3a3145e 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/RoleDeleteParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleDeleteParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/RoleGetParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/param/authentication/RoleGetParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt index a5bcf64..57de6d7 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/RoleGetParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleGetParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema import top.fatweb.api.param.PageSortParam diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/RoleUpdateParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt similarity index 93% rename from src/main/kotlin/top/fatweb/api/param/authentication/RoleUpdateParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt index 0e54688..b2904b9 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/RoleUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/role/RoleUpdateParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.role import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.Min diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/UserAddParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/param/authentication/UserAddParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt index 900a9c8..94660e6 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/UserAddParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserAddParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/UserDeleteParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserDeleteParam.kt similarity index 86% rename from src/main/kotlin/top/fatweb/api/param/authentication/UserDeleteParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/user/UserDeleteParam.kt index 0f3a0f8..2ce54b1 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/UserDeleteParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserDeleteParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/UserGetParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/param/authentication/UserGetParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt index 769aaf0..f14fcd7 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/UserGetParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserGetParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema import top.fatweb.api.param.PageSortParam diff --git a/src/main/kotlin/top/fatweb/api/param/authentication/UserUpdateParam.kt b/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/param/authentication/UserUpdateParam.kt rename to src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt index 70d80cb..a968987 100644 --- a/src/main/kotlin/top/fatweb/api/param/authentication/UserUpdateParam.kt +++ b/src/main/kotlin/top/fatweb/api/param/permission/user/UserUpdateParam.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.param.authentication +package top.fatweb.api.param.permission.user import io.swagger.v3.oas.annotations.media.Schema import jakarta.validation.constraints.NotNull diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt b/src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt index ffef482..746c724 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/IGroupService.kt @@ -2,9 +2,9 @@ package top.fatweb.api.service.permission import com.baomidou.mybatisplus.extension.service.IService import top.fatweb.api.entity.permission.Group -import top.fatweb.api.param.authentication.* +import top.fatweb.api.param.permission.group.* import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.GroupVo +import top.fatweb.api.vo.permission.base.GroupVo import top.fatweb.api.vo.permission.GroupWithRoleVo /** diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt b/src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt index dcb9933..ae9c9d7 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/IRoleService.kt @@ -2,9 +2,9 @@ package top.fatweb.api.service.permission import com.baomidou.mybatisplus.extension.service.IService import top.fatweb.api.entity.permission.Role -import top.fatweb.api.param.authentication.* +import top.fatweb.api.param.permission.role.* import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.RoleVo +import top.fatweb.api.vo.permission.base.RoleVo import top.fatweb.api.vo.permission.RoleWithPowerVo /** diff --git a/src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt b/src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt index 22a569e..3326935 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/IUserService.kt @@ -2,10 +2,10 @@ package top.fatweb.api.service.permission import com.baomidou.mybatisplus.extension.service.IService import top.fatweb.api.entity.permission.User -import top.fatweb.api.param.authentication.UserAddParam -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.param.permission.user.UserAddParam +import top.fatweb.api.param.permission.user.UserDeleteParam +import top.fatweb.api.param.permission.user.UserGetParam +import top.fatweb.api.param.permission.user.UserUpdateParam import top.fatweb.api.vo.PageVo import top.fatweb.api.vo.permission.UserWithInfoVo import top.fatweb.api.vo.permission.UserWithPasswordRoleInfoVo diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt b/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt index 9f045bc..4ae7fcf 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/impl/GroupServiceImpl.kt @@ -9,12 +9,12 @@ import top.fatweb.api.converter.permission.GroupConverter import top.fatweb.api.entity.permission.Group import top.fatweb.api.entity.permission.RoleGroup import top.fatweb.api.mapper.permission.GroupMapper -import top.fatweb.api.param.authentication.* +import top.fatweb.api.param.permission.group.* import top.fatweb.api.service.permission.IGroupService import top.fatweb.api.service.permission.IRoleGroupService import top.fatweb.api.util.PageUtil import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.GroupVo +import top.fatweb.api.vo.permission.base.GroupVo import top.fatweb.api.vo.permission.GroupWithRoleVo /** diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt b/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt index 4df42ac..970d9c1 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/impl/RoleServiceImpl.kt @@ -9,14 +9,14 @@ import top.fatweb.api.converter.permission.RoleConverter import top.fatweb.api.entity.permission.PowerRole import top.fatweb.api.entity.permission.Role import top.fatweb.api.mapper.permission.RoleMapper -import top.fatweb.api.param.authentication.* +import top.fatweb.api.param.permission.role.* import top.fatweb.api.service.permission.IElementService import top.fatweb.api.service.permission.IMenuService import top.fatweb.api.service.permission.IPowerRoleService import top.fatweb.api.service.permission.IRoleService import top.fatweb.api.util.PageUtil import top.fatweb.api.vo.PageVo -import top.fatweb.api.vo.permission.RoleVo +import top.fatweb.api.vo.permission.base.RoleVo import top.fatweb.api.vo.permission.RoleWithPowerVo /** diff --git a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt b/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt index e317679..cb1b1ef 100644 --- a/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt +++ b/src/main/kotlin/top/fatweb/api/service/permission/impl/UserServiceImpl.kt @@ -12,10 +12,10 @@ import top.fatweb.api.entity.permission.UserGroup import top.fatweb.api.entity.permission.UserInfo import top.fatweb.api.entity.permission.UserRole import top.fatweb.api.mapper.permission.UserMapper -import top.fatweb.api.param.authentication.UserAddParam -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.param.permission.user.UserAddParam +import top.fatweb.api.param.permission.user.UserDeleteParam +import top.fatweb.api.param.permission.user.UserGetParam +import top.fatweb.api.param.permission.user.UserUpdateParam import top.fatweb.api.service.permission.* import top.fatweb.api.util.PageUtil import top.fatweb.api.util.StrUtil diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/GroupWithRoleVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/GroupWithRoleVo.kt index 336337c..1fc80b2 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/GroupWithRoleVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/GroupWithRoleVo.kt @@ -3,6 +3,7 @@ package top.fatweb.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema +import top.fatweb.api.vo.permission.base.RoleVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt index 0ec4ad6..c6c2a2e 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/PowerSetVo.kt @@ -1,6 +1,10 @@ package top.fatweb.api.vo.permission import io.swagger.v3.oas.annotations.media.Schema +import top.fatweb.api.vo.permission.base.ElementVo +import top.fatweb.api.vo.permission.base.MenuVo +import top.fatweb.api.vo.permission.base.ModuleVo +import top.fatweb.api.vo.permission.base.OperationVo /** * Set of power value object diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/RoleWithPowerVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/RoleWithPowerVo.kt index cfd1e38..92ed33e 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/RoleWithPowerVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/RoleWithPowerVo.kt @@ -3,6 +3,10 @@ package top.fatweb.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema +import top.fatweb.api.vo.permission.base.ElementVo +import top.fatweb.api.vo.permission.base.MenuVo +import top.fatweb.api.vo.permission.base.ModuleVo +import top.fatweb.api.vo.permission.base.OperationVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt index 058c593..5837990 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithInfoVo.kt @@ -3,6 +3,7 @@ package top.fatweb.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema +import top.fatweb.api.vo.permission.base.UserInfoVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPasswordRoleInfoVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPasswordRoleInfoVo.kt index f551cf3..bf6d6d6 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPasswordRoleInfoVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPasswordRoleInfoVo.kt @@ -3,6 +3,9 @@ package top.fatweb.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema +import top.fatweb.api.vo.permission.base.GroupVo +import top.fatweb.api.vo.permission.base.RoleVo +import top.fatweb.api.vo.permission.base.UserInfoVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt index c6ffa4c..11277db 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithPowerInfoVo.kt @@ -3,6 +3,7 @@ package top.fatweb.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema +import top.fatweb.api.vo.permission.base.* import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt index 48b8125..9e97a4e 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/UserWithRoleInfoVo.kt @@ -3,6 +3,9 @@ package top.fatweb.api.vo.permission import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer import io.swagger.v3.oas.annotations.media.Schema +import top.fatweb.api.vo.permission.base.GroupVo +import top.fatweb.api.vo.permission.base.RoleVo +import top.fatweb.api.vo.permission.base.UserInfoVo import java.time.LocalDateTime /** diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/ElementVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/base/ElementVo.kt similarity index 91% rename from src/main/kotlin/top/fatweb/api/vo/permission/ElementVo.kt rename to src/main/kotlin/top/fatweb/api/vo/permission/base/ElementVo.kt index 990ae6f..0a24cca 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/ElementVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/base/ElementVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/GroupVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/base/GroupVo.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/vo/permission/GroupVo.kt rename to src/main/kotlin/top/fatweb/api/vo/permission/base/GroupVo.kt index e6490dc..f82822a 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/GroupVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/base/GroupVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.api.vo.permission.base import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/MenuVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/base/MenuVo.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/vo/permission/MenuVo.kt rename to src/main/kotlin/top/fatweb/api/vo/permission/base/MenuVo.kt index 3cd1a89..8d2a9ee 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/MenuVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/base/MenuVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/ModuleVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/base/ModuleVo.kt similarity index 88% rename from src/main/kotlin/top/fatweb/api/vo/permission/ModuleVo.kt rename to src/main/kotlin/top/fatweb/api/vo/permission/base/ModuleVo.kt index e7c3fd4..51def6d 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/ModuleVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/base/ModuleVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/OperationVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/base/OperationVo.kt similarity index 92% rename from src/main/kotlin/top/fatweb/api/vo/permission/OperationVo.kt rename to src/main/kotlin/top/fatweb/api/vo/permission/base/OperationVo.kt index f66c632..0841273 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/OperationVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/base/OperationVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.api.vo.permission.base import io.swagger.v3.oas.annotations.media.Schema diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/RoleVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/base/RoleVo.kt similarity index 95% rename from src/main/kotlin/top/fatweb/api/vo/permission/RoleVo.kt rename to src/main/kotlin/top/fatweb/api/vo/permission/base/RoleVo.kt index 57492f2..97eba22 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/RoleVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/base/RoleVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.api.vo.permission.base import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer diff --git a/src/main/kotlin/top/fatweb/api/vo/permission/UserInfoVo.kt b/src/main/kotlin/top/fatweb/api/vo/permission/base/UserInfoVo.kt similarity index 96% rename from src/main/kotlin/top/fatweb/api/vo/permission/UserInfoVo.kt rename to src/main/kotlin/top/fatweb/api/vo/permission/base/UserInfoVo.kt index 779d538..824f0e6 100644 --- a/src/main/kotlin/top/fatweb/api/vo/permission/UserInfoVo.kt +++ b/src/main/kotlin/top/fatweb/api/vo/permission/base/UserInfoVo.kt @@ -1,4 +1,4 @@ -package top.fatweb.api.vo.permission +package top.fatweb.api.vo.permission.base import com.fasterxml.jackson.databind.annotation.JsonSerialize import com.fasterxml.jackson.databind.ser.std.ToStringSerializer