From 563e97eb90263b42ccc02acb32da2e295049a0e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Mon, 11 Sep 2023 14:01:03 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/DepartmentDeleteReqDTO.java | 14 ++++ .../log/dto/OperationLogDeleteReqDTO.java | 9 +++ .../login/dto/AccountUserListReqDTO.java | 9 +++ .../controller/menu/dto/MenuDetailReqDTO.java | 15 ++++ .../menu/dto/MenuDetailRespDTO.java | 77 +++++++++++++++++++ .../oss/dto/FileDirectUploadReqDTO.java | 8 ++ .../oss/dto/FileDownloadReqDTO.java | 8 ++ .../oss/dto/OssConfigDeleteReqDTO.java | 8 ++ .../oss/dto/OssConfigDetailReqDTO.java | 8 ++ .../oss/dto/OssConfigEnableReqDTO.java | 11 +++ .../controller/role/dto/RoleDeleteReqDTO.java | 8 ++ .../controller/role/dto/RoleDetailReqDTO.java | 8 ++ .../tenant/dto/TenantDeleteReqDTO.java | 15 ++++ .../tenant/dto/TenantDetailReqDTO.java | 16 ++++ .../tenant/dto/TenantListReqDTO.java | 14 ++++ .../controller/user/dto/UserDeleteReqDTO.java | 8 ++ .../controller/user/dto/UserDetailReqDTO.java | 8 ++ 17 files changed, 244 insertions(+) create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailRespDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java new file mode 100644 index 0000000..abddcf5 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java @@ -0,0 +1,14 @@ +package org.oswh.sherly.controller.department.dto; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class DepartmentDeleteReqDTO { + + /** 部门id */ + @Schema(description = "部门id") + private String departmentId; + +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java new file mode 100644 index 0000000..252b72b --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java @@ -0,0 +1,9 @@ +package org.oswh.sherly.controller.log.dto; + + +import lombok.Data; + +@Data +public class OperationLogDeleteReqDTO { + private String logId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java new file mode 100644 index 0000000..8180855 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java @@ -0,0 +1,9 @@ +package org.oswh.sherly.controller.login.dto; + + +import lombok.Data; + +@Data +public class AccountUserListReqDTO { + private String phone; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailReqDTO.java new file mode 100644 index 0000000..6eec7f7 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailReqDTO.java @@ -0,0 +1,15 @@ +package org.oswh.sherly.controller.menu.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; + +@Data +public class MenuDetailReqDTO { + + /** 菜单id */ + @NotBlank + @Schema(description = "菜单id") + private String menuId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailRespDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailRespDTO.java new file mode 100644 index 0000000..259b368 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDetailRespDTO.java @@ -0,0 +1,77 @@ +package org.oswh.sherly.controller.menu.dto; + +import com.alibaba.excel.enums.BooleanEnum; +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; +import org.oswh.sherly.common.enums.UsableEnum; +import org.oswh.sherly.controller.menu.enums.MenuTypeEnum; + +@Data +public class MenuDetailRespDTO { + /** 菜单id */ + @Schema(description = "菜单id") + private String menuId; + + /** 菜单名称 */ + @Schema(description = "菜单名称") + private String menuName; + + /** 菜单类型 */ + @Schema(description = "菜单类型") + private MenuTypeEnum menuType; + + /** 权限 */ + @Schema(description = "权限") + private String permission; + + /** 父菜单编号 */ + @Schema(description = "父菜单编号") + private String parentId; + + /** 菜单路由地址 */ + @Schema(description = "菜单路径") + private String path; + + /** 菜单组件地址 */ + @Schema(description = "组件地址") + private String componentPath; + + /** 菜单组件名称 */ + @Schema(description = "路由地址") + private String componentName; + + /** 菜单图标 */ + @Schema(description = "菜单图标") + private String icon; + + /** 排序 */ + @Schema(description = "排序") + private Integer sort; + + /** 类目状态 */ + @Schema(description = "类目状态") + private UsableEnum usable; + + /** + * 显示状态 + * 只有目录和菜单使用 + * 当设置为 true，该菜单不会展示在侧边栏，但是路由还是存在。例如说，一些独立的编辑页面 /edit/1024 等等 + */ + @Schema(description = "显示状态") + private UsableEnum visible; + + /** + * 总是显示 + * 如果为 false，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单 + */ + @Schema(description = "总是显示") + private UsableEnum alwaysShow; + + /** + * 缓存状态 + * 只有目录和菜单使用，否使用 Vue 路由的 keep-alive 特性 + * 注意：如果开启缓存，则必须填写 componentName，否则无法缓存 + */ + @Schema(description = "缓存状态") + private UsableEnum keepAlive; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java new file mode 100644 index 0000000..f92b5a6 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.oss.dto; + +import lombok.Data; + +@Data +public class FileDirectUploadReqDTO { + private String fileName; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java new file mode 100644 index 0000000..efac536 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.oss.dto; + +import lombok.Data; + +@Data +public class FileDownloadReqDTO { + private String path; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java new file mode 100644 index 0000000..454221f --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.oss.dto; + +import lombok.Data; + +@Data +public class OssConfigDeleteReqDTO { + private String configId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java new file mode 100644 index 0000000..98a8062 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.oss.dto; + +import lombok.Data; + +@Data +public class OssConfigDetailReqDTO { + String configId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java new file mode 100644 index 0000000..779b388 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java @@ -0,0 +1,11 @@ +package org.oswh.sherly.controller.oss.dto; + +import lombok.Data; + +/** + * 对象存储激活的dto + */ +@Data +public class OssConfigEnableReqDTO { + String configId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java new file mode 100644 index 0000000..a6a65e0 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.role.dto; + +import lombok.Data; + +@Data +public class RoleDeleteReqDTO { + private String roleId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java new file mode 100644 index 0000000..2a34911 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.role.dto; + +import lombok.Data; + +@Data +public class RoleDetailReqDTO { + String roleId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java new file mode 100644 index 0000000..c05c02b --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java @@ -0,0 +1,15 @@ +package org.oswh.sherly.controller.tenant.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class TenantDeleteReqDTO { + + /** 租户id */ + @NotNull + @Schema(description = "租户id") + private String tenantId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java new file mode 100644 index 0000000..d8b0eb6 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java @@ -0,0 +1,16 @@ +package org.oswh.sherly.controller.tenant.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; + +@Data +public class TenantDetailReqDTO { + + /** 租户包id */ + @NotBlank + @Schema(description = "租户包id") + private String tenantPackageId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java new file mode 100644 index 0000000..2922205 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java @@ -0,0 +1,14 @@ +package org.oswh.sherly.controller.tenant.dto; + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +import javax.validation.constraints.NotNull; + +@Data +public class TenantListReqDTO { + + @Schema(description = "租户id") + @NotNull + private String tenantId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java new file mode 100644 index 0000000..b3c8096 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.user.dto; + +import lombok.Data; + +@Data +public class UserDeleteReqDTO { + String userId; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java new file mode 100644 index 0000000..23a1c35 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java @@ -0,0 +1,8 @@ +package org.oswh.sherly.controller.user.dto; + +import lombok.Data; + +@Data +public class UserDetailReqDTO { + private String userId; +} -- Gitee From 4a85eeabe5274fae96102fc660316f5088135696 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Mon, 11 Sep 2023 20:37:33 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/DepartmentController.java | 9 +++++---- .../department/dto/DepartmentDeleteReqDTO.java | 3 +++ .../controller/log/OperationLogController.java | 2 +- .../log/dto/OperationLogDeleteReqDTO.java | 9 --------- .../controller/login/LoginController.java | 8 +++++--- .../controller/login/LoginLogController.java | 7 ++----- .../login/dto/AccountUserListReqDTO.java | 7 +++++++ .../sherly/controller/menu/MenuController.java | 4 ++-- .../controller/menu/dto/MenuRespDTO.java | 11 +++++------ .../controller/notice/NoticeController.java | 6 +++--- .../controller/oss/OssConfigController.java | 18 +++++++++--------- .../sherly/controller/oss/OssController.java | 2 +- .../oss/dto/FileDirectUploadReqDTO.java | 8 -------- .../controller/oss/dto/FileDownloadReqDTO.java | 8 -------- .../oss/dto/OssConfigDeleteReqDTO.java | 7 +++++++ .../oss/dto/OssConfigDetailReqDTO.java | 9 ++++++++- .../oss/dto/OssConfigEnableReqDTO.java | 8 +++++++- .../quartz/ScheduleTaskController.java | 6 +++--- .../sherly/controller/role/RoleController.java | 12 ++++++------ .../controller/role/dto/RoleDeleteReqDTO.java | 7 +++++++ .../controller/role/dto/RoleDetailReqDTO.java | 8 +++++++- .../controller/tenant/TenantController.java | 14 +++++++------- .../tenant/TenantPackageController.java | 10 +++++----- .../tenant/dto/TenantDeleteReqDTO.java | 3 +-- .../tenant/dto/TenantDetailReqDTO.java | 3 +-- .../tenant/dto/TenantListReqDTO.java | 2 +- .../sherly/controller/user/UserController.java | 14 +++++++------- .../controller/user/UserSelfController.java | 6 +++--- .../controller/user/dto/UserDeleteReqDTO.java | 8 +++++++- .../controller/user/dto/UserDetailReqDTO.java | 7 +++++++ .../useronline/UserOnlineController.java | 2 +- .../service/department/DepartmentService.java | 6 ++++-- 32 files changed, 132 insertions(+), 102 deletions(-) delete mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java delete mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java delete mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/DepartmentController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/DepartmentController.java index 85cef38..000ec94 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/DepartmentController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/DepartmentController.java @@ -3,6 +3,7 @@ package org.oswh.sherly.controller.department; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.oswh.sherly.common.model.Result; +import org.oswh.sherly.controller.department.dto.DepartmentDeleteReqDTO; import org.oswh.sherly.controller.department.dto.DepartmentInsertReqDTO; import org.oswh.sherly.controller.department.dto.DepartmentRespDTO; import org.oswh.sherly.controller.department.dto.DepartmentUpdateReqDTO; @@ -42,7 +43,7 @@ public class DepartmentController { return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @PreAuthorize("hasAnyAuthority('department:update_one')") @Operation(summary = "部门更新") public Result updateOne(@RequestBody @Valid DepartmentUpdateReqDTO dto) { @@ -50,11 +51,11 @@ public class DepartmentController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @PreAuthorize("hasAnyAuthority('department:remove_one')") @Operation(summary = "部门删除") - public Result removeOne(@RequestParam String departmentId) { - departmentService.removeOne(departmentId); + public Result removeOne(@RequestBody @Valid DepartmentDeleteReqDTO dto) { + departmentService.removeOne(dto); return Result.success(); } } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java index abddcf5..229721a 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/department/dto/DepartmentDeleteReqDTO.java @@ -4,10 +4,13 @@ package org.oswh.sherly.controller.department.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class DepartmentDeleteReqDTO { /** 部门id */ + @NotNull @Schema(description = "部门id") private String departmentId; diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/OperationLogController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/OperationLogController.java index ec823f0..1e3eb4d 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/OperationLogController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/OperationLogController.java @@ -45,7 +45,7 @@ public class OperationLogController { return Result.success(operationLogManager.getOne(logId)); } - @DeleteMapping("/remove_all") + @PostMapping("/remove_all") @PreAuthorize("hasAnyAuthority('operation_log:remove_all')") @Operation(summary = "操作日志清空") public Result removeAll() { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java deleted file mode 100644 index 252b72b..0000000 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/log/dto/OperationLogDeleteReqDTO.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.oswh.sherly.controller.log.dto; - - -import lombok.Data; - -@Data -public class OperationLogDeleteReqDTO { - private String logId; -} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginController.java index 2e60f32..d16b262 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginController.java @@ -4,11 +4,13 @@ package org.oswh.sherly.controller.login; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.oswh.sherly.common.model.Result; +import org.oswh.sherly.controller.login.dto.AccountUserListReqDTO; import org.oswh.sherly.controller.login.dto.LoginReqDTO; import org.oswh.sherly.controller.login.dto.LoginRespDTO; import org.oswh.sherly.controller.login.dto.LoginTenantRespDTO; import org.oswh.sherly.other.log.annotation.SherlyLog; import org.oswh.sherly.service.login.LoginService; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -47,8 +49,8 @@ public class LoginController { @GetMapping("/available_list") @Operation(summary = "可用租户列表") @SherlyLog(noRecord = true) - public Result> availableList(@RequestParam String phone) { - return Result.success(loginService.availableList(phone)); + public Result> availableList(@ParameterObject AccountUserListReqDTO dto) { + return Result.success(loginService.availableList(dto)); } @PostMapping("/available_list_check") @@ -58,7 +60,7 @@ public class LoginController { return Result.success(loginService.availableListCheck(dto)); } - @PutMapping("/login_change") + @PostMapping("/login_change") @Operation(summary = "切换登录租户") public Result loginChange(@RequestParam String tenantCode, HttpServletRequest request) { loginService.loginChange(tenantCode, request); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginLogController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginLogController.java index 08e5963..2d322c0 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginLogController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/LoginLogController.java @@ -9,10 +9,7 @@ import org.oswh.sherly.controller.log.dto.LoginLogPageRespDTO; import org.oswh.sherly.manager.log.LoginLogManager; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.DeleteMapping; -import org.springframework.web.bind.annotation.GetMapping; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; @@ -36,7 +33,7 @@ public class LoginLogController { return Result.success(loginLogManager.listPage(dto)); } - @DeleteMapping("/remove_all") + @PostMapping("/remove_all") @PreAuthorize("hasAnyAuthority('login_log:remove_all')") @Operation(summary = "登录日志清空") public Result removeAll() { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java index 8180855..93562ee 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/login/dto/AccountUserListReqDTO.java @@ -1,9 +1,16 @@ package org.oswh.sherly.controller.login.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class AccountUserListReqDTO { + + /** 手机号码 */ + @NotNull + @Schema(description = "手机号码") private String phone; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/MenuController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/MenuController.java index e42349d..98ca290 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/MenuController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/MenuController.java @@ -43,7 +43,7 @@ public class MenuController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @PreAuthorize("hasAnyAuthority('menu:remove_one')") @Operation(summary = "菜单删除") public Result removeOne(@RequestBody @Valid MenuDeleteReqDTO dto) { @@ -51,7 +51,7 @@ public class MenuController { return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @PreAuthorize("hasAnyAuthority('menu:update_one')") @Operation(summary = "菜单修改") public Result updateOne(@RequestBody @Valid MenuUpdateReqDTO dto) { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuRespDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuRespDTO.java index 7a3f83b..e8333d1 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuRespDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuRespDTO.java @@ -53,12 +53,7 @@ public class MenuRespDTO { @Schema(description = "排序") private Integer sort; - /** - * 类目状态 - * 等价理解为可用性 - */ - @NotNull - private UsableEnum usable; + /** * 显示状态 @@ -87,5 +82,9 @@ public class MenuRespDTO { @Schema(description = "创建时间") private Date createTime; + /** 类目状态 */ + @Schema(description = "类目状态") + private UsableEnum usable; + private List children; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/notice/NoticeController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/notice/NoticeController.java index d111083..53acb37 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/notice/NoticeController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/notice/NoticeController.java @@ -34,21 +34,21 @@ public class NoticeController { return Result.success(noticeManager.listPage(dto)); } - @PutMapping("/clear_list") + @PostMapping("/clear_list") @Operation(summary = "消息部分设置已读") public Result clearList(@RequestBody NoticeClearListReqDTO dto) { noticeManager.clearList(dto); return Result.success(); } - @PutMapping("/clear_all") + @PostMapping("/clear_all") @Operation(summary = "消息全部设置已读") public Result clearAll() { noticeManager.clearAll(); return Result.success(); } - @PutMapping("/reset_list") + @PostMapping("/reset_list") @Operation(summary = "消息部分设置未读") public Result resetList(@RequestBody NoticeResetListReqDTO dto) { noticeManager.resetList(dto); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssConfigController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssConfigController.java index c516c9b..03ad8b1 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssConfigController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssConfigController.java @@ -38,15 +38,15 @@ public class OssConfigController { @GetMapping("/get_one") @PreAuthorize("hasAnyAuthority('oss_config:get_one')") @Operation(summary = "对象存储配置详情") - public Result getOne(@RequestParam String configId) { - return Result.success(ossConfigService.getOne(configId)); + public Result getOne(@ParameterObject OssConfigDetailReqDTO dto) { + return Result.success(ossConfigService.getOne(dto)); } - @PutMapping("/enable_one") + @PostMapping("/enable_one") @PreAuthorize("hasAnyAuthority('oss_config:enable_one')") @Operation(summary = "对象存储配置激活") - public Result enableOne(@RequestParam String configId) { - ossConfigService.enableOne(configId); + public Result enableOne(@RequestBody OssConfigEnableReqDTO dto) { + ossConfigService.enableOne(dto); return Result.success(); } @@ -58,7 +58,7 @@ public class OssConfigController { return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @PreAuthorize("hasAnyAuthority('oss_config:update_one')") @Operation(summary = "对象存储配置更新") public Result updateOne(@RequestBody @Valid OssConfigUpdateReqDTO dto) { @@ -66,11 +66,11 @@ public class OssConfigController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @PreAuthorize("hasAnyAuthority('oss_config:remove_one')") @Operation(summary = "对象存储配置删除") - public Result removeOne(@RequestParam String configId) { - ossConfigService.removeOne(configId); + public Result removeOne(@RequestParam OssConfigDeleteReqDTO dto) { + ossConfigService.removeOne(dto); return Result.success(); } } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssController.java index 91c90ac..632dc5d 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/OssController.java @@ -70,7 +70,7 @@ public class OssController { return Result.success(ossManager.accessUrl(path)); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @PreAuthorize("hasAnyAuthority('oss:remove_one')") @Operation(summary = "文件删除") public Result removeOne(@RequestParam String fileId) { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java deleted file mode 100644 index f92b5a6..0000000 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDirectUploadReqDTO.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.oswh.sherly.controller.oss.dto; - -import lombok.Data; - -@Data -public class FileDirectUploadReqDTO { - private String fileName; -} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java deleted file mode 100644 index efac536..0000000 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/FileDownloadReqDTO.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.oswh.sherly.controller.oss.dto; - -import lombok.Data; - -@Data -public class FileDownloadReqDTO { - private String path; -} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java index 454221f..c2f74c7 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDeleteReqDTO.java @@ -1,8 +1,15 @@ package org.oswh.sherly.controller.oss.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class OssConfigDeleteReqDTO { + + /** 配置id */ + @Schema(description = "配置id") + @NotNull private String configId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java index 98a8062..48176f0 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigDetailReqDTO.java @@ -1,8 +1,15 @@ package org.oswh.sherly.controller.oss.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class OssConfigDetailReqDTO { - String configId; + + /** 配置id */ + @Schema(description = "配置id") + @NotNull + private String configId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java index 779b388..7f42217 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/oss/dto/OssConfigEnableReqDTO.java @@ -1,11 +1,17 @@ package org.oswh.sherly.controller.oss.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + /** * 对象存储激活的dto */ @Data public class OssConfigEnableReqDTO { - String configId; + /** 配置id */ + @Schema(description = "配置id") + @NotNull + private String configId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/quartz/ScheduleTaskController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/quartz/ScheduleTaskController.java index 0cd6812..218169d 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/quartz/ScheduleTaskController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/quartz/ScheduleTaskController.java @@ -50,21 +50,21 @@ public class ScheduleTaskController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @Operation(summary = "定时任务删除") public Result removeOne(@RequestParam String scheduleTaskId) { scheduleTaskManager.removeOne(scheduleTaskId); return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @Operation(summary = "定时任务更新") public Result updateOne(@RequestBody ScheduleTaskUpdateReqDTO dto) { scheduleTaskManager.updateOne(dto); return Result.success(); } - @PutMapping("/enable_one") + @PostMapping("/enable_one") @Operation(summary = "定时任务禁用/启用") public Result enableOne(@RequestParam String scheduleTaskId, @RequestParam UsableEnum enable) { scheduleTaskManager.enableOne(scheduleTaskId, enable); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/RoleController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/RoleController.java index d5064c9..4149398 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/RoleController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/RoleController.java @@ -38,8 +38,8 @@ public class RoleController { @GetMapping("/get_one") @PreAuthorize("hasAnyAuthority('role:get_one')") @Operation(summary = "角色详情") - public Result getOne(@RequestParam String roleId) { - return Result.success(roleService.getOne(roleId)); + public Result getOne(@ParameterObject RoleDetailReqDTO dto) { + return Result.success(roleService.getOne(dto)); } @PostMapping("/save_one") @@ -50,7 +50,7 @@ public class RoleController { return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @PreAuthorize("hasAnyAuthority('role:update_one')") @Operation(summary = "角色更新") public Result updateOne(@RequestBody @Valid RoleUpdateReqDTO dto) { @@ -58,11 +58,11 @@ public class RoleController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @PreAuthorize("hasAnyAuthority('role:remove_one')") @Operation(summary = "角色删除") - public Result removeOne(@RequestParam String roleId) { - roleService.removeOne(roleId); + public Result removeOne(@RequestBody RoleDeleteReqDTO dto) { + roleService.removeOne(dto); return Result.success(); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java index a6a65e0..b0e2191 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDeleteReqDTO.java @@ -1,8 +1,15 @@ package org.oswh.sherly.controller.role.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class RoleDeleteReqDTO { + + /** 角色id */ + @Schema(description = "角色id") + @NotNull private String roleId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java index 2a34911..8fe50c0 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/role/dto/RoleDetailReqDTO.java @@ -1,8 +1,14 @@ package org.oswh.sherly.controller.role.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class RoleDetailReqDTO { - String roleId; + /** 角色id */ + @Schema(description = "角色id") + @NotNull + private String roleId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantController.java index 1f76b24..d75fa84 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantController.java @@ -45,7 +45,7 @@ public class TenantController { return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @PreAuthorize("hasAnyAuthority('tenant:update_one')") @Operation(summary = "租户更新") public Result updateOne(@RequestBody @Valid TenantUpdateReqDTO dto) { @@ -53,15 +53,15 @@ public class TenantController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @PreAuthorize("hasAnyAuthority('tenant:remove_one')") @Operation(summary = "租户删除") - public Result removeOne(@RequestParam String tenantId) { - tenantService.removeOne(tenantId); + public Result removeOne(@RequestBody TenantDeleteReqDTO dto) { + tenantService.removeOne(dto); return Result.success(); } - @PutMapping("/update_menu") + @PostMapping("/update_menu") @PreAuthorize("hasAnyAuthority('tenant:update_menu')") @Operation(summary = "租户菜单更新") public Result updateMenu(@RequestBody @Valid TenantMenuUpdateReqDTO dto) { @@ -72,8 +72,8 @@ public class TenantController { @GetMapping("/list_menu") @PreAuthorize("hasAnyAuthority('tenant:list_menu')") @Operation(summary = "租户菜单列表") - public Result> listMenu(@RequestParam String tenantId) { - return Result.success(tenantService.listMenu(tenantId)); + public Result> listMenu(@ParameterObject TenantListReqDTO dto) { + return Result.success(tenantService.listMenu(dto)); } @GetMapping("/list_export") diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantPackageController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantPackageController.java index 37fdd92..ad656dd 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantPackageController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/TenantPackageController.java @@ -41,14 +41,14 @@ public class TenantPackageController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @Operation(summary = "租户套餐删除") public Result removeOne(@RequestParam String tenantPackageId) { tenantPackageService.removeOne(tenantPackageId); return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @Operation(summary = "租户套餐更新") public Result updateOne(@RequestBody @Valid TenantPackageUpdateReqDTO dto) { tenantPackageService.updateOne(dto); @@ -63,11 +63,11 @@ public class TenantPackageController { @GetMapping("/get_one") @Operation(summary = "租户套餐菜单详情") - public Result getOne(@RequestParam String tenantPackageId) { - return Result.success(tenantPackageService.getOne(tenantPackageId)); + public Result getOne(@ParameterObject TenantDetailReqDTO dto) { + return Result.success(tenantPackageService.getOne(dto)); } - @PutMapping("/usable") + @PostMapping("/usable") @Operation(summary = "租户套餐可用性") public Result usable(@RequestParam String tenantPackageId, @RequestParam UsableEnum usable) { tenantPackageService.usable(tenantPackageId, usable); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java index c05c02b..5c86838 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDeleteReqDTO.java @@ -8,8 +8,7 @@ import javax.validation.constraints.NotNull; @Data public class TenantDeleteReqDTO { - /** 租户id */ - @NotNull @Schema(description = "租户id") + @NotNull private String tenantId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java index d8b0eb6..1d967cf 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java @@ -3,14 +3,13 @@ package org.oswh.sherly.controller.tenant.dto; import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; -import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; @Data public class TenantDetailReqDTO { /** 租户包id */ - @NotBlank @Schema(description = "租户包id") + @NotNull private String tenantPackageId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java index 2922205..46cfca5 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantListReqDTO.java @@ -7,7 +7,7 @@ import javax.validation.constraints.NotNull; @Data public class TenantListReqDTO { - + /** 租户id */ @Schema(description = "租户id") @NotNull private String tenantId; diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserController.java index e5bed19..46448e8 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserController.java @@ -47,11 +47,11 @@ public class UserController { @GetMapping("/get_one") @PreAuthorize("hasAnyAuthority('user:get_one')") @Operation(summary = "用户详情") - public Result getOne(@RequestParam String userId) { - return Result.success(userService.getOne(userId)); + public Result getOne(@ParameterObject UserDetailReqDTO dto) { + return Result.success(userService.getOne(dto)); } - @PutMapping("/usable") + @PostMapping("/usable") @PreAuthorize("hasAnyAuthority('user:usable')") @Operation(summary = "用户禁用/启用") public Result usable(@RequestParam String userId, @RequestParam UsableEnum usable) { @@ -67,7 +67,7 @@ public class UserController { return Result.success(); } - @PutMapping("/update_one") + @PostMapping("/update_one") @PreAuthorize("hasAnyAuthority('user:update_one')") @Operation(summary = "用户更新") public Result updateOne(@RequestBody @Valid UserUpdateReqDTO dto) { @@ -75,11 +75,11 @@ public class UserController { return Result.success(); } - @DeleteMapping("/remove_one") + @PostMapping("/remove_one") @PreAuthorize("hasAnyAuthority('user:remove_one')") @Operation(summary = "用户删除") - public Result removeOne(@RequestParam String userId) { - userService.removeOne(userId); + public Result removeOne(@RequestBody UserDeleteReqDTO dto) { + userService.removeOne(dto); return Result.success(); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserSelfController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserSelfController.java index f7ccb2b..d1c9bf4 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserSelfController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/UserSelfController.java @@ -40,21 +40,21 @@ public class UserSelfController { return Result.success(userSelfService.getSelf()); } - @PutMapping("/update_self") + @PostMapping("/update_self") @Operation(summary = "用户个人中心更新") public Result updateSelf(@RequestBody @Valid UserSelfUpdateReqDTO dto) { userSelfService.updateSelf(dto); return Result.success(); } - @PutMapping("/update_password") + @PostMapping("/update_password") @Operation(summary = "用户修改密码") public Result updatePassword(@RequestBody @Valid UserUpdatePasswordReqDTO dto) { userSelfService.updatePassword(dto); return Result.success(); } - @PutMapping("/update_avatar") + @PostMapping("/update_avatar") @Operation(summary = "用户修改头像") public Result updateAvatar(@RequestParam MultipartFile file) { String avatarPath = ossManager.uploadOne(file, "avatar/"); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java index b3c8096..7f638ae 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDeleteReqDTO.java @@ -1,8 +1,14 @@ package org.oswh.sherly.controller.user.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class UserDeleteReqDTO { - String userId; + /** 用户id */ + @Schema(description = "用户id") + @NotNull + private String userId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java index 23a1c35..6dc4879 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/user/dto/UserDetailReqDTO.java @@ -1,8 +1,15 @@ package org.oswh.sherly.controller.user.dto; +import io.swagger.v3.oas.annotations.media.Schema; import lombok.Data; +import javax.validation.constraints.NotNull; + @Data public class UserDetailReqDTO { + + /** 用户id */ + @Schema(description = "用户id") + @NotNull private String userId; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/useronline/UserOnlineController.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/useronline/UserOnlineController.java index 6a2b5fa..2501dbe 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/useronline/UserOnlineController.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/useronline/UserOnlineController.java @@ -34,7 +34,7 @@ public class UserOnlineController { return Result.success(userOnlineService.listAll(dto)); } - @DeleteMapping("/force_quit") + @PostMapping("/force_quit") @PreAuthorize("hasAnyAuthority('user_online:force_quit')") @Operation(summary = "强制退出") public Result forceQuit(@RequestParam String sessionId) { diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java index ee84353..a2a6f31 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java @@ -2,6 +2,7 @@ package org.oswh.sherly.service.department; import org.oswh.sherly.common.modules.exception.BizException; +import org.oswh.sherly.controller.department.dto.DepartmentDeleteReqDTO; import org.oswh.sherly.controller.department.dto.DepartmentInsertReqDTO; import org.oswh.sherly.controller.department.dto.DepartmentRespDTO; import org.oswh.sherly.controller.department.dto.DepartmentUpdateReqDTO; @@ -104,10 +105,11 @@ public class DepartmentService { /** * 部门删除 - * @param departmentId + * @param dto */ @Transactional(rollbackFor = Exception.class) - public void removeOne(String departmentId) { + public void removeOne(DepartmentDeleteReqDTO dto) { + String departmentId = dto.getDepartmentId(); if (Objects.equals(departmentId, 1L)) { throw new BizException(DELETE_DEPT_ERROR); } -- Gitee From 9854e283bee60e24291abd64e981e68436361828 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Mon, 11 Sep 2023 20:42:45 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E8=A7=84=E8=8C=83=E6=A0=BC=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/department/DepartmentService.java | 5 +++++ .../org/oswh/sherly/service/login/LoginService.java | 12 +++++++++--- .../oswh/sherly/service/oss/OssConfigService.java | 13 ++++++++----- .../org/oswh/sherly/service/role/RoleService.java | 10 ++++++---- .../sherly/service/tenant/TenantPackageService.java | 5 +++-- .../oswh/sherly/service/tenant/TenantService.java | 10 ++++++---- .../oswh/sherly/service/user/UserSelfService.java | 4 ++++ .../org/oswh/sherly/service/user/UserService.java | 10 ++++++---- 8 files changed, 47 insertions(+), 22 deletions(-) diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java index a2a6f31..8fc25e2 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/department/DepartmentService.java @@ -37,6 +37,7 @@ public class DepartmentService { /** * 查询部门树 + * * @return */ public List listTree() { @@ -56,6 +57,7 @@ public class DepartmentService { /** * 递归拼装子结点 + * * @param parent * @param all * @return @@ -69,6 +71,7 @@ public class DepartmentService { /** * 部门新增 + * * @param dto */ public void saveOne(DepartmentInsertReqDTO dto) { @@ -85,6 +88,7 @@ public class DepartmentService { /** * 部门更新 + * * @param dto */ public void updateOne(DepartmentUpdateReqDTO dto) { @@ -105,6 +109,7 @@ public class DepartmentService { /** * 部门删除 + * * @param dto */ @Transactional(rollbackFor = Exception.class) diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java index 3016ba0..f5a2f6e 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/login/LoginService.java @@ -13,6 +13,7 @@ import org.oswh.sherly.common.modules.security.model.SecurityModel; import org.oswh.sherly.common.modules.security.util.SecurityUtil; import org.oswh.sherly.common.util.IpUtil; import org.oswh.sherly.common.util.JwtUtil; +import org.oswh.sherly.controller.login.dto.AccountUserListReqDTO; import org.oswh.sherly.controller.login.dto.LoginReqDTO; import org.oswh.sherly.controller.login.dto.LoginRespDTO; import org.oswh.sherly.controller.login.dto.LoginTenantRespDTO; @@ -84,6 +85,7 @@ public class LoginService { /** * 登录 + * * @param dto * @param request * @return @@ -129,6 +131,7 @@ public class LoginService { /** * 处理登录时携带租户code情况 + * * @param dto */ private void dealWithTenantCode(LoginReqDTO dto) { @@ -158,6 +161,7 @@ public class LoginService { /** * 更新用户登录信息 + * * @param securityModel * @param request */ @@ -176,11 +180,12 @@ public class LoginService { /** * 可用租户列表 - * @param phone + * + * @param dto * @return */ - public List availableList(String phone) { - + public List availableList(AccountUserListReqDTO dto) { + String phone = dto.getPhone(); AccountUserDO accountUserDO = accountUserMapper.getByPhone(phone); List tenantCodes = StrUtil.split(accountUserDO.getTenantData(), ","); List tenantDOs = tenantMapper.listAvailableByTenantCodes(tenantCodes); @@ -240,6 +245,7 @@ public class LoginService { /** * 可用租户列表 + * * @param dto * @return */ diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java index 99a08c4..e482783 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/oss/OssConfigService.java @@ -47,10 +47,11 @@ public class OssConfigService { /** * 对象存储配置详情 * - * @param configId + * @param dto * @return */ - public OssConfigRespDTO getOne(String configId) { + public OssConfigRespDTO getOne(OssConfigDetailReqDTO dto) { + String configId = dto.getConfigId(); OssConfigDO ossConfigDO = ossConfigMapper.selectById(configId); OssClientConfig config = ossConfigDO.getConfig(); String configStr = JSONUtil.toJsonStr(config); @@ -105,7 +106,8 @@ public class OssConfigService { * * @param configId */ - public void removeOne(String configId) { + public void removeOne(OssConfigDeleteReqDTO dto) { + String configId = dto.getConfigId(); OssConfigDO config = ossConfigMapper.selectById(configId); ossConfigMapper.deleteById(configId); if (Objects.equals(config.getUsable(), ENABLE)) { @@ -117,9 +119,10 @@ public class OssConfigService { /** * 对象存储配置激活 * - * @param configId + * @param dto */ - public void enableOne(String configId) { + public void enableOne(OssConfigEnableReqDTO dto) { + String configId = dto.getConfigId(); List list = ossConfigMapper.selectList(); list = list.stream().peek(e -> { e.setUsable(DISABLE); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java index 81388bb..50adaf7 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/role/RoleService.java @@ -46,10 +46,11 @@ public class RoleService { /** * 角色详情 - * @param roleId + * @param dto * @return */ - public RoleRespDTO getOne(String roleId) { + public RoleRespDTO getOne(RoleDetailReqDTO dto) { + String roleId = dto.getRoleId(); RoleDO roleDO = roleMapper.selectById(roleId); // 查询菜单 @@ -105,10 +106,11 @@ public class RoleService { /** * 角色删除 - * @param roleId + * @param dto */ @Transactional(rollbackFor = Exception.class) - public void removeOne(String roleId) { + public void removeOne(RoleDeleteReqDTO dto) { + String roleId = dto.getRoleId(); if (Objects.equals(roleId, 1L)) { throw new BizException(DELETE_ROLE_ERROR); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java index 4c5ad00..98c6003 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantPackageService.java @@ -105,10 +105,11 @@ public class TenantPackageService { /** * 租户套餐详情 - * @param tenantPackageId + * @param dto * @return */ - public TenantPackageRespDTO getOne(String tenantPackageId) { + public TenantPackageRespDTO getOne(TenantDetailReqDTO dto) { + String tenantPackageId = dto.getTenantPackageId(); TenantPackageDO tenantPackageDO = tenantPackageMapper.selectById(tenantPackageId); TenantPackageRespDTO tenantPackageRespDTO =TenantPackageConvertor.convertToRespDTO(tenantPackageDO); List tenantPackageMenuDOs = tenantPackageMenuMapper.listByTenantPackageId(tenantPackageId); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java index d48974d..aceb116 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/tenant/TenantService.java @@ -167,9 +167,10 @@ public class TenantService { /** * 租户删除 - * @param tenantId + * @param dto */ - public void removeOne(String tenantId) { + public void removeOne(TenantDeleteReqDTO dto) { + String tenantId = dto.getTenantId(); if (Objects.equals(tenantId, 1L)) { throw new BizException(DELETE_TENANT_ERROR); } @@ -218,10 +219,11 @@ public class TenantService { /** * 租户菜单列表 - * @param tenantId + * @param dto * @return */ - public List listMenu(String tenantId) { + public List listMenu(TenantListReqDTO dto) { + String tenantId = dto.getTenantId(); TenantDO tenantDO = tenantMapper.selectById(tenantId); SecurityUtil.setOperateTenantCode(tenantDO.getTenantCode()); diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java index c0eb125..f383a0e 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserSelfService.java @@ -98,6 +98,7 @@ public class UserSelfService { /** * 用户修改密码 + * * @param dto */ public void updatePassword(UserUpdatePasswordReqDTO dto) { @@ -123,6 +124,7 @@ public class UserSelfService { /** * 用户个人中心更新 + * * @param dto */ public void updateSelf(UserSelfUpdateReqDTO dto) { @@ -133,6 +135,7 @@ public class UserSelfService { /** * 用户修改头像 + * * @param avatarPath */ public void updateAvatar(String avatarPath) { @@ -144,6 +147,7 @@ public class UserSelfService { /** * 个人中心操作日志列表 + * * @param dto * @return */ diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java index ce71cf5..fca1e10 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/user/UserService.java @@ -114,10 +114,11 @@ public class UserService { /** * 用户详情 - * @param userId + * @param dto * @return */ - public UserRespDTO getOne(String userId) { + public UserRespDTO getOne(UserDetailReqDTO dto) { + String userId = dto.getUserId(); UserDO userDO = userMapper.selectById(userId); @@ -199,10 +200,11 @@ public class UserService { /** * 用户删除 - * @param userId + * @param dto */ @Transactional(rollbackFor = Exception.class) - public void removeOne(String userId) { + public void removeOne(UserDeleteReqDTO dto) { + String userId = dto.getUserId(); if (Objects.equals(userId, "1")) { throw new BizException(DELETE_USER_ERROR); } -- Gitee