From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang
---
ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java | 16 +++++++++++++---
1 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
index c815f3a..36ff0c6 100644
--- a/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
+++ b/ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtConfigController.java
@@ -373,14 +373,24 @@
return R.ok(page.setRecords(mgtOperLogPageVoList));
}
+ @RequestMapping(value = "/deleteOperlog", method = RequestMethod.POST)
+ @Log(title = "日志管理", businessType = BusinessType.DELETE,operContent = "清空日志")
+ @ApiOperation(value = "清空日志")
+ public R deleteOperlog() {
+ customConfigService.deleteOperlog();
+ return R.ok();
+ }
+
@RequestMapping(value = "/exportPageOperLog", method = RequestMethod.POST)
@ApiOperation(value = "导出操作日志")
- public void exportPageOperLog(@RequestBody MgtOperLogPageDto mgtOperLogPageDto, HttpServletResponse response) {
+ public void exportPageOperLog(MgtOperLogPageDto mgtOperLogPageDto, HttpServletResponse response) {
Long userId = SecurityUtils.getUserId();
mgtOperLogPageDto.setUserId(userId);
Page<MgtOperLogPageVo> page = new Page<>();
- page.setSize(2000);
- page.setCurrent(1);
+ if(page.getSize()>5000){
+ page.setSize(5000);
+ page.setCurrent(1);
+ }
List<MgtOperLogPageVo> mgtOperLogPageVoList = customConfigService.pageOperLog(page, mgtOperLogPageDto);
ExcelUtil<MgtOperLogPageVo> util = new ExcelUtil<MgtOperLogPageVo>(MgtOperLogPageVo.class);
util.exportExcel(response, mgtOperLogPageVoList, "操作日志");
--
Gitblit v1.7.1