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/monitor/SysOperlogController.java | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 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 40d32ce..cec09ff 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,15 +1,19 @@
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;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.poi.ExcelUtils;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.system.domain.SysOperLog;
import com.ruoyi.system.service.ISysOperLogService;
+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.*;
import javax.servlet.http.HttpServletResponse;
@@ -18,44 +22,46 @@
/**
* 鎿嶄綔鏃ュ織璁板綍
*
- * @author ruoyi
+ * @author Lion Li
*/
+@Validated
+@Api(value = "鎿嶄綔鏃ュ織璁板綍", tags = {"鎿嶄綔鏃ュ織璁板綍绠＄悊"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
@RestController
@RequestMapping("/monitor/operlog")
-public class SysOperlogController extends BaseController
-{
- @Autowired
- private ISysOperLogService operLogService;
+public class SysOperlogController extends BaseController {
- @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+ private final ISysOperLogService operLogService;
+
+ @ApiOperation("鏌ヨ鎿嶄綔鏃ュ織璁板綍鍒楄〃")
+ @SaCheckPermission("monitor:operlog:list")
@GetMapping("/list")
- public TableDataInfo list(SysOperLog operLog)
- {
+ public TableDataInfo<SysOperLog> list(SysOperLog operLog) {
return operLogService.selectPageOperLogList(operLog);
}
+ @ApiOperation("瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃")
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+ @SaCheckPermission("monitor:operlog:export")
@GetMapping("/export")
- public void export(SysOperLog operLog, HttpServletResponse response)
- {
+ public void export(SysOperLog operLog, HttpServletResponse response) {
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
- ExcelUtils.exportExcel(list, "鎿嶄綔鏃ュ織", SysOperLog.class, response);
+ ExcelUtil.exportExcel(list, "鎿嶄綔鏃ュ織", SysOperLog.class, response);
}
+ @ApiOperation("鍒犻櫎鎿嶄綔鏃ュ織璁板綍")
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}")
- public AjaxResult remove(@PathVariable Long[] operIds)
- {
+ public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
return toAjax(operLogService.deleteOperLogByIds(operIds));
}
+ @ApiOperation("娓呯┖鎿嶄綔鏃ュ織璁板綍")
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/clean")
- public AjaxResult clean()
- {
+ public AjaxResult<Void> clean() {
operLogService.cleanOperLog();
return AjaxResult.success();
}
--
Gitblit v1.9.3