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 | 113 ++++++++++++++++++++++++++++++--------------------------
1 files changed, 61 insertions(+), 52 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 03d6108..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
@@ -1,18 +1,17 @@
package com.ruoyi.web.controller.system;
+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.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.SecurityUtils;
-import com.ruoyi.common.utils.poi.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
+import lombok.RequiredArgsConstructor;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -22,107 +21,117 @@
/**
* 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Validated
+@RequiredArgsConstructor
@RestController
@RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
- @Autowired
- private ISysConfigService configService;
+public class SysConfigController extends BaseController {
+
+ private final ISysConfigService configService;
/**
* 鑾峰彇鍙傛暟閰嶇疆鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('system:config:list')")
+ @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);
}
+ /**
+ * 瀵煎嚭鍙傛暟閰嶇疆鍒楄〃
+ */
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('system:config:export')")
- @GetMapping("/export")
- public void export(SysConfig config, HttpServletResponse response)
- {
+ @SaCheckPermission("system:config:export")
+ @PostMapping("/export")
+ public void export(SysConfig config, HttpServletResponse response) {
List<SysConfig> list = configService.selectConfigList(config);
- ExcelUtils.exportExcel(list, "鍙傛暟鏁版嵁", SysConfig.class, response);
+ ExcelUtil.exportExcel(list, "鍙傛暟鏁版嵁", SysConfig.class, response);
}
/**
* 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅
+ *
+ * @param configId 鍙傛暟ID
*/
- @PreAuthorize("@ss.hasPermi('system:config:query')")
+ @SaCheckPermission("system:config:query")
@GetMapping(value = "/{configId}")
- public AjaxResult getInfo(@PathVariable Long configId)
- {
- return AjaxResult.success(configService.selectConfigById(configId));
+ public R<SysConfig> getInfo(@PathVariable Long configId) {
+ return R.ok(configService.selectConfigById(configId));
}
/**
* 鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�
+ *
+ * @param configKey 鍙傛暟Key
*/
@GetMapping(value = "/configKey/{configKey}")
- public AjaxResult getConfigKey(@PathVariable String configKey)
- {
- return AjaxResult.success(configService.selectConfigByKey(configKey));
+ public R<Void> getConfigKey(@PathVariable String configKey) {
+ return R.ok(configService.selectConfigByKey(configKey));
}
/**
* 鏂板鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:add')")
+ @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)))
- {
- return AjaxResult.error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
+ public R<Void> add(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+ return R.fail("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
- config.setCreateBy(SecurityUtils.getUsername());
- return toAjax(configService.insertConfig(config));
+ configService.insertConfig(config);
+ return R.ok();
}
/**
* 淇敼鍙傛暟閰嶇疆
*/
- @PreAuthorize("@ss.hasPermi('system:config:edit')")
+ @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)))
- {
- return AjaxResult.error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
+ public R<Void> edit(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
+ return R.fail("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
- config.setUpdateBy(SecurityUtils.getUsername());
- return toAjax(configService.updateConfig(config));
+ configService.updateConfig(config);
+ return R.ok();
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟閿悕淇敼鍙傛暟閰嶇疆
+ */
+ @SaCheckPermission("system:config:edit")
+ @Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.UPDATE)
+ @PutMapping("/updateByKey")
+ public R<Void> updateByKey(@RequestBody SysConfig config) {
+ configService.updateConfig(config);
+ return R.ok();
}
/**
* 鍒犻櫎鍙傛暟閰嶇疆
+ *
+ * @param configIds 鍙傛暟ID涓�
*/
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
- public AjaxResult remove(@PathVariable Long[] configIds)
- {
+ public R<Void> remove(@PathVariable Long[] configIds) {
configService.deleteConfigByIds(configIds);
- return success();
+ return R.ok();
}
/**
* 鍒锋柊鍙傛暟缂撳瓨
*/
- @PreAuthorize("@ss.hasPermi('system:config:remove')")
+ @SaCheckPermission("system:config:remove")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public AjaxResult refreshCache()
- {
+ public R<Void> refreshCache() {
configService.resetConfigCache();
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3