From b082da73a1e0259738ccb33ebf7d80cad3dc3a10 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 27 九月 2021 17:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into satoken
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
index 97f9920..950a607 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java
@@ -1,5 +1,6 @@
package com.ruoyi.web.controller.monitor;
+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;
@@ -9,14 +10,14 @@
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.web.bind.annotation.*;
+import javax.servlet.http.HttpServletResponse;
import java.util.List;
/**
* 鎿嶄綔鏃ュ織璁板綍
- *
+ *
* @author ruoyi
*/
@RestController
@@ -26,7 +27,7 @@
@Autowired
private ISysOperLogService operLogService;
- @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+ @SaCheckPermission("monitor:operlog:list")
@GetMapping("/list")
public TableDataInfo list(SysOperLog operLog)
{
@@ -34,17 +35,16 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+ @SaCheckPermission("monitor:operlog:export")
@GetMapping("/export")
- public AjaxResult export(SysOperLog operLog)
+ public void export(SysOperLog operLog, HttpServletResponse response)
{
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
- ExcelUtil<SysOperLog> util = new ExcelUtil<SysOperLog>(SysOperLog.class);
- return util.exportExcel(list, "鎿嶄綔鏃ュ織");
+ ExcelUtil.exportExcel(list, "鎿嶄綔鏃ュ織", SysOperLog.class, response);
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}")
public AjaxResult remove(@PathVariable Long[] operIds)
{
@@ -52,7 +52,7 @@
}
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/clean")
public AjaxResult clean()
{
--
Gitblit v1.9.3