From 7e49fc48065211df6bbb6b6f43fa747cdfbf4727 Mon Sep 17 00:00:00 2001
From: aijinhui <aijinhui>
Date: 星期六, 23 十二月 2023 14:48:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysConfigController.java | 67 ++++++++++++++++++++-------------
1 files changed, 41 insertions(+), 26 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 588480f..6755675 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
@@ -23,19 +23,18 @@
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.common.core.domain.entity.SysConfig;
import com.ruoyi.system.service.ISysConfigService;
/**
* 鍙傛暟閰嶇疆 淇℃伅鎿嶄綔澶勭悊
- *
+ *
* @author ruoyi
*/
@Api(tags = "鍙傛暟閰嶇疆")
@RestController
@RequestMapping("/system/config")
-public class SysConfigController extends BaseController
-{
+public class SysConfigController extends BaseController {
@Autowired
private ISysConfigService configService;
@@ -44,8 +43,17 @@
*/
@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/list")
- public TableDataInfo list(SysConfig config)
- {
+ public TableDataInfo list(SysConfig config) {
+ startPage();
+ List<SysConfig> list = configService.selectConfigList(config);
+ return getDataTable(list);
+ }
+
+ /**
+ * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃(涓嶉獙璇佹潈闄�)
+ */
+ @GetMapping("/list/noPerm")
+ public TableDataInfo listNoPerm(SysConfig config) {
startPage();
List<SysConfig> list = configService.selectConfigList(config);
return getDataTable(list);
@@ -53,8 +61,16 @@
@PreAuthorize("@ss.hasPermi('system:config:list')")
@GetMapping("/lists")
- public AjaxResult lists(SysConfig config)
- {
+ public AjaxResult lists(SysConfig config) {
+ List<SysConfig> list = configService.selectConfigList(config);
+ return toAjaxList(list);
+ }
+
+ /**
+ * 鑾峰彇鍙傛暟閰嶇疆鍒楄〃涓嶅垎椤�(涓嶉獙璇佹潈闄�)
+ */
+ @GetMapping("/lists/noPerm")
+ public AjaxResult listsNoPerm(SysConfig config) {
List<SysConfig> list = configService.selectConfigList(config);
return toAjaxList(list);
}
@@ -62,8 +78,7 @@
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.EXPORT)
@PreAuthorize("@ss.hasPermi('system:config:export')")
@PostMapping("/export")
- public void export(HttpServletResponse response, SysConfig config)
- {
+ public void export(HttpServletResponse response, SysConfig config) {
List<SysConfig> list = configService.selectConfigList(config);
ExcelUtil<SysConfig> util = new ExcelUtil<SysConfig>(SysConfig.class);
util.exportExcel(response, list, "鍙傛暟鏁版嵁");
@@ -74,8 +89,15 @@
*/
@PreAuthorize("@ss.hasPermi('system:config:query')")
@GetMapping(value = "/{configId}")
- public AjaxResult getInfo(@PathVariable Long configId)
- {
+ public AjaxResult getInfo(@PathVariable Long configId) {
+ return success(configService.selectConfigById(configId));
+ }
+
+ /**
+ * 鏍规嵁鍙傛暟缂栧彿鑾峰彇璇︾粏淇℃伅(涓嶆牎楠屾潈闄�)
+ */
+ @GetMapping(value = "/{configId}/noPerm")
+ public AjaxResult getInfoNoPerm(@PathVariable Long configId) {
return success(configService.selectConfigById(configId));
}
@@ -84,8 +106,7 @@
*/
@ApiOperation("鏍规嵁鍙傛暟閿悕鏌ヨ鍙傛暟鍊�")
@GetMapping(value = "/configKey/{configKey}")
- public AjaxResult getConfigKey(@PathVariable String configKey)
- {
+ public AjaxResult getConfigKey(@PathVariable String configKey) {
return success(configService.selectConfigByKey(configKey));
}
@@ -95,10 +116,8 @@
@PreAuthorize("@ss.hasPermi('system:config:add')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.INSERT)
@PostMapping
- public AjaxResult add(@Validated @RequestBody SysConfig config)
- {
- if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config)))
- {
+ public AjaxResult add(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return error("鏂板鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
config.setCreateBy(getUsername());
@@ -111,10 +130,8 @@
@PreAuthorize("@ss.hasPermi('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 edit(@Validated @RequestBody SysConfig config) {
+ if (UserConstants.NOT_UNIQUE.equals(configService.checkConfigKeyUnique(config))) {
return error("淇敼鍙傛暟'" + config.getConfigName() + "'澶辫触锛屽弬鏁伴敭鍚嶅凡瀛樺湪");
}
config.setUpdateBy(getUsername());
@@ -127,8 +144,7 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.DELETE)
@DeleteMapping("/{configIds}")
- public AjaxResult remove(@PathVariable Long[] configIds)
- {
+ public AjaxResult remove(@PathVariable Long[] configIds) {
configService.deleteConfigByIds(configIds);
return success();
}
@@ -139,8 +155,7 @@
@PreAuthorize("@ss.hasPermi('system:config:remove')")
@Log(title = "鍙傛暟绠＄悊", businessType = BusinessType.CLEAN)
@DeleteMapping("/refreshCache")
- public AjaxResult refreshCache()
- {
+ public AjaxResult refreshCache() {
configService.resetConfigCache();
return success();
}
--
Gitblit v1.9.3