From 031497a23980b41222160162facaa99cf4e73173 Mon Sep 17 00:00:00 2001 From: valarchie <343928303@qq.com> Date: Wed, 12 Oct 2022 08:42:30 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=AF=B9=E9=A2=86=E5=9F=9F?= =?UTF-8?q?=E5=B1=82=E7=9A=84=E6=AF=8F=E4=B8=AA=E4=B8=9A=E5=8A=A1=E6=A8=A1?= =?UTF-8?q?=E5=9D=97=20=E6=9B=B4=E8=A7=84=E8=8C=83=E7=9A=84=E5=88=86?= =?UTF-8?q?=E5=8C=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domain/system/config/ConfigDomainService.java | 4 ++++ .../config/{ => command}/ConfigUpdateCommand.java | 2 +- .../domain/system/config/{ => dto}/ConfigDTO.java | 2 +- .../domain/system/config/{ => model}/ConfigModel.java | 2 +- .../domain/system/config/{ => query}/ConfigQuery.java | 2 +- .../domain/system/dept/DeptDomainService.java | 5 +++++ .../system/dept/{ => command}/AddDeptCommand.java | 3 ++- .../system/dept/{ => command}/UpdateDeptCommand.java | 6 ++++-- .../domain/system/dept/{ => dto}/DeptDTO.java | 2 +- .../domain/system/dept/{ => model}/DeptModel.java | 2 +- .../domain/system/dept/{ => query}/DeptQuery.java | 2 +- .../system/loginInfo/LoginInfoDomainService.java | 2 ++ .../system/loginInfo/{ => dto}/LoginInfoDTO.java | 2 +- .../system/loginInfo/{ => query}/LoginInfoQuery.java | 2 +- .../system/loginInfo/{ => query}/SearchUserQuery.java | 2 +- .../domain/system/menu/MenuDomainService.java | 7 +++++++ .../system/menu/{ => command}/AddMenuCommand.java | 3 ++- .../system/menu/{ => command}/UpdateMenuCommand.java | 6 ++++-- .../domain/system/menu/{ => dto}/MenuDTO.java | 2 +- .../domain/system/menu/{ => dto}/MetaVo.java | 2 +- .../domain/system/menu/{ => dto}/RouterVo.java | 2 +- .../domain/system/menu/{ => model}/MenuModel.java | 2 +- .../domain/system/menu/{ => model}/RouterModel.java | 4 +++- .../domain/system/menu/{ => query}/MenuQuery.java | 2 +- .../domain/system/notice/NoticeDomainService.java | 5 +++++ .../system/notice/{ => command}/NoticeAddCommand.java | 3 ++- .../notice/{ => command}/NoticeUpdateCommand.java | 6 ++++-- .../domain/system/notice/{ => dto}/NoticeDTO.java | 2 +- .../domain/system/notice/{ => model}/NoticeModel.java | 2 +- .../domain/system/notice/{ => query}/NoticeQuery.java | 2 +- .../operationLog/OperationLogDomainService.java | 2 ++ .../operationLog/{ => dto}/OperationLogDTO.java | 2 +- .../operationLog/{ => query}/OperationLogQuery.java | 2 +- .../domain/system/post/PostDomainService.java | 5 +++++ .../system/post/{ => command}/AddPostCommand.java | 3 ++- .../system/post/{ => command}/UpdatePostCommand.java | 6 ++++-- .../domain/system/post/{ => dto}/PostDTO.java | 2 +- .../domain/system/post/{ => model}/PostModel.java | 2 +- .../domain/system/post/{ => query}/PostQuery.java | 2 +- .../domain/system/role/RoleDomainService.java | 11 ++++++++++- .../system/role/{ => command}/AddRoleCommand.java | 3 ++- .../role/{ => command}/UpdateDataScopeCommand.java | 2 +- .../system/role/{ => command}/UpdateRoleCommand.java | 5 +++-- .../role/{ => command}/UpdateStatusCommand.java | 2 +- .../domain/system/role/{ => dto}/RoleDTO.java | 2 +- .../domain/system/role/{ => model}/RoleModel.java | 2 +- .../system/role/{ => query}/AllocatedRoleQuery.java | 2 +- .../domain/system/role/{ => query}/RoleQuery.java | 2 +- .../system/role/{ => query}/UnallocatedRoleQuery.java | 2 +- .../domain/system/user/UserDomainService.java | 11 ++++++++--- .../domain/system/user/command/AddUserCommand.java | 2 +- .../system/user/command/UpdateProfileCommand.java | 2 +- .../domain/system/user/command/UpdateUserCommand.java | 2 +- .../domain/system/user/{ => dto}/UserDTO.java | 2 +- .../domain/system/user/{ => dto}/UserDetailDTO.java | 6 +++--- .../domain/system/user/{ => dto}/UserInfoDTO.java | 4 ++-- .../domain/system/user/{ => dto}/UserProfileDTO.java | 3 ++- .../system/user/{ => model}/RegisterUserModel.java | 2 +- .../domain/system/user/{ => model}/UserModel.java | 2 +- 59 files changed, 123 insertions(+), 62 deletions(-) rename agileboot-domain/src/main/java/com/agileboot/domain/system/config/{ => command}/ConfigUpdateCommand.java (85%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/config/{ => dto}/ConfigDTO.java (96%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/config/{ => model}/ConfigModel.java (96%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/config/{ => query}/ConfigQuery.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/dept/{ => command}/AddDeptCommand.java (92%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/dept/{ => command}/UpdateDeptCommand.java (68%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/dept/{ => dto}/DeptDTO.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/dept/{ => model}/DeptModel.java (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/dept/{ => query}/DeptQuery.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/{ => dto}/LoginInfoDTO.java (96%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/{ => query}/LoginInfoQuery.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/{ => query}/SearchUserQuery.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => command}/AddMenuCommand.java (91%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => command}/UpdateMenuCommand.java (54%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => dto}/MenuDTO.java (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => dto}/MetaVo.java (96%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => dto}/RouterVo.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => model}/MenuModel.java (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => model}/RouterModel.java (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/menu/{ => query}/MenuQuery.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/notice/{ => command}/NoticeAddCommand.java (87%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/notice/{ => command}/NoticeUpdateCommand.java (63%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/notice/{ => dto}/NoticeDTO.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/notice/{ => model}/NoticeModel.java (92%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/notice/{ => query}/NoticeQuery.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/{ => dto}/OperationLogDTO.java (97%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/{ => query}/OperationLogQuery.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/post/{ => command}/AddPostCommand.java (91%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/post/{ => command}/UpdatePostCommand.java (62%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/post/{ => dto}/PostDTO.java (95%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/post/{ => model}/PostModel.java (93%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/post/{ => query}/PostQuery.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => command}/AddRoleCommand.java (93%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => command}/UpdateDataScopeCommand.java (88%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => command}/UpdateRoleCommand.java (68%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => command}/UpdateStatusCommand.java (77%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => dto}/RoleDTO.java (96%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => model}/RoleModel.java (98%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => query}/AllocatedRoleQuery.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => query}/RoleQuery.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/role/{ => query}/UnallocatedRoleQuery.java (94%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/user/{ => dto}/UserDTO.java (98%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/user/{ => dto}/UserDetailDTO.java (70%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/user/{ => dto}/UserInfoDTO.java (52%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/user/{ => dto}/UserProfileDTO.java (87%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/user/{ => model}/RegisterUserModel.java (79%) rename agileboot-domain/src/main/java/com/agileboot/domain/system/user/{ => model}/UserModel.java (98%) diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDomainService.java index d49b9eb..81665f9 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDomainService.java @@ -3,6 +3,10 @@ package com.agileboot.domain.system.config; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; +import com.agileboot.domain.system.config.command.ConfigUpdateCommand; +import com.agileboot.domain.system.config.dto.ConfigDTO; +import com.agileboot.domain.system.config.model.ConfigModel; +import com.agileboot.domain.system.config.query.ConfigQuery; import com.agileboot.infrastructure.web.domain.login.LoginUser; import com.agileboot.orm.entity.SysConfigEntity; import com.agileboot.orm.service.ISysConfigService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigUpdateCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/command/ConfigUpdateCommand.java similarity index 85% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigUpdateCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/command/ConfigUpdateCommand.java index 41c3590..bc09da4 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigUpdateCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/command/ConfigUpdateCommand.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.config; +package com.agileboot.domain.system.config.command; import javax.validation.constraints.NotEmpty; import javax.validation.constraints.NotNull; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java similarity index 96% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java index 7ea7cbf..bba9a86 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/dto/ConfigDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.config; +package com.agileboot.domain.system.config.dto; import cn.hutool.core.collection.ListUtil; import cn.hutool.core.convert.Convert; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java similarity index 96% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java index 7b46a6b..f2a74f8 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/model/ConfigModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.config; +package com.agileboot.domain.system.config.model; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.ListUtil; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java index 6b37f6b..8476e94 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/config/ConfigQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/config/query/ConfigQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.config; +package com.agileboot.domain.system.config.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysConfigEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDomainService.java index b1458e8..097da49 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDomainService.java @@ -6,6 +6,11 @@ import cn.hutool.core.util.StrUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.system.TreeSelectedDTO; +import com.agileboot.domain.system.dept.command.AddDeptCommand; +import com.agileboot.domain.system.dept.command.UpdateDeptCommand; +import com.agileboot.domain.system.dept.dto.DeptDTO; +import com.agileboot.domain.system.dept.model.DeptModel; +import com.agileboot.domain.system.dept.query.DeptQuery; import com.agileboot.infrastructure.web.domain.login.LoginUser; import com.agileboot.orm.entity.SysDeptEntity; import com.agileboot.orm.entity.SysRoleEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/AddDeptCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/command/AddDeptCommand.java similarity index 92% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/dept/AddDeptCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/command/AddDeptCommand.java index 53cee53..ff4796c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/AddDeptCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/command/AddDeptCommand.java @@ -1,5 +1,6 @@ -package com.agileboot.domain.system.dept; +package com.agileboot.domain.system.dept.command; +import com.agileboot.domain.system.dept.model.DeptModel; import javax.validation.constraints.Email; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/UpdateDeptCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/command/UpdateDeptCommand.java similarity index 68% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/dept/UpdateDeptCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/command/UpdateDeptCommand.java index be5785e..9e8e3f4 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/UpdateDeptCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/command/UpdateDeptCommand.java @@ -1,12 +1,14 @@ -package com.agileboot.domain.system.dept; +package com.agileboot.domain.system.dept.command; import cn.hutool.core.convert.Convert; +import com.agileboot.domain.system.dept.command.AddDeptCommand; +import com.agileboot.domain.system.dept.model.DeptModel; import javax.validation.constraints.NotNull; import javax.validation.constraints.PositiveOrZero; import lombok.Data; @Data -public class UpdateDeptCommand extends AddDeptCommand{ +public class UpdateDeptCommand extends AddDeptCommand { @NotNull @PositiveOrZero diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java index c5538cf..93d411b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/dto/DeptDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.dept; +package com.agileboot.domain.system.dept.dto; import com.agileboot.orm.entity.SysDeptEntity; import com.agileboot.orm.enums.dictionary.CommonStatusEnum; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java index 2c8a8e1..4606694 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/model/DeptModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.dept; +package com.agileboot.domain.system.dept.model; import cn.hutool.core.bean.BeanUtil; import com.agileboot.common.exception.ApiException; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java index a495114..09d94f8 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/DeptQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/dept/query/DeptQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.dept; +package com.agileboot.domain.system.dept.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysDeptEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDomainService.java index 201e04a..2fbae71 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDomainService.java @@ -2,6 +2,8 @@ package com.agileboot.domain.system.loginInfo; import com.agileboot.common.core.page.PageDTO; import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.system.loginInfo.dto.LoginInfoDTO; +import com.agileboot.domain.system.loginInfo.query.LoginInfoQuery; import com.agileboot.orm.entity.SysLoginInfoEntity; import com.agileboot.orm.service.ISysLoginInfoService; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/dto/LoginInfoDTO.java similarity index 96% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/dto/LoginInfoDTO.java index f566893..68f9306 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/dto/LoginInfoDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.loginInfo; +package com.agileboot.domain.system.loginInfo.dto; import com.agileboot.common.annotation.ExcelColumn; import com.agileboot.common.annotation.ExcelSheet; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/query/LoginInfoQuery.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/query/LoginInfoQuery.java index d48d1a4..b872f23 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/LoginInfoQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/query/LoginInfoQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.loginInfo; +package com.agileboot.domain.system.loginInfo.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysLoginInfoEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/SearchUserQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/query/SearchUserQuery.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/SearchUserQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/query/SearchUserQuery.java index 969e78c..26de188 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/SearchUserQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/loginInfo/query/SearchUserQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.loginInfo; +package com.agileboot.domain.system.loginInfo.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.query.AbstractPageQuery; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDomainService.java index b778b01..0b4388f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDomainService.java @@ -8,6 +8,13 @@ import cn.hutool.core.lang.tree.TreeUtil; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.system.TreeSelectedDTO; +import com.agileboot.domain.system.menu.command.AddMenuCommand; +import com.agileboot.domain.system.menu.command.UpdateMenuCommand; +import com.agileboot.domain.system.menu.dto.MenuDTO; +import com.agileboot.domain.system.menu.dto.RouterVo; +import com.agileboot.domain.system.menu.model.MenuModel; +import com.agileboot.domain.system.menu.model.RouterModel; +import com.agileboot.domain.system.menu.query.MenuQuery; import com.agileboot.infrastructure.web.domain.login.LoginUser; import com.agileboot.infrastructure.web.util.AuthenticationUtils; import com.agileboot.orm.entity.SysMenuEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/AddMenuCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/command/AddMenuCommand.java similarity index 91% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/AddMenuCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/command/AddMenuCommand.java index ad6870f..040beaa 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/AddMenuCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/command/AddMenuCommand.java @@ -1,6 +1,7 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.command; import cn.hutool.core.bean.BeanUtil; +import com.agileboot.domain.system.menu.model.MenuModel; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/UpdateMenuCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/command/UpdateMenuCommand.java similarity index 54% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/UpdateMenuCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/command/UpdateMenuCommand.java index 36dcb2b..ae83ea0 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/UpdateMenuCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/command/UpdateMenuCommand.java @@ -1,10 +1,12 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.command; +import com.agileboot.domain.system.menu.command.AddMenuCommand; +import com.agileboot.domain.system.menu.model.MenuModel; import javax.validation.constraints.NotNull; import lombok.Data; @Data -public class UpdateMenuCommand extends AddMenuCommand{ +public class UpdateMenuCommand extends AddMenuCommand { @NotNull private Long menuId; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java index b040897..15e3fa2 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MenuDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.dto; import cn.hutool.core.util.BooleanUtil; import com.agileboot.orm.entity.SysMenuEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MetaVo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaVo.java similarity index 96% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MetaVo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaVo.java index a53a2a6..6212ad5 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MetaVo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/MetaVo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.dto; import cn.hutool.http.HttpUtil; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/RouterVo.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterVo.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/RouterVo.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterVo.java index 66d6a6e..bac24a7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/RouterVo.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/dto/RouterVo.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.dto; import com.fasterxml.jackson.annotation.JsonInclude; import java.util.List; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java index 13c22e3..fc4f73b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/MenuModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.model; import cn.hutool.core.bean.BeanUtil; import cn.hutool.http.HttpUtil; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/RouterModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/RouterModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java index c50498a..04d1922 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/RouterModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/model/RouterModel.java @@ -1,10 +1,12 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.model; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.lang.tree.Tree; import cn.hutool.core.util.StrUtil; import cn.hutool.http.HttpUtil; import com.agileboot.common.constant.Constants; +import com.agileboot.domain.system.menu.dto.MetaVo; +import com.agileboot.domain.system.menu.dto.RouterVo; import com.agileboot.orm.entity.SysMenuEntity; import com.agileboot.orm.enums.MenuComponentEnum; import com.agileboot.orm.enums.MenuTypeEnum; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java index 2e78ff3..68242b5 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/MenuQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/menu/query/MenuQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.menu; +package com.agileboot.domain.system.menu.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysMenuEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDomainService.java index 6bec587..16f1c70 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDomainService.java @@ -4,6 +4,11 @@ import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.system.notice.command.NoticeAddCommand; +import com.agileboot.domain.system.notice.command.NoticeUpdateCommand; +import com.agileboot.domain.system.notice.dto.NoticeDTO; +import com.agileboot.domain.system.notice.model.NoticeModel; +import com.agileboot.domain.system.notice.query.NoticeQuery; import com.agileboot.infrastructure.web.domain.login.LoginUser; import com.agileboot.orm.entity.SysNoticeEntity; import com.agileboot.orm.service.ISysNoticeService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeAddCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/command/NoticeAddCommand.java similarity index 87% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeAddCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/command/NoticeAddCommand.java index 922a466..95512ce 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeAddCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/command/NoticeAddCommand.java @@ -1,6 +1,7 @@ -package com.agileboot.domain.system.notice; +package com.agileboot.domain.system.notice.command; import cn.hutool.core.convert.Convert; +import com.agileboot.domain.system.notice.model.NoticeModel; import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeUpdateCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/command/NoticeUpdateCommand.java similarity index 63% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeUpdateCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/command/NoticeUpdateCommand.java index 6e41da6..e5aad23 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeUpdateCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/command/NoticeUpdateCommand.java @@ -1,12 +1,14 @@ -package com.agileboot.domain.system.notice; +package com.agileboot.domain.system.notice.command; import cn.hutool.core.convert.Convert; +import com.agileboot.domain.system.notice.command.NoticeAddCommand; +import com.agileboot.domain.system.notice.model.NoticeModel; import javax.validation.constraints.NotNull; import javax.validation.constraints.Positive; import lombok.Data; @Data -public class NoticeUpdateCommand extends NoticeAddCommand{ +public class NoticeUpdateCommand extends NoticeAddCommand { @NotNull @Positive diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java index 0a6cd49..a1ca49b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/dto/NoticeDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.notice; +package com.agileboot.domain.system.notice.dto; import com.agileboot.orm.entity.SysNoticeEntity; import java.util.Date; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java similarity index 92% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java index f931531..50fec6c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/model/NoticeModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.notice; +package com.agileboot.domain.system.notice.model; import com.agileboot.orm.entity.SysNoticeEntity; import com.agileboot.orm.enums.dictionary.CommonStatusEnum; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java index e15ef56..1d70b4f 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/NoticeQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/notice/query/NoticeQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.notice; +package com.agileboot.domain.system.notice.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysNoticeEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDomainService.java index 20f5e6a..f01d345 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDomainService.java @@ -2,6 +2,8 @@ package com.agileboot.domain.system.operationLog; import com.agileboot.common.core.page.PageDTO; import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.system.operationLog.dto.OperationLogDTO; +import com.agileboot.domain.system.operationLog.query.OperationLogQuery; import com.agileboot.orm.entity.SysOperationLogEntity; import com.agileboot.orm.service.ISysOperationLogService; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/dto/OperationLogDTO.java similarity index 97% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/dto/OperationLogDTO.java index 79a8751..a44b89b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/dto/OperationLogDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.operationLog; +package com.agileboot.domain.system.operationLog.dto; import cn.hutool.core.bean.BeanUtil; import com.agileboot.common.annotation.ExcelColumn; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/query/OperationLogQuery.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/query/OperationLogQuery.java index f070226..c6eda7d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/OperationLogQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/operationLog/query/OperationLogQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.operationLog; +package com.agileboot.domain.system.operationLog.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysLoginInfoEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDomainService.java index 6cadcff..f3ea3bb 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDomainService.java @@ -5,6 +5,11 @@ import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.common.exception.error.ErrorCode.Business; import com.agileboot.domain.common.BulkOperationCommand; +import com.agileboot.domain.system.post.command.AddPostCommand; +import com.agileboot.domain.system.post.command.UpdatePostCommand; +import com.agileboot.domain.system.post.dto.PostDTO; +import com.agileboot.domain.system.post.model.PostModel; +import com.agileboot.domain.system.post.query.PostQuery; import com.agileboot.infrastructure.web.domain.login.LoginUser; import com.agileboot.orm.entity.SysPostEntity; import com.agileboot.orm.service.ISysPostService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/AddPostCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/command/AddPostCommand.java similarity index 91% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/post/AddPostCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/command/AddPostCommand.java index 3a39544..4e4c64c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/AddPostCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/command/AddPostCommand.java @@ -1,6 +1,7 @@ -package com.agileboot.domain.system.post; +package com.agileboot.domain.system.post.command; import cn.hutool.core.convert.Convert; +import com.agileboot.domain.system.post.model.PostModel; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.PositiveOrZero; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/UpdatePostCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/command/UpdatePostCommand.java similarity index 62% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/post/UpdatePostCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/command/UpdatePostCommand.java index f0b3483..b13119c 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/UpdatePostCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/command/UpdatePostCommand.java @@ -1,11 +1,13 @@ -package com.agileboot.domain.system.post; +package com.agileboot.domain.system.post.command; +import com.agileboot.domain.system.post.command.AddPostCommand; +import com.agileboot.domain.system.post.model.PostModel; import javax.validation.constraints.NotNull; import javax.validation.constraints.Positive; import lombok.Data; @Data -public class UpdatePostCommand extends AddPostCommand{ +public class UpdatePostCommand extends AddPostCommand { @NotNull(message = "岗位ID不能为空") @Positive diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java similarity index 95% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java index 1979a64..da14e73 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/dto/PostDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.post; +package com.agileboot.domain.system.post.dto; import cn.hutool.core.bean.BeanUtil; import com.agileboot.common.annotation.ExcelColumn; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java similarity index 93% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java index 4d34f9c..e3b888d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/model/PostModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.post; +package com.agileboot.domain.system.post.model; import cn.hutool.core.bean.BeanUtil; import com.agileboot.common.exception.ApiException; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java index 96d580f..1ad2115 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/post/PostQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/post/query/PostQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.post; +package com.agileboot.domain.system.post.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysPostEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDomainService.java index afbcf07..f1075dc 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDomainService.java @@ -4,7 +4,16 @@ import cn.hutool.core.collection.CollUtil; import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; -import com.agileboot.domain.system.user.UserDTO; +import com.agileboot.domain.system.role.command.AddRoleCommand; +import com.agileboot.domain.system.role.command.UpdateDataScopeCommand; +import com.agileboot.domain.system.role.command.UpdateRoleCommand; +import com.agileboot.domain.system.role.command.UpdateStatusCommand; +import com.agileboot.domain.system.role.dto.RoleDTO; +import com.agileboot.domain.system.role.model.RoleModel; +import com.agileboot.domain.system.role.query.AllocatedRoleQuery; +import com.agileboot.domain.system.role.query.RoleQuery; +import com.agileboot.domain.system.role.query.UnallocatedRoleQuery; +import com.agileboot.domain.system.user.dto.UserDTO; import com.agileboot.infrastructure.cache.CacheCenter; import com.agileboot.infrastructure.web.domain.login.LoginUser; import com.agileboot.infrastructure.web.service.TokenService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/AddRoleCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/AddRoleCommand.java similarity index 93% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/AddRoleCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/AddRoleCommand.java index 8cd9a4d..cf6bf95 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/AddRoleCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/AddRoleCommand.java @@ -1,7 +1,8 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.command; import cn.hutool.core.convert.Convert; import com.agileboot.common.annotation.ExcelColumn; +import com.agileboot.domain.system.role.model.RoleModel; import java.util.List; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateDataScopeCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateDataScopeCommand.java similarity index 88% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateDataScopeCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateDataScopeCommand.java index 440f0ba..710a349 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateDataScopeCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateDataScopeCommand.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.command; import java.util.List; import javax.validation.constraints.NotEmpty; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateRoleCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateRoleCommand.java similarity index 68% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateRoleCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateRoleCommand.java index 1f589ba..edd5609 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateRoleCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateRoleCommand.java @@ -1,11 +1,12 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.command; +import com.agileboot.domain.system.role.model.RoleModel; import javax.validation.constraints.NotNull; import javax.validation.constraints.PositiveOrZero; import lombok.Data; @Data -public class UpdateRoleCommand extends AddRoleCommand{ +public class UpdateRoleCommand extends AddRoleCommand { @NotNull @PositiveOrZero diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateStatusCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateStatusCommand.java similarity index 77% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateStatusCommand.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateStatusCommand.java index 421e3e1..f7d5cd4 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UpdateStatusCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/command/UpdateStatusCommand.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.command; import lombok.Data; import lombok.NoArgsConstructor; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java similarity index 96% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java index ea69efc..6a20030 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/dto/RoleDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.dto; import com.agileboot.common.annotation.ExcelColumn; import com.agileboot.common.annotation.ExcelSheet; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java similarity index 98% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java index 0e998de..aae0279 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/model/RoleModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.model; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/AllocatedRoleQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/AllocatedRoleQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java index 7ae9850..fa7acd2 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/AllocatedRoleQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/AllocatedRoleQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysUserEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java index c445100..9018831 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/RoleQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/RoleQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysRoleEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UnallocatedRoleQuery.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java similarity index 94% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/role/UnallocatedRoleQuery.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java index 26597ad..d9526c1 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/role/UnallocatedRoleQuery.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/role/query/UnallocatedRoleQuery.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.role; +package com.agileboot.domain.system.role.query; import cn.hutool.core.util.StrUtil; import com.agileboot.orm.entity.SysUserEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDomainService.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDomainService.java index 2244179..d246d5b 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDomainService.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDomainService.java @@ -6,9 +6,9 @@ import com.agileboot.common.core.page.PageDTO; import com.agileboot.common.exception.ApiException; import com.agileboot.common.exception.error.ErrorCode; import com.agileboot.domain.common.BulkOperationCommand; -import com.agileboot.domain.system.loginInfo.SearchUserQuery; -import com.agileboot.domain.system.post.PostDTO; -import com.agileboot.domain.system.role.RoleDTO; +import com.agileboot.domain.system.loginInfo.query.SearchUserQuery; +import com.agileboot.domain.system.post.dto.PostDTO; +import com.agileboot.domain.system.role.dto.RoleDTO; import com.agileboot.domain.system.user.command.AddUserCommand; import com.agileboot.domain.system.user.command.ChangeStatusCommand; import com.agileboot.domain.system.user.command.ResetPasswordCommand; @@ -16,6 +16,11 @@ import com.agileboot.domain.system.user.command.UpdateProfileCommand; import com.agileboot.domain.system.user.command.UpdateUserAvatarCommand; import com.agileboot.domain.system.user.command.UpdateUserCommand; import com.agileboot.domain.system.user.command.UpdateUserPasswordCommand; +import com.agileboot.domain.system.user.dto.UserDTO; +import com.agileboot.domain.system.user.dto.UserDetailDTO; +import com.agileboot.domain.system.user.dto.UserInfoDTO; +import com.agileboot.domain.system.user.dto.UserProfileDTO; +import com.agileboot.domain.system.user.model.UserModel; import com.agileboot.infrastructure.cache.redis.RedisCacheService; import com.agileboot.infrastructure.web.domain.login.LoginUser; import com.agileboot.infrastructure.web.service.TokenService; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/AddUserCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/AddUserCommand.java index 4b043fc..acb505a 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/AddUserCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/AddUserCommand.java @@ -3,7 +3,7 @@ package com.agileboot.domain.system.user.command; import cn.hutool.core.convert.Convert; import cn.hutool.core.util.StrUtil; import com.agileboot.common.annotation.ExcelColumn; -import com.agileboot.domain.system.user.UserModel; +import com.agileboot.domain.system.user.model.UserModel; import lombok.Data; @Data diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateProfileCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateProfileCommand.java index 113ddb5..9642e8d 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateProfileCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateProfileCommand.java @@ -1,6 +1,6 @@ package com.agileboot.domain.system.user.command; -import com.agileboot.domain.system.user.UserModel; +import com.agileboot.domain.system.user.model.UserModel; import lombok.Data; @Data diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateUserCommand.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateUserCommand.java index ec1bf08..fdc63be 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateUserCommand.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/command/UpdateUserCommand.java @@ -1,6 +1,6 @@ package com.agileboot.domain.system.user.command; -import com.agileboot.domain.system.user.UserModel; +import com.agileboot.domain.system.user.model.UserModel; import lombok.Data; @Data diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java similarity index 98% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java index e13b89d..3206cdd 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDTO.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.user; +package com.agileboot.domain.system.user.dto; import cn.hutool.core.bean.BeanUtil; import cn.hutool.extra.spring.SpringUtil; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDetailDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDetailDTO.java similarity index 70% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDetailDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDetailDTO.java index 22e1f90..fcda8a6 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserDetailDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserDetailDTO.java @@ -1,7 +1,7 @@ -package com.agileboot.domain.system.user; +package com.agileboot.domain.system.user.dto; -import com.agileboot.domain.system.post.PostDTO; -import com.agileboot.domain.system.role.RoleDTO; +import com.agileboot.domain.system.post.dto.PostDTO; +import com.agileboot.domain.system.role.dto.RoleDTO; import java.util.List; import java.util.Set; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserInfoDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserInfoDTO.java similarity index 52% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserInfoDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserInfoDTO.java index c8f3e1b..f6d2fe7 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserInfoDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserInfoDTO.java @@ -1,6 +1,6 @@ -package com.agileboot.domain.system.user; +package com.agileboot.domain.system.user.dto; -import com.agileboot.domain.system.role.RoleDTO; +import com.agileboot.domain.system.role.dto.RoleDTO; import lombok.Data; @Data diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserProfileDTO.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserProfileDTO.java similarity index 87% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserProfileDTO.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserProfileDTO.java index e307469..e947ea2 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserProfileDTO.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/dto/UserProfileDTO.java @@ -1,5 +1,6 @@ -package com.agileboot.domain.system.user; +package com.agileboot.domain.system.user.dto; +import com.agileboot.domain.system.user.dto.UserDTO; import com.agileboot.orm.entity.SysPostEntity; import com.agileboot.orm.entity.SysRoleEntity; import com.agileboot.orm.entity.SysUserEntity; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/RegisterUserModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/RegisterUserModel.java similarity index 79% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/user/RegisterUserModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/RegisterUserModel.java index e9f14db..3c23f4e 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/RegisterUserModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/RegisterUserModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.user; +package com.agileboot.domain.system.user.model; import com.agileboot.orm.entity.SysUserEntity; import lombok.Data; diff --git a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserModel.java b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModel.java similarity index 98% rename from agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserModel.java rename to agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModel.java index 677b329..7107545 100644 --- a/agileboot-domain/src/main/java/com/agileboot/domain/system/user/UserModel.java +++ b/agileboot-domain/src/main/java/com/agileboot/domain/system/user/model/UserModel.java @@ -1,4 +1,4 @@ -package com.agileboot.domain.system.user; +package com.agileboot.domain.system.user.model; import cn.hutool.core.util.StrUtil; import com.agileboot.common.exception.ApiException;