From 56050aa6501f3d9d2f79a2c40a28815878ac56ee Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期四, 24 十一月 2022 15:14:47 +0800
Subject: [PATCH] update 同步 ruoyi 相关提交 * fix 修复Log注解GET请求记录不到参数问题 * fix 修复某些特性的环境生成代码变乱码TXT文件问题 * update 消除Vue3控制台出现的警告信息 * fix 开启TopNav没有子菜单隐藏侧边栏 * fix 修复回显数据字典数组异常问题(I60UYQ) * update 忽略不必要的属性数据返回
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/monitor/SysOperlogController.java | 41 +++++++++++++++++++++++------------------
1 files changed, 23 insertions(+), 18 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 8af5832..468b9c4 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,19 +1,16 @@
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.domain.PageQuery;
+import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
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.*;
@@ -26,44 +23,52 @@
* @author Lion Li
*/
@Validated
-@Api(value = "鎿嶄綔鏃ュ織璁板綍", tags = {"鎿嶄綔鏃ュ織璁板綍绠＄悊"})
-@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RequiredArgsConstructor
@RestController
@RequestMapping("/monitor/operlog")
public class SysOperlogController extends BaseController {
private final ISysOperLogService operLogService;
- @ApiOperation("鏌ヨ鎿嶄綔鏃ュ織璁板綍鍒楄〃")
- @PreAuthorize("@ss.hasPermi('monitor:operlog:list')")
+ /**
+ * 鑾峰彇鎿嶄綔鏃ュ織璁板綍鍒楄〃
+ */
+ @SaCheckPermission("monitor:operlog:list")
@GetMapping("/list")
public TableDataInfo<SysOperLog> list(SysOperLog operLog, PageQuery pageQuery) {
return operLogService.selectPageOperLogList(operLog, pageQuery);
}
- @ApiOperation("瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃")
+ /**
+ * 瀵煎嚭鎿嶄綔鏃ュ織璁板綍鍒楄〃
+ */
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.EXPORT)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:export')")
+ @SaCheckPermission("monitor:operlog:export")
@PostMapping("/export")
public void export(SysOperLog operLog, HttpServletResponse response) {
List<SysOperLog> list = operLogService.selectOperLogList(operLog);
ExcelUtil.exportExcel(list, "鎿嶄綔鏃ュ織", SysOperLog.class, response);
}
- @ApiOperation("鍒犻櫎鎿嶄綔鏃ュ織璁板綍")
+ /**
+ * 鎵归噺鍒犻櫎鎿嶄綔鏃ュ織璁板綍
+ * @param operIds 鏃ュ織ids
+ */
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.DELETE)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @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));
}
- @ApiOperation("娓呯┖鎿嶄綔鏃ュ織璁板綍")
+ /**
+ * 娓呯悊鎿嶄綔鏃ュ織璁板綍
+ */
@Log(title = "鎿嶄綔鏃ュ織", businessType = BusinessType.CLEAN)
- @PreAuthorize("@ss.hasPermi('monitor:operlog:remove')")
+ @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