From e41a58b10d0e246c54aff7fd722f0505b082118f Mon Sep 17 00:00:00 2001
From: itino <yaogogo@88.com>
Date: 星期四, 17 十一月 2022 17:28:36 +0800
Subject: [PATCH] update 字典数据json序列化工具加一个 bean的非空判断
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java | 37 ++++++++++++++++++++-----------------
1 files changed, 20 insertions(+), 17 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
index 060e980..01613db 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysDictDataController.java
@@ -4,17 +4,14 @@
import cn.hutool.core.util.ObjectUtil;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
-import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.domain.entity.SysDictData;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.service.ISysDictDataService;
import com.ruoyi.system.service.ISysDictTypeService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -29,7 +26,6 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鏁版嵁瀛楀吀淇℃伅鎺у埗鍣�", tags = {"鏁版嵁瀛楀吀淇℃伅绠＄悊"})
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/dict/data")
@@ -38,14 +34,18 @@
private final ISysDictDataService dictDataService;
private final ISysDictTypeService dictTypeService;
- @ApiOperation("鏌ヨ瀛楀吀鏁版嵁鍒楄〃")
+ /**
+ * 鏌ヨ瀛楀吀鏁版嵁鍒楄〃
+ */
@SaCheckPermission("system:dict:list")
@GetMapping("/list")
public TableDataInfo<SysDictData> list(SysDictData dictData, PageQuery pageQuery) {
return dictDataService.selectPageDictDataList(dictData, pageQuery);
}
- @ApiOperation("瀵煎嚭瀛楀吀鏁版嵁鍒楄〃")
+ /**
+ * 瀵煎嚭瀛楀吀鏁版嵁鍒楄〃
+ */
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:dict:export")
@PostMapping("/export")
@@ -56,20 +56,22 @@
/**
* 鏌ヨ瀛楀吀鏁版嵁璇︾粏
+ *
+ * @param dictCode 瀛楀吀code
*/
- @ApiOperation("鏌ヨ瀛楀吀鏁版嵁璇︾粏")
@SaCheckPermission("system:dict:query")
@GetMapping(value = "/{dictCode}")
- public R<SysDictData> getInfo(@ApiParam("瀛楀吀code") @PathVariable Long dictCode) {
+ public R<SysDictData> getInfo(@PathVariable Long dictCode) {
return R.ok(dictDataService.selectDictDataById(dictCode));
}
/**
* 鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅
+ *
+ * @param dictType 瀛楀吀绫诲瀷
*/
- @ApiOperation("鏍规嵁瀛楀吀绫诲瀷鏌ヨ瀛楀吀鏁版嵁淇℃伅")
@GetMapping(value = "/type/{dictType}")
- public R<List<SysDictData>> dictType(@ApiParam("瀛楀吀绫诲瀷") @PathVariable String dictType) {
+ public R<List<SysDictData>> dictType(@PathVariable String dictType) {
List<SysDictData> data = dictTypeService.selectDictDataByType(dictType);
if (ObjectUtil.isNull(data)) {
data = new ArrayList<>();
@@ -80,33 +82,34 @@
/**
* 鏂板瀛楀吀绫诲瀷
*/
- @ApiOperation("鏂板瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:add")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.INSERT)
@PostMapping
public R<Void> add(@Validated @RequestBody SysDictData dict) {
- return toAjax(dictDataService.insertDictData(dict));
+ dictDataService.insertDictData(dict);
+ return R.ok();
}
/**
* 淇敼淇濆瓨瀛楀吀绫诲瀷
*/
- @ApiOperation("淇敼淇濆瓨瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:edit")
@Log(title = "瀛楀吀鏁版嵁", businessType = BusinessType.UPDATE)
@PutMapping
public R<Void> edit(@Validated @RequestBody SysDictData dict) {
- return toAjax(dictDataService.updateDictData(dict));
+ dictDataService.updateDictData(dict);
+ return R.ok();
}
/**
* 鍒犻櫎瀛楀吀绫诲瀷
+ *
+ * @param dictCodes 瀛楀吀code涓�
*/
- @ApiOperation("鍒犻櫎瀛楀吀绫诲瀷")
@SaCheckPermission("system:dict:remove")
@Log(title = "瀛楀吀绫诲瀷", businessType = BusinessType.DELETE)
@DeleteMapping("/{dictCodes}")
- public R<Void> remove(@ApiParam("瀛楀吀code涓�") @PathVariable Long[] dictCodes) {
+ public R<Void> remove(@PathVariable Long[] dictCodes) {
dictDataService.deleteDictDataByIds(dictCodes);
return R.ok();
}
--
Gitblit v1.9.3