refactor: 系统功能重构

2024-06-24 08:15:46 +08:00
parent 5a6ae48bcd
commit 7d1fcfbef4
71 changed files with 900 additions and 1048 deletions
--- a/src/main/java/com/youlai/system/controller/SysDeptController.java
+++ b/src/main/java/com/youlai/system/controller/SysDeptController.java
@@ -1,6 +1,6 @@
 package com.youlai.system.controller;

-import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
+import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
 import com.youlai.system.common.model.Option;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.model.form.DeptForm;
@@ -11,7 +11,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -29,23 +28,36 @@ import java.util.List;
@RequestMapping("/api/v1/dept")
@RequiredArgsConstructor
 public class SysDeptController {
+
    private final SysDeptService deptService;
+
    @Operation(summary = "获取部门列表")
    @GetMapping
-    public Result<List<DeptVO>> listDepartments(
-            @ParameterObject DeptQuery queryParams
+    public Result<List<DeptVO>> getDeptList(
+             DeptQuery queryParams
    ) {
-        List<DeptVO> list = deptService.listDepartments(queryParams);
+        List<DeptVO> list = deptService.getDeptList(queryParams);
        return Result.success(list);
    }

    @Operation(summary = "获取部门下拉选项")
    @GetMapping("/options")
-    public Result<List<Option>> listDeptOptions() {
+    public Result<List<Option>> getDeptOptions() {
        List<Option> list = deptService.listDeptOptions();
        return Result.success(list);
    }

+    @Operation(summary = "新增部门")
+    @PostMapping
+    @PreAuthorize("@ss.hasPerm('sys:dept:add')")
+    @PreventRepeatSubmit
+    public Result saveDept(
+            @Valid @RequestBody DeptForm formData
+    ) {
+        Long id = deptService.saveDept(formData);
+        return Result.success(id);
+    }
+
    @Operation(summary = "获取部门表单数据")
    @GetMapping("/{deptId}/form")
    public Result<DeptForm> getDeptForm(
@@ -55,17 +67,6 @@ public class SysDeptController {
        return Result.success(deptForm);
    }

-    @Operation(summary = "新增部门")
-    @PostMapping
-    @PreAuthorize("@ss.hasPerm('sys:dept:add')")
-    @PreventDuplicateSubmit
-    public Result saveDept(
-            @Valid @RequestBody DeptForm formData
-    ) {
-        Long id = deptService.saveDept(formData);
-        return Result.success(id);
-    }
-
    @Operation(summary = "修改部门")
    @PutMapping(value = "/{deptId}")
    @PreAuthorize("@ss.hasPerm('sys:dept:edit')")
--- a/src/main/java/com/youlai/system/controller/SysDictController.java
+++ b/src/main/java/com/youlai/system/controller/SysDictController.java
@@ -3,26 +3,24 @@ package com.youlai.system.controller;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
-import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
-import com.youlai.system.model.form.DictForm;
-import com.youlai.system.model.form.DictTypeForm;
-import com.youlai.system.model.query.DictPageQuery;
-import com.youlai.system.model.query.DictTypePageQuery;
 import com.youlai.system.model.vo.DictPageVO;
-import com.youlai.system.model.vo.DictTypePageVO;
-import com.youlai.system.common.model.Option;
+import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
+import com.youlai.system.model.form.DictForm;
+import com.youlai.system.model.query.DictTypePageQuery;
 import com.youlai.system.service.SysDictService;
-import com.youlai.system.service.SysDictTypeService;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

-import java.util.List;
-
+/**
+ * 字典控制层
+ *
+ * @author Ray Hao
+ * @since 2.9.0
+ */
@Tag(name = "06.字典接口")
@RestController
@RequestMapping("/api/v1/dict")
@@ -31,21 +29,19 @@ public class SysDictController {

    private final SysDictService dictService;

-    private final SysDictTypeService dictTypeService;
-
    @Operation(summary = "字典分页列表")
    @GetMapping("/page")
    public PageResult<DictPageVO> getDictPage(
-            @ParameterObject DictPageQuery queryParams
+            DictTypePageQuery queryParams
    ) {
        Page<DictPageVO> result = dictService.getDictPage(queryParams);
        return PageResult.success(result);
    }

-    @Operation(summary = "字典数据表单数据")
+    @Operation(summary = "字典表单")
    @GetMapping("/{id}/form")
    public Result<DictForm> getDictForm(
-            @Parameter(description ="字典ID") @PathVariable Long id
+            @Parameter(description = "字典ID") @PathVariable Long id
    ) {
        DictForm formData = dictService.getDictForm(id);
        return Result.success(formData);
@@ -54,11 +50,9 @@ public class SysDictController {
    @Operation(summary = "新增字典")
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:dict:add')")
-    @PreventDuplicateSubmit
-    public Result saveDict(
-            @RequestBody DictForm DictForm
-    ) {
-        boolean result = dictService.saveDict(DictForm);
+    @PreventRepeatSubmit
+    public Result saveDict(@RequestBody DictForm formData) {
+        boolean result = dictService.saveDict(formData);
        return Result.judge(result);
    }

@@ -76,70 +70,12 @@ public class SysDictController {
    @Operation(summary = "删除字典")
    @DeleteMapping("/{ids}")
    @PreAuthorize("@ss.hasPerm('sys:dict:delete')")
-    public Result deleteDict(
-            @Parameter(description ="字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
+    public Result deleteDictionaries(
+            @Parameter(description = "字典ID，多个以英文逗号(,)拼接") @PathVariable String ids
    ) {
-        boolean result = dictService.deleteDict(ids);
-        return Result.judge(result);
+        dictService.deleteDictByIds(ids);
+        return Result.success();
    }


-    @Operation(summary = "字典下拉列表")
-    @GetMapping("/{typeCode}/options")
-    public Result<List<Option>> listDictOptions(
-            @Parameter(description ="字典类型编码") @PathVariable String typeCode
-    ) {
-        List<Option> list = dictService.listDictOptions(typeCode);
-        return Result.success(list);
-    }
-
-
-    /*----------------------------------------------------*/
-    @Operation(summary = "字典类型分页列表")
-    @GetMapping("/types/page")
-    public PageResult<DictTypePageVO> getDictTypePage(
-            @ParameterObject DictTypePageQuery queryParams
-    ) {
-        Page<DictTypePageVO> result = dictTypeService.getDictTypePage(queryParams);
-        return PageResult.success(result);
-    }
-
-    @Operation(summary = "字典类型表单数据")
-    @GetMapping("/types/{id}/form")
-    public Result<DictTypeForm> getDictTypeForm(
-            @Parameter(description ="字典ID") @PathVariable Long id
-    ) {
-        DictTypeForm dictTypeForm = dictTypeService.getDictTypeForm(id);
-        return Result.success(dictTypeForm);
-    }
-
-    @Operation(summary = "新增字典类型")
-    @PostMapping("/types")
-    @PreAuthorize("@ss.hasPerm('sys:dict_type:add')")
-    @PreventDuplicateSubmit
-    public Result saveDictType(@RequestBody DictTypeForm dictTypeForm) {
-        boolean result = dictTypeService.saveDictType(dictTypeForm);
-        return Result.judge(result);
-    }
-
-    @Operation(summary = "修改字典类型")
-    @PutMapping("/types/{id}")
-    @PreAuthorize("@ss.hasPerm('sys:dict_type:edit')")
-    public Result updateDictType(@PathVariable Long id, @RequestBody DictTypeForm dictTypeForm) {
-        boolean status = dictTypeService.updateDictType(id, dictTypeForm);
-        return Result.judge(status);
-    }
-
-    @Operation(summary = "删除字典类型")
-    @DeleteMapping("/types/{ids}")
-    @PreAuthorize("@ss.hasPerm('sys:dict_type:delete')")
-    public Result deleteDictTypes(
-            @Parameter(description ="字典类型ID，多个以英文逗号(,)分割") @PathVariable String ids
-    ) {
-        boolean result = dictTypeService.deleteDictTypes(ids);
-
-
-        return Result.judge(result);
-    }
-
 }
--- a/src/main/java/com/youlai/system/controller/SysMenuController.java
+++ b/src/main/java/com/youlai/system/controller/SysMenuController.java
@@ -1,7 +1,7 @@
 package com.youlai.system.controller;

 import com.youlai.system.common.result.Result;
-import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
+import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
 import com.youlai.system.model.form.MenuForm;
 import com.youlai.system.model.query.MenuQuery;
 import com.youlai.system.model.vo.MenuVO;
@@ -10,12 +10,9 @@ import com.youlai.system.model.vo.RouteVO;
 import com.youlai.system.service.SysMenuService;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.springdoc.core.annotations.ParameterObject;
-import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -38,7 +35,7 @@ public class SysMenuController {

    @Operation(summary = "菜单列表")
    @GetMapping
-    public Result<List<MenuVO>> listMenus( @ParameterObject MenuQuery queryParams) {
+    public Result<List<MenuVO>> listMenus(MenuQuery queryParams) {
        List<MenuVO> menuList = menuService.listMenus(queryParams);
        return Result.success(menuList);
    }
@@ -60,7 +57,7 @@ public class SysMenuController {
    @Operation(summary = "菜单表单数据")
    @GetMapping("/{id}/form")
    public Result<MenuForm> getMenuForm(
-            @Parameter(description =  "菜单ID") @PathVariable Long id
+            @Parameter(description = "菜单ID") @PathVariable Long id
    ) {
        MenuForm menu = menuService.getMenuForm(id);
        return Result.success(menu);
@@ -69,7 +66,7 @@ public class SysMenuController {
    @Operation(summary = "新增菜单")
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:menu:add')")
-    @PreventDuplicateSubmit
+    @PreventRepeatSubmit
    public Result addMenu(@RequestBody MenuForm menuForm) {
        boolean result = menuService.saveMenu(menuForm);
        return Result.judge(result);
@@ -89,7 +86,7 @@ public class SysMenuController {
    @DeleteMapping("/{id}")
    @PreAuthorize("@ss.hasPerm('sys:menu:delete')")
    public Result deleteMenu(
-            @Parameter(description ="菜单ID，多个以英文(,)分割") @PathVariable("id") Long id
+            @Parameter(description = "菜单ID，多个以英文(,)分割") @PathVariable("id") Long id
    ) {
        boolean result = menuService.deleteMenu(id);
        return Result.judge(result);
@@ -98,11 +95,11 @@ public class SysMenuController {
    @Operation(summary = "修改菜单显示状态")
    @PatchMapping("/{menuId}")
    public Result updateMenuVisible(
-            @Parameter(description =  "菜单ID") @PathVariable Long menuId,
-            @Parameter(description =  "显示状态(1:显示;0:隐藏)") Integer visible
+            @Parameter(description = "菜单ID") @PathVariable Long menuId,
+            @Parameter(description = "显示状态(1:显示;0:隐藏)") Integer visible

    ) {
-        boolean result =menuService.updateMenuVisible(menuId, visible);
+        boolean result = menuService.updateMenuVisible(menuId, visible);
        return Result.judge(result);
    }

--- a/src/main/java/com/youlai/system/controller/SysRoleController.java
+++ b/src/main/java/com/youlai/system/controller/SysRoleController.java
@@ -1,7 +1,7 @@
 package com.youlai.system.controller;

 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
+import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
 import com.youlai.system.common.model.Option;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
@@ -13,7 +13,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;

@@ -32,7 +31,7 @@ public class SysRoleController {
    @Operation(summary = "角色分页列表")
    @GetMapping("/page")
    public PageResult<RolePageVO> getRolePage(
-            @ParameterObject RolePageQuery queryParams
+             RolePageQuery queryParams
    ) {
        Page<RolePageVO> result = roleService.getRolePage(queryParams);
        return PageResult.success(result);
@@ -48,7 +47,7 @@ public class SysRoleController {
    @Operation(summary = "新增角色")
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:role:add')")
-    @PreventDuplicateSubmit
+    @PreventRepeatSubmit
    public Result addRole(@Valid @RequestBody RoleForm roleForm) {
        boolean result = roleService.saveRole(roleForm);
        return Result.judge(result);
--- a/src/main/java/com/youlai/system/controller/SysUserController.java
+++ b/src/main/java/com/youlai/system/controller/SysUserController.java
@@ -7,13 +7,13 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.youlai.system.common.result.PageResult;
 import com.youlai.system.common.result.Result;
 import com.youlai.system.common.util.ExcelUtils;
-import com.youlai.system.plugin.dupsubmit.annotation.PreventDuplicateSubmit;
+import com.youlai.system.model.dto.UserImportDTO;
+import com.youlai.system.plugin.norepeat.annotation.PreventRepeatSubmit;
 import com.youlai.system.plugin.easyexcel.UserImportListener;
-import com.youlai.system.model.vo.UserImportVO;
 import com.youlai.system.model.form.UserForm;
 import com.youlai.system.model.entity.SysUser;
 import com.youlai.system.model.query.UserPageQuery;
-import com.youlai.system.model.vo.UserExportVO;
+import com.youlai.system.model.dto.UserExportDTO;
 import com.youlai.system.model.vo.UserInfoVO;
 import com.youlai.system.model.vo.UserPageVO;
 import com.youlai.system.service.SysUserService;
@@ -21,7 +21,6 @@ import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import io.swagger.v3.oas.annotations.Operation;
 import lombok.RequiredArgsConstructor;
-import org.springdoc.core.annotations.ParameterObject;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -54,7 +53,7 @@ public class SysUserController {
    @Operation(summary = "用户分页列表")
    @GetMapping("/page")
    public PageResult<UserPageVO> listPagedUsers(
-            @ParameterObject UserPageQuery queryParams
+             UserPageQuery queryParams
    ) {
        IPage<UserPageVO> result = userService.listPagedUsers(queryParams);
        return PageResult.success(result);
@@ -63,7 +62,7 @@ public class SysUserController {
    @Operation(summary = "新增用户")
    @PostMapping
    @PreAuthorize("@ss.hasPerm('sys:user:add')")
-    @PreventDuplicateSubmit
+    @PreventRepeatSubmit
    public Result saveUser(
            @RequestBody @Valid UserForm userForm
    ) {
@@ -149,9 +148,9 @@ public class SysUserController {

    @Operation(summary = "导入用户")
    @PostMapping("/import")
-    public Result importUsers(@Parameter(description = "部门ID") Long deptId, MultipartFile file) throws IOException {
-        UserImportListener listener = new UserImportListener(deptId);
-        String msg = ExcelUtils.importExcel(file.getInputStream(), UserImportVO.class, listener);
+    public Result importUsers( MultipartFile file) throws IOException {
+        UserImportListener listener = new UserImportListener();
+        String msg = ExcelUtils.importExcel(file.getInputStream(), UserImportDTO.class, listener);
        return Result.success(msg);
    }

@@ -162,8 +161,8 @@ public class SysUserController {
        response.setContentType("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet");
        response.setHeader("Content-Disposition", "attachment; filename=" + URLEncoder.encode(fileName, "UTF-8"));

-        List<UserExportVO> exportUserList = userService.listExportUsers(queryParams);
-        EasyExcel.write(response.getOutputStream(), UserExportVO.class).sheet("用户列表")
+        List<UserExportDTO> exportUserList = userService.listExportUsers(queryParams);
+        EasyExcel.write(response.getOutputStream(), UserExportDTO.class).sheet("用户列表")
                .doWrite(exportUserList);
    }
 }