From b0c473cbca029fe58c5c10c2e10aaf58d177f52a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Tue, 5 Sep 2023 21:12:02 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E7=AC=AC=E4=B8=80=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/menu/dto/MenuInsertReqDTO.java | 40 +++++++++++++++- .../controller/menu/dto/MenuRespDTO.java | 5 ++ .../controller/menu/dto/MenuUpdateReqDTO.java | 40 ++++++++++++++++ .../java/org/oswh/sherly/model/MenuDO.java | 47 +++++++++++++++++-- 4 files changed, 126 insertions(+), 6 deletions(-) diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuInsertReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuInsertReqDTO.java index 1ff8d50..e79fd89 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuInsertReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuInsertReqDTO.java @@ -1,7 +1,9 @@ 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; import javax.validation.constraints.NotBlank; @@ -33,10 +35,18 @@ public class MenuInsertReqDTO { @NotNull private String parentId; - /** 菜单路径 */ + /** 菜单路由地址 */ @Schema(description = "菜单路径") private String path; + /** 菜单组件地址 */ + @Schema(description = "组件地址") + private String componentPath; + + /** 菜单组件名称 */ + @Schema(description = "路由地址") + private String componentName; + /** 菜单图标 */ @Schema(description = "菜单图标") private String icon; @@ -46,4 +56,32 @@ public class MenuInsertReqDTO { @NotNull private Integer sort; + /** 类目状态 */ + @Schema(description = "类目状态") + @NotNull + private UsableEnum usable; + + /** + * 显示状态 + * 只有目录和菜单使用 + * 当设置为 true，该菜单不会展示在侧边栏，但是路由还是存在。例如说，一些独立的编辑页面 /edit/1024 等等 + */ + @Schema(description = "显示状态") + private BooleanEnum visible; + + /** + * 总是显示 + * 如果为 false，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单 + */ + @Schema(description = "总是显示") + private BooleanEnum alwaysShow; + + /** + * 缓存状态 + * 只有目录和菜单使用，否使用 Vue 路由的 keep-alive 特性 + * 注意：如果开启缓存，则必须填写 componentName，否则无法缓存 + */ + @Schema(description = "缓存状态") + private BooleanEnum keepAlive; + } 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 e95609e..c57fd5b 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 @@ -2,6 +2,7 @@ package org.oswh.sherly.controller.menu.dto; 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; import java.util.Date; @@ -49,5 +50,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/menu/dto/MenuUpdateReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuUpdateReqDTO.java index dd5bb0f..f3d6772 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuUpdateReqDTO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuUpdateReqDTO.java @@ -1,7 +1,9 @@ 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; import javax.validation.constraints.NotBlank; @@ -42,6 +44,14 @@ public class MenuUpdateReqDTO { @Schema(description = "菜单路径") private String path; + /** 菜单组件地址 */ + @Schema(description = "组件地址") + private String componentPath; + + /** 菜单组件名称 */ + @Schema(description = "路由地址") + private String componentName; + /** 菜单图标 */ @Schema(description = "菜单图标") private String icon; @@ -50,4 +60,34 @@ public class MenuUpdateReqDTO { @Schema(description = "排序") @NotNull private Integer sort; + + /** + * 类目状态 + * 等价理解为可用性 + */ + @Schema(description = "类目状态") + private UsableEnum usable; + + /** + * 显示状态 + * 只有目录和菜单使用 + * 当设置为 true，该菜单不会展示在侧边栏，但是路由还是存在。例如说，一些独立的编辑页面 /edit/1024 等等 + */ + @Schema(description = "显示状态") + private BooleanEnum visible; + + /** + * 总是显示 + * 如果为 false，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单 + */ + @Schema(description = "总是显示") + private BooleanEnum alwaysShow; + + /** + * 缓存状态 + * 只有目录和菜单使用，否使用 Vue 路由的 keep-alive 特性 + * 注意：如果开启缓存，则必须填写 componentName，否则无法缓存 + */ + @Schema(description = "缓存状态") + private BooleanEnum keepAlive; } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java index bc8c17d..c3acf95 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java @@ -1,10 +1,12 @@ package org.oswh.sherly.model; +import com.alibaba.excel.enums.BooleanEnum; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import lombok.Data; import lombok.EqualsAndHashCode; +import org.oswh.sherly.common.enums.UsableEnum; import org.oswh.sherly.common.model.BaseModel; import org.oswh.sherly.controller.menu.enums.MenuTypeEnum; @@ -16,6 +18,12 @@ import org.oswh.sherly.controller.menu.enums.MenuTypeEnum; @TableName("sys_menu") @EqualsAndHashCode(callSuper = true) public class MenuDO extends BaseModel { + + public static final String ROOT_PARENT_ID = "0"; + + /** 父菜单编号 */ + private String parentId; + /** 菜单编号 */ @TableId(type = IdType.ASSIGN_ID) private String menuId; @@ -26,18 +34,47 @@ public class MenuDO extends BaseModel { /** 菜单类型 */ private MenuTypeEnum menuType; - /** 权限 */ + /** 权限标识 */ private String permission; - /** 父菜单编号 */ - private String parentId; - - /** 菜单路径 */ + /** 菜单路由地址 */ private String path; /** 菜单图标 */ private String icon; + /** 菜单组件地址 */ + private String componentPath; + + /** 菜单组件名称 */ + private String componentName; + /** 排序 */ private Integer sort; + + /** + * 类目状态 + * 等价理解为可用性 + */ + private UsableEnum usable; + + /** + * 显示状态 + * 只有目录和菜单使用 + * 当设置为 true，该菜单不会展示在侧边栏，但是路由还是存在。例如说，一些独立的编辑页面 /edit/1024 等等 + */ + private BooleanEnum visible; + + /** + * 总是显示 + * 如果为 false，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单 + */ + private BooleanEnum alwaysShow; + + /** + * 缓存状态 + * 只有目录和菜单使用，否使用 Vue 路由的 keep-alive 特性 + * 注意：如果开启缓存，则必须填写 componentName，否则无法缓存 + */ + private BooleanEnum keepAlive; } -- Gitee From 534d571e246613d164f83d605cef346d74142f27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Tue, 5 Sep 2023 23:27:57 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E9=87=8D=E6=9E=84Menu=E6=9D=BF=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/menu/MenuController.java | 15 ++-- .../controller/menu/dto/MenuDeleteReqDTO.java | 12 +++ .../controller/menu/dto/MenuDetailReqDTO.java | 15 ++++ .../menu/dto/MenuDetailRespDTO.java | 77 +++++++++++++++++++ .../sherly/convertor/menu/MenuConvertor.java | 3 + .../oswh/sherly/mapper/menu/MenuMapper.java | 3 +- .../sherly/mapper/role/RoleMenuMapper.java | 2 +- .../java/org/oswh/sherly/model/MenuDO.java | 2 - .../oswh/sherly/service/menu/MenuService.java | 30 +++++--- 9 files changed, 140 insertions(+), 19 deletions(-) create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDeleteReqDTO.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 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 97da97b..19563f1 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 @@ -3,10 +3,9 @@ package org.oswh.sherly.controller.menu; 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.menu.dto.MenuInsertReqDTO; -import org.oswh.sherly.controller.menu.dto.MenuRespDTO; -import org.oswh.sherly.controller.menu.dto.MenuUpdateReqDTO; +import org.oswh.sherly.controller.menu.dto.*; import org.oswh.sherly.service.menu.MenuService; +import org.springdoc.api.annotations.ParameterObject; import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; @@ -45,8 +44,8 @@ public class MenuController { @DeleteMapping("/remove_one") @PreAuthorize("hasAnyAuthority('menu:remove_one')") @Operation(summary = "菜单删除") - public Result removeOne(@RequestParam Long menuId) { - menuService.removeOne(menuId); + public Result removeOne(@RequestBody @Valid MenuDeleteReqDTO reqDTO) { + menuService.removeOne(reqDTO); return Result.success(); } @@ -57,4 +56,10 @@ public class MenuController { menuService.updateOne(dto); return Result.success(); } + + @GetMapping("/detail") + @Operation(summary = "菜单详情") + public Result detail(@ParameterObject MenuDetailReqDTO reqDTO) { + return Result.success(menuService.detail(reqDTO)); + } } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDeleteReqDTO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDeleteReqDTO.java new file mode 100644 index 0000000..b2bfce0 --- /dev/null +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/menu/dto/MenuDeleteReqDTO.java @@ -0,0 +1,12 @@ +package org.oswh.sherly.controller.menu.dto; + + +import io.swagger.v3.oas.annotations.media.Schema; +import lombok.Data; + +@Data +public class MenuDeleteReqDTO { + /** 菜单编号 */ + @Schema(description = "菜单编号") + 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/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..cedd6a2 --- /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 BooleanEnum visible; + + /** + * 总是显示 + * 如果为 false，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单 + */ + @Schema(description = "总是显示") + private BooleanEnum alwaysShow; + + /** + * 缓存状态 + * 只有目录和菜单使用，否使用 Vue 路由的 keep-alive 特性 + * 注意：如果开启缓存，则必须填写 componentName，否则无法缓存 + */ + @Schema(description = "缓存状态") + private BooleanEnum keepAlive; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java index 88e9e4b..c10ad0f 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/convertor/menu/MenuConvertor.java @@ -3,6 +3,7 @@ package org.oswh.sherly.convertor.menu; import org.mapstruct.Mapper; import org.mapstruct.factory.Mappers; import org.oswh.sherly.controller.generic.dto.BasicMenuInfoRespDTO; +import org.oswh.sherly.controller.menu.dto.MenuDetailRespDTO; import org.oswh.sherly.controller.menu.dto.MenuInsertReqDTO; import org.oswh.sherly.controller.menu.dto.MenuRespDTO; import org.oswh.sherly.controller.menu.dto.MenuUpdateReqDTO; @@ -20,4 +21,6 @@ public interface MenuConvertor { MenuDO convertToDO (MenuUpdateReqDTO reqDTO); BasicMenuInfoRespDTO convertToInfoRespDTO(MenuDO menuDO); + + MenuDetailRespDTO convertToDetailRespDTO(MenuDO menuDO); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/menu/MenuMapper.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/menu/MenuMapper.java index 007d665..4e16945 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/menu/MenuMapper.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/menu/MenuMapper.java @@ -17,7 +17,7 @@ public interface MenuMapper extends SherlyMapper { * @param menuId * @return */ - default Long countChildrenByMenuId(Long menuId) { + default Long countChildrenByMenuId(String menuId) { return selectCount(new SherlyLambdaQueryWrapper() .eqIfExist(MenuDO::getParentId, menuId)); } @@ -29,4 +29,5 @@ public interface MenuMapper extends SherlyMapper { void removeAll(); + } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/role/RoleMenuMapper.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/role/RoleMenuMapper.java index cec6603..6546dee 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/role/RoleMenuMapper.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/mapper/role/RoleMenuMapper.java @@ -64,7 +64,7 @@ public interface RoleMenuMapper extends SherlyMapper { * @param menuId * @return */ - default Long countByMenuId(Long menuId) { + default Long countByMenuId(String menuId) { return selectCount(RoleMenuDO::getMenuId, menuId); } } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java index c3acf95..d3232f2 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/model/MenuDO.java @@ -19,8 +19,6 @@ import org.oswh.sherly.controller.menu.enums.MenuTypeEnum; @EqualsAndHashCode(callSuper = true) public class MenuDO extends BaseModel { - public static final String ROOT_PARENT_ID = "0"; - /** 父菜单编号 */ private String parentId; diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java index 28b4d14..2edbe48 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/service/menu/MenuService.java @@ -1,9 +1,7 @@ package org.oswh.sherly.service.menu; import org.oswh.sherly.common.modules.exception.BizException; -import org.oswh.sherly.controller.menu.dto.MenuInsertReqDTO; -import org.oswh.sherly.controller.menu.dto.MenuRespDTO; -import org.oswh.sherly.controller.menu.dto.MenuUpdateReqDTO; +import org.oswh.sherly.controller.menu.dto.*; import org.oswh.sherly.mapper.menu.MenuMapper; import org.oswh.sherly.mapper.role.RoleMenuMapper; import org.oswh.sherly.model.MenuDO; @@ -48,7 +46,6 @@ public class MenuService { .collect(Collectors.toList()); } - /** * 递归拼装子结点 * @param parent @@ -62,6 +59,7 @@ public class MenuService { .collect(Collectors.toList()); } + /** * 菜单新增 * @param dto @@ -71,11 +69,14 @@ public class MenuService { menuMapper.insert(menuDO); } + + /** * 菜单删除 - * @param menuId + * @param reqDTO */ - public void removeOne(Long menuId) { + public void removeOne(MenuDeleteReqDTO reqDTO) { + String menuId = reqDTO.getMenuId(); if (roleMenuMapper.countByMenuId(menuId) > 0) { throw new BizException(MENU_BOUND_ROLE); } @@ -87,14 +88,23 @@ public class MenuService { /** * 菜单更新 - * @param dto + * @param reqDTO */ - public void updateOne(MenuUpdateReqDTO dto) { - if (Objects.equals(dto.getParentId(), dto.getMenuId())) { + public void updateOne(MenuUpdateReqDTO reqDTO) { + if (Objects.equals(reqDTO.getParentId(), reqDTO.getMenuId())) { throw new BizException(MENU_PARENT_SELF); } - MenuDO menuDO = MenuConvertor.convertToDO(dto); + MenuDO menuDO = MenuConvertor.convertToDO(reqDTO); menuMapper.updateById(menuDO); } + /** + * 菜单详情 + * @param reqDTO + */ + public MenuDetailRespDTO detail(MenuDetailReqDTO reqDTO) { + MenuDO menu = menuMapper.selectById(reqDTO.getMenuId()); + + return MenuConvertor.convertToDetailRespDTO(menu); + } } -- Gitee From 3808e9a0269579200b5542cf9fce3f17c0b8d66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Sun, 10 Sep 2023 00:46:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../department/DepartmentController.java | 9 +++++---- .../department/dto/DepartmentDeleteReqDTO.java | 11 +++++++++++ .../controller/log/OperationLogController.java | 7 ++++--- .../log/dto/OperationLogDeleteReqDTO.java | 9 +++++++++ .../controller/login/LoginController.java | 8 +++++--- .../controller/login/LoginLogController.java | 7 ++----- .../login/dto/AccountUserListReqDTO.java | 9 +++++++++ .../sherly/controller/menu/MenuController.java | 4 ++-- .../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 | 8 ++++++++ .../oss/dto/OssConfigDetailReqDTO.java | 8 ++++++++ .../oss/dto/OssConfigEnableReqDTO.java | 11 +++++++++++ .../quartz/ScheduleTaskController.java | 6 +++--- .../sherly/controller/role/RoleController.java | 12 ++++++------ .../controller/role/dto/RoleDeleteReqDTO.java | 8 ++++++++ .../controller/role/dto/RoleDetailReqDTO.java | 8 ++++++++ .../controller/tenant/TenantController.java | 14 +++++++------- .../tenant/dto/TenantDeleteReqDTO.java | 9 +++++++++ .../tenant/dto/TenantListReqDTO.java | 8 ++++++++ .../sherly/controller/user/UserController.java | 14 +++++++------- .../controller/user/UserSelfController.java | 6 +++--- .../controller/user/dto/UserDeleteReqDTO.java | 8 ++++++++ .../controller/user/dto/UserDetailReqDTO.java | 8 ++++++++ .../manager/log/OperationLogManagerImpl.java | 4 +++- .../other/log/service/OperationLogManager.java | 3 ++- .../service/department/DepartmentService.java | 11 +++++++++-- .../sherly/service/login/LoginService.java | 12 +++++++++--- .../sherly/service/oss/OssConfigService.java | 13 ++++++++----- .../oswh/sherly/service/role/RoleService.java | 10 ++++++---- .../sherly/service/tenant/TenantService.java | 10 ++++++---- .../sherly/service/user/UserSelfService.java | 4 ++++ .../oswh/sherly/service/user/UserService.java | 10 ++++++---- 36 files changed, 231 insertions(+), 80 deletions(-) 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/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/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/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 new file mode 100644 index 0000000..8b53e32 --- /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,11 @@ +package org.oswh.sherly.controller.department.dto; + + +import lombok.Data; + +@Data +public class DepartmentDeleteReqDTO { + + 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..12cf6bd 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 @@ -4,6 +4,7 @@ import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; import org.oswh.sherly.common.model.PageResult; import org.oswh.sherly.common.model.Result; +import org.oswh.sherly.controller.log.dto.OperationLogDeleteReqDTO; import org.oswh.sherly.controller.log.dto.OperationLogPageReqDTO; import org.oswh.sherly.controller.log.dto.OperationLogPageRespDTO; import org.oswh.sherly.controller.log.dto.OperationLogRespDTO; @@ -41,11 +42,11 @@ public class OperationLogController { @PreAuthorize("hasAnyAuthority('operation_log:get_one')") @Operation(summary = "操作日志详情") @SherlyLog(noRecord = true) - public Result getOne(@RequestParam String logId) { - return Result.success(operationLogManager.getOne(logId)); + public Result getOne(@ParameterObject OperationLogDeleteReqDTO dto) { + return Result.success(operationLogManager.getOne(dto)); } - @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 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/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 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/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/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 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/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 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/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/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..5aa2c11 --- /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,9 @@ +package org.oswh.sherly.controller.tenant.dto; + +import lombok.Data; + +@Data +public class TenantDeleteReqDTO { + + 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/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..55e5a21 --- /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,8 @@ +package org.oswh.sherly.controller.tenant.dto; + +import lombok.Data; + +@Data +public class TenantListReqDTO { + 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 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; +} diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java index 1da80c8..348381b 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/manager/log/OperationLogManagerImpl.java @@ -4,6 +4,7 @@ package org.oswh.sherly.manager.log; import cn.hutool.core.util.StrUtil; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.oswh.sherly.common.model.PageResult; +import org.oswh.sherly.controller.log.dto.OperationLogDeleteReqDTO; import org.oswh.sherly.controller.log.dto.OperationLogPageReqDTO; import org.oswh.sherly.controller.log.dto.OperationLogPageRespDTO; import org.oswh.sherly.controller.log.dto.OperationLogRespDTO; @@ -64,7 +65,8 @@ public class OperationLogManagerImpl implements OperationLogManager { } @Override - public OperationLogRespDTO getOne(String logId) { + public OperationLogRespDTO getOne(OperationLogDeleteReqDTO dto) { + String logId = dto.getLogId(); OperationLogDO log = operationLogMapper.selectById(logId); return OperationLogConvertor.convertToLogRespDTO(log); } diff --git a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/other/log/service/OperationLogManager.java b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/other/log/service/OperationLogManager.java index c7450fe..962cb9a 100644 --- a/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/other/log/service/OperationLogManager.java +++ b/sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/other/log/service/OperationLogManager.java @@ -1,6 +1,7 @@ package org.oswh.sherly.other.log.service; import org.oswh.sherly.common.model.PageResult; +import org.oswh.sherly.controller.log.dto.OperationLogDeleteReqDTO; import org.oswh.sherly.controller.log.dto.OperationLogPageReqDTO; import org.oswh.sherly.controller.log.dto.OperationLogPageRespDTO; import org.oswh.sherly.controller.log.dto.OperationLogRespDTO; @@ -32,7 +33,7 @@ public interface OperationLogManager { * @param logId * @return */ - OperationLogRespDTO getOne(String logId); + OperationLogRespDTO getOne(OperationLogDeleteReqDTO dto); /** * 日志清空 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..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 @@ -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; @@ -36,6 +37,7 @@ public class DepartmentService { /** * 查询部门树 + * * @return */ public List listTree() { @@ -55,6 +57,7 @@ public class DepartmentService { /** * 递归拼装子结点 + * * @param parent * @param all * @return @@ -68,6 +71,7 @@ public class DepartmentService { /** * 部门新增 + * * @param dto */ public void saveOne(DepartmentInsertReqDTO dto) { @@ -84,6 +88,7 @@ public class DepartmentService { /** * 部门更新 + * * @param dto */ public void updateOne(DepartmentUpdateReqDTO dto) { @@ -104,10 +109,12 @@ 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); } 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/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 From 96e1a48d72c6487dadb011ec69dca4b74c82ae40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=9C=E6=98=B1=E6=81=92?= Date: Sun, 10 Sep 2023 13:50:39 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=A7=84=E8=8C=83=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sherly/controller/menu/dto/MenuDetailRespDTO.java | 6 +++--- .../oswh/sherly/controller/menu/dto/MenuRespDTO.java | 7 +------ .../controller/tenant/TenantPackageController.java | 10 +++++----- .../controller/tenant/dto/TenantDetailReqDTO.java | 8 ++++++++ .../controller/useronline/UserOnlineController.java | 2 +- .../sherly/service/tenant/TenantPackageService.java | 5 +++-- 6 files changed, 21 insertions(+), 17 deletions(-) create mode 100644 sherly-boot-services/sherly-boot-system/sherly-boot-system-biz/src/main/java/org/oswh/sherly/controller/tenant/dto/TenantDetailReqDTO.java 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 index cedd6a2..259b368 100644 --- 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 @@ -58,14 +58,14 @@ public class MenuDetailRespDTO { * 当设置为 true，该菜单不会展示在侧边栏，但是路由还是存在。例如说，一些独立的编辑页面 /edit/1024 等等 */ @Schema(description = "显示状态") - private BooleanEnum visible; + private UsableEnum visible; /** * 总是显示 * 如果为 false，当该菜单只有一个子菜单时，不展示自己，直接展示子菜单 */ @Schema(description = "总是显示") - private BooleanEnum alwaysShow; + private UsableEnum alwaysShow; /** * 缓存状态 @@ -73,5 +73,5 @@ public class MenuDetailRespDTO { * 注意：如果开启缓存，则必须填写 componentName，否则无法缓存 */ @Schema(description = "缓存状态") - private BooleanEnum keepAlive; + private UsableEnum keepAlive; } 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 b7d33ef..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; + /** * 显示状态 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/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..c9f2246 --- /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,8 @@ +package org.oswh.sherly.controller.tenant.dto; + +import lombok.Data; + +@Data +public class TenantDetailReqDTO { + private String tenantPackageId; +} 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/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); -- Gitee