From 6ca853516671882e8e54d9630a4299f12fbcf9aa Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 13 一月 2022 11:14:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/satoken' into dev
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 63 ++++++++++++++++---------------
1 files changed, 33 insertions(+), 30 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 f0b2e6d..0b8a928 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
@@ -2,15 +2,19 @@
import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
-import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.constant.UserConstants;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -21,64 +25,64 @@
/**
* 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Validated
+@Api(value = "鍙傛暟閰嶇疆鎺у埗鍣�", tags = {"鍙傛暟閰嶇疆绠＄悊"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
- @Autowired
- private ISysConfigService configService;
+public class SysConfigController extends BaseController {
+
+ private final ISysConfigService configService;
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
*/
+ @ApiOperation("鑾峰彇鍙傛暟閰嶇疆鍒楄〃")
@SaCheckPermission("system:config:list")
@GetMapping("/list")
- public TableDataInfo list(SysConfig config)
- {
- return configService.selectPageConfigList(config);
+ public TableDataInfo<SysConfig> list(SysConfig config, PageQuery pageQuery) {
+ return configService.selectPageConfigList(config, pageQuery);
}
+ @ApiOperation("瀵煎嚭鍙傛暟閰嶇疆鍒楄〃")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
@SaCheckPermission("system:config:export")
- @GetMapping("/export")
- public void export(SysConfig config, HttpServletResponse response)
- {
+ @PostMapping("/export")
+ public void export(SysConfig config, HttpServletResponse response) {
List<SysConfig> list = configService.selectConfigList(config);
- ExcelUtil.exportExcel(list, "鍙傛暟鏁版嵁", SysConfig.class, response);
+ ExcelUtil.exportExcel(list, "鍙傛暟鏁版嵁", SysConfig.class, response);
}
/**
* 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
*/
+ @ApiOperation("鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅")
@SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
- public AjaxResult getInfo(@PathVariable Long configId)
- {
+ public AjaxResult<SysConfig> getInfo(@ApiParam("鍙傛暟ID") @PathVariable Long configId) {
return AjaxResult.success(configService.selectConfigById(configId));
}
/**
* 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
*/
+ @ApiOperation("鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�")
@GetMapping(value = "/configKey/{configKey}")
- public AjaxResult getConfigKey(@PathVariable String configKey)
- {
+ public AjaxResult<Void> getConfigKey(@ApiParam("鍙傛暟Key") @PathVariable String configKey) {
return AjaxResult.success(configService.selectConfigByKey(configKey));
}
/**
* 鏂板鍙傛暟閰嶇疆
*/
+ @ApiOperation("鏂板鍙傛暟閰嶇疆")
@SaCheckPermission("system:config:add")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- @RepeatSubmit
- public AjaxResult add(@Validated @RequestBody SysConfig config)
- {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
- {
+ public AjaxResult<Void> add(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return AjaxResult.error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
return toAjax(configService.insertConfig(config));
@@ -87,13 +91,12 @@
/**
* 淇敼鍙傛暟閰嶇疆
*/
+ @ApiOperation("淇敼鍙傛暟閰嶇疆")
@SaCheckPermission("system:config:edit")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
@PutMapping
- public AjaxResult edit(@Validated @RequestBody SysConfig config)
- {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
- {
+ public AjaxResult<Void> edit(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return AjaxResult.error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
return toAjax(configService.updateConfig(config));
@@ -102,11 +105,11 @@
/**
* 鍒犻櫎鍙傛暟閰嶇疆
*/
+ @ApiOperation("鍒犻櫎鍙傛暟閰嶇疆")
@SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
- public AjaxResult remove(@PathVariable Long[] configIds)
- {
+ public AjaxResult<Void> remove(@ApiParam("鍙傛暟ID涓�") @PathVariable Long[] configIds) {
configService.deleteConfigByIds(configIds);
return success();
}
@@ -114,11 +117,11 @@
/**
* 鍒锋柊鍙傛暟缂撳瓨
*/
+ @ApiOperation("鍒锋柊鍙傛暟缂撳瓨")
@SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public AjaxResult refreshCache()
- {
+ public AjaxResult<Void> refreshCache() {
configService.resetConfigCache();
return AjaxResult.success();
}
--
Gitblit v1.9.3