From 14b1aaecb3cb1042663135038bc1e81208a7ef6f Mon Sep 17 00:00:00 2001
From: Administrator <1144154118@qq.com>
Date: 星期三, 26 七月 2023 09:42:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java | 18 +++++++++++-------
1 files changed, 11 insertions(+), 7 deletions(-)
diff --git a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java b/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
index 973a44d..7ca67f0 100644
--- a/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
+++ b/ard-work/src/main/java/com/ruoyi/alarm/config/controller/ArdAlarmTypeConfigController.java
@@ -31,7 +31,7 @@
* @date 2023-06-21
*/
@RestController
-@RequestMapping("/alarm/alarmConfig")
+@RequestMapping("/alarm/config")
@Api(tags = "鎶ヨ绫诲瀷閰嶇疆")
public class ArdAlarmTypeConfigController extends BaseController
{
@@ -41,7 +41,7 @@
/**
* 鏌ヨ鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈鍒楄〃
*/
- //@PreAuthorize("@ss.hasPermi('alarm:alarmConfig:list')")
+ @PreAuthorize("@ss.hasPermi('alarm:config:list')")
@GetMapping("/list")
@ApiOperation("鏌ヨ鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈鍒楄〃")
public TableDataInfo list(ArdAlarmTypeConfig ardAlarmTypeConfig)
@@ -54,7 +54,7 @@
/**
* 瀵煎嚭鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈鍒楄〃
*/
- @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:export')")
+ @PreAuthorize("@ss.hasPermi('alarm:config:export')")
@Log(title = "鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈", businessType = BusinessType.EXPORT)
@PostMapping("/export")
public void export(HttpServletResponse response, ArdAlarmTypeConfig ardAlarmTypeConfig)
@@ -67,7 +67,8 @@
/**
* 鑾峰彇鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈璇︾粏淇℃伅
*/
- @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:query')")
+ @ApiOperation("鑾峰彇鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈璇︾粏淇℃伅")
+ @PreAuthorize("@ss.hasPermi('alarm:config:query')")
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") String id)
{
@@ -87,7 +88,8 @@
/**
* 鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:add')")
+ @ApiOperation("鏂板鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈")
+ @PreAuthorize("@ss.hasPermi('alarm:config:add')")
@Log(title = "鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody ArdAlarmTypeConfig ardAlarmTypeConfig)
@@ -98,7 +100,8 @@
/**
* 淇敼鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:edit')")
+ @ApiOperation("淇敼鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈")
+ @PreAuthorize("@ss.hasPermi('alarm:config:edit')")
@Log(title = "鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody ArdAlarmTypeConfig ardAlarmTypeConfig)
@@ -109,7 +112,8 @@
/**
* 鍒犻櫎鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈
*/
- @PreAuthorize("@ss.hasPermi('alarm:alarmConfig:remove')")
+ @ApiOperation("鍒犻櫎鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈")
+ @PreAuthorize("@ss.hasPermi('alarm:config:remove')")
@Log(title = "鎶ヨ绫诲瀷鐢ㄦ埛鍏宠仈", businessType = BusinessType.DELETE)
@DeleteMapping("/{ids}")
public AjaxResult remove(@PathVariable String[] ids)
--
Gitblit v1.9.3