From 695cb6d76b838b1e4cb161bae335faa948dca12a Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 27 十月 2021 13:16:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
index c288347..9414e5d 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.system;
+import cn.dev33.satoken.annotation.SaCheckPermission;
import com.ruoyi.common.annotation.Log;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
@@ -7,13 +8,12 @@
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.system.domain.SysNotice;
import com.ruoyi.system.service.ISysNoticeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
/**
* 鍏憡 淇℃伅鎿嶄綔澶勭悊
@@ -33,7 +33,7 @@
* 鑾峰彇閫氱煡鍏憡鍒楄〃
*/
@ApiOperation("鑾峰彇閫氱煡鍏憡鍒楄〃")
- @PreAuthorize("@ss.hasPermi('system:notice:list')")
+ @SaCheckPermission("system:notice:list")
@GetMapping("/list")
public TableDataInfo<SysNotice> list(SysNotice notice) {
return noticeService.selectPageNoticeList(notice);
@@ -43,7 +43,7 @@
* 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
*/
@ApiOperation("鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅")
- @PreAuthorize("@ss.hasPermi('system:notice:query')")
+ @SaCheckPermission("system:notice:query")
@GetMapping(value = "/{noticeId}")
public AjaxResult<SysNotice> getInfo(@PathVariable Long noticeId) {
return AjaxResult.success(noticeService.selectNoticeById(noticeId));
@@ -53,11 +53,10 @@
* 鏂板閫氱煡鍏憡
*/
@ApiOperation("鏂板閫氱煡鍏憡")
- @PreAuthorize("@ss.hasPermi('system:notice:add')")
+ @SaCheckPermission("system:notice:add")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult<Void> add(@Validated @RequestBody SysNotice notice) {
- notice.setCreateBy(getUsername());
return toAjax(noticeService.insertNotice(notice));
}
@@ -65,11 +64,10 @@
* 淇敼閫氱煡鍏憡
*/
@ApiOperation("淇敼閫氱煡鍏憡")
- @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+ @SaCheckPermission("system:notice:edit")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult<Void> edit(@Validated @RequestBody SysNotice notice) {
- notice.setUpdateBy(getUsername());
return toAjax(noticeService.updateNotice(notice));
}
@@ -77,7 +75,7 @@
* 鍒犻櫎閫氱煡鍏憡
*/
@ApiOperation("鍒犻櫎閫氱煡鍏憡")
- @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+ @SaCheckPermission("system:notice:remove")
@Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
@DeleteMapping("/{noticeIds}")
public AjaxResult<Void> remove(@PathVariable Long[] noticeIds) {
--
Gitblit v1.9.3