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/SysConfigController.java | 27 ++++++++++++++++++---------
1 files changed, 18 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
index 3e26979..c1b3acd 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java
@@ -11,8 +11,6 @@
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -26,7 +24,6 @@
* @author Lion Li
*/
@Validated
-@Tag(name ="鍙傛暟閰嶇疆鎺у埗鍣�", description = "鍙傛暟閰嶇疆绠＄悊")
@RequiredArgsConstructor
@RestController
@RequestMapping("/system/config")
@@ -43,6 +40,9 @@
return configService.selectPageConfigList(config, pageQuery);
}
+ /**
+ * 瀵煎嚭鍙傛暟閰嶇疆鍒楄〃
+ */
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:config:export")
@PostMapping("/export")
@@ -53,18 +53,22 @@
/**
* 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
+ *
+ * @param configId 鍙傛暟ID
*/
@SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
- public R<SysConfig> getInfo(@Parameter(name = "鍙傛暟ID") @PathVariable Long configId) {
+ public R<SysConfig> getInfo(@PathVariable Long configId) {
return R.ok(configService.selectConfigById(configId));
}
/**
* 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
+ *
+ * @param configKey 鍙傛暟Key
*/
@GetMapping(value = "/configKey/{configKey}")
- public R<Void> getConfigKey(@Parameter(name = "鍙傛暟Key") @PathVariable String configKey) {
+ public R<Void> getConfigKey(@PathVariable String configKey) {
return R.ok(configService.selectConfigByKey(configKey));
}
@@ -78,7 +82,8 @@
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return R.fail("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
- return toAjax(configService.insertConfig(config));
+ configService.insertConfig(config);
+ return R.ok();
}
/**
@@ -91,7 +96,8 @@
if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return R.fail("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
- return toAjax(configService.updateConfig(config));
+ configService.updateConfig(config);
+ return R.ok();
}
/**
@@ -101,16 +107,19 @@
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping("/updateByKey")
public R<Void> updateByKey(@RequestBody SysConfig config) {
- return toAjax(configService.updateConfig(config));
+ configService.updateConfig(config);
+ return R.ok();
}
/**
* 鍒犻櫎鍙傛暟閰嶇疆
+ *
+ * @param configIds 鍙傛暟ID涓�
*/
@SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
- public R<Void> remove(@Parameter(name = "鍙傛暟ID涓�") @PathVariable Long[] configIds) {
+ public R<Void> remove(@PathVariable Long[] configIds) {
configService.deleteConfigByIds(configIds);
return R.ok();
}
--
Gitblit v1.9.3