From 4e6f47d50abff5d33f622a641b4534ca3dc28b20 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期日, 22 五月 2022 14:13:53 +0800
Subject: [PATCH] update springboot 2.6.7 => 2.6.8
---
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 cec09ff..8145bc6 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
@@ -3,7 +3,8 @@
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.domain.R;
+import com.ruoyi.common.core.domain.PageQuery;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
import com.ruoyi.common.utils.poi.ExcelUtil;
@@ -12,7 +13,6 @@
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.RequiredArgsConstructor;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -26,7 +26,7 @@
*/
@Validated
@Api(value = "鎿嶄綔鏃ュ織璁板綍", tags = {"鎿嶄綔鏃ュ織璁板綍绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/operlog")
public class SysOperlogController extends BaseController {
@@ -36,14 +36,14 @@
@ApiOperation("鏌ヨ鎿嶄綔鏃ュ織璁板綍鍒楄〃")
@SaCheckPermission("monitor:operlog:list")
@GetMapping("/list")
- public TableDataInfo<SysOperLog> list(SysOperLog operLog) {
- return operLogService.selectPageOperLogList(operLog);
+ public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
+ return operLogService.selectPageOperLogList(operLog, pageQuery);
}
@ApiOperation("瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃")
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
@SaCheckPermission("monitor:operlog:export")
- @GetMapping("/export")
+ @PostMapping("/export")
public void export(SysOperLog operLog, HttpServletResponse response) {
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
ExcelUtil.exportExcel(list, "鎿嶄綔鏃ュ織", SysOperLog.class, response);
@@ -53,7 +53,7 @@
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
@SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/{operIds}")
- public AjaxResult<Void> remove(@PathVariable Long[] operIds) {
+ public R<Void> remove(@PathVariable Long[] operIds) {
return toAjax(operLogService.deleteOperLogByIds(operIds));
}
@@ -61,8 +61,8 @@
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
@SaCheckPermission("monitor:operlog:remove")
@DeleteMapping("/clean")
- public AjaxResult<Void> clean() {
+ public R<Void> clean() {
operLogService.cleanOperLog();
- return AjaxResult.success();
+ return R.ok();
}
}
--
Gitblit v1.9.3