From 069a0ba3643d0f8e2b23001c7e385738d26b188c Mon Sep 17 00:00:00 2001
From: "1621142473@qq.com" <1621142473@qq.com>
Date: Sat, 10 Jun 2023 20:41:39 +0800
Subject: [PATCH] =?UTF-8?q?update=EF=BC=9A=E5=AD=97=E5=85=B8=E6=9C=8D?=
 =?UTF-8?q?=E5=8A=A1=E6=8E=A7=E5=88=B6=E5=B1=82=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/SysDictDataController.java     |  1 +
 .../controller/SysDictTypeController.java     | 20 +++++++++++++------
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java
index e304865f..eb37ef57 100644
--- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java
+++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictDataController.java
@@ -88,6 +88,7 @@ public class SysDictDataController {
     /**
      * 新增字典类型
      */
+    @ApiOperation(value = "新增字典类型", notes = "新增字典类型")
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典数据", businessType = BusinessType.INSERT)
     @PostMapping("/add")
diff --git a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java
index d94b34ba..9233d895 100644
--- a/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java
+++ b/iot-module/iot-system/src/main/java/cc/iotkit/system/controller/SysDictTypeController.java
@@ -6,16 +6,20 @@ import cc.iotkit.common.api.Request;
 import cc.iotkit.common.excel.utils.ExcelUtil;
 import cc.iotkit.common.log.annotation.Log;
 import cc.iotkit.common.log.enums.BusinessType;
+import cc.iotkit.common.validate.EditGroup;
 import cc.iotkit.common.validate.QueryGroup;
 import cc.iotkit.common.web.core.BaseController;
 import cc.iotkit.system.dto.bo.SysDictTypeBo;
 import cc.iotkit.system.dto.vo.SysDictTypeVo;
-import cn.dev33.satoken.annotation.SaCheckPermission;
 import cc.iotkit.system.service.ISysDictTypeService;
+import cn.dev33.satoken.annotation.SaCheckPermission;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 import javax.servlet.http.HttpServletResponse;
 import java.util.Collection;
@@ -65,7 +69,7 @@ public class SysDictTypeController extends BaseController {
     @ApiOperation(value = "查询字典类型详细", notes = "查询字典类型详细")
     @SaCheckPermission("system:dict:query")
     @PostMapping(value = "/getById")
-    public SysDictTypeVo getInfo(@Validated @RequestBody Request<SysDictTypeBo> bo) {
+    public SysDictTypeVo getInfo(@Validated(QueryGroup.class) @RequestBody Request<SysDictTypeBo> bo) {
         Long dictTypeId = bo.getData().getId();
         return dictTypeService.selectDictTypeById(dictTypeId);
     }
@@ -77,7 +81,7 @@ public class SysDictTypeController extends BaseController {
     @SaCheckPermission("system:dict:add")
     @Log(title = "字典类型", businessType = BusinessType.INSERT)
     @PostMapping("/add")
-    public void add(@Validated @RequestBody Request<SysDictTypeBo> dict) {
+    public void add(@Validated(EditGroup.class) @RequestBody Request<SysDictTypeBo> dict) {
         if (!dictTypeService.checkDictTypeUnique(dict.getData())) {
             fail("新增字典'" + dict.getData().getDictName() + "'失败，字典类型已存在");
         }
@@ -87,10 +91,11 @@ public class SysDictTypeController extends BaseController {
     /**
      * 修改字典类型
      */
+    @ApiOperation(value = "修改字典类型", notes = "修改字典类型")
     @SaCheckPermission("system:dict:edit")
     @Log(title = "字典类型", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
-    public void edit(@Validated @RequestBody Request<SysDictTypeBo> dict) {
+    public void edit(@Validated(EditGroup.class) @RequestBody Request<SysDictTypeBo> dict) {
         if (!dictTypeService.checkDictTypeUnique(dict.getData())) {
             fail("修改字典'" + dict.getData().getDictName() + "'失败，字典类型已存在");
         }
@@ -102,16 +107,18 @@ public class SysDictTypeController extends BaseController {
      *
      * @param dictIds 字典ID串
      */
+    @ApiOperation(value = "删除字典类型", notes = "删除字典类型")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.DELETE)
     @PostMapping("/delete")
-    public void remove(@PathVariable Collection<Long> dictIds) {
+    public void remove(@RequestBody @Validated Collection<Long> dictIds) {
         dictTypeService.deleteDictTypeByIds(dictIds);
     }
 
     /**
      * 刷新字典缓存
      */
+    @ApiOperation(value = "刷新字典缓存", notes = "刷新字典缓存")
     @SaCheckPermission("system:dict:remove")
     @Log(title = "字典类型", businessType = BusinessType.CLEAN)
     @PostMapping("/refreshCache")
@@ -122,6 +129,7 @@ public class SysDictTypeController extends BaseController {
     /**
      * 获取字典选择框列表
      */
+    @ApiOperation(value = "获取字典选择框列表", notes = "获取字典选择框列表")
     @PostMapping("/optionselect")
     public List<SysDictTypeVo> optionselect() {
         return dictTypeService.selectDictTypeAll();