wip: 字典重构临时提交

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);
+        boolean result = dictService.deleteDictByIds(ids);
         return Result.judge(result);
     }
 
 
-    @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);
-    }
-
 }