From 8460574f108c9d11d8645cda23bf7509266e794e Mon Sep 17 00:00:00 2001 From: caozehui <2427765068@qq.com> Date: Fri, 11 Apr 2025 14:35:44 +0800 Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E5=88=86=E9=A1=B5=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../gather/system/log/pojo/param/SysLogParam.java | 4 +--- .../log/service/impl/SysLogAuditServiceImpl.java | 13 +++++-------- 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/system/src/main/java/com/njcn/gather/system/log/pojo/param/SysLogParam.java b/system/src/main/java/com/njcn/gather/system/log/pojo/param/SysLogParam.java index bd728796..2ce72a2d 100644 --- a/system/src/main/java/com/njcn/gather/system/log/pojo/param/SysLogParam.java +++ b/system/src/main/java/com/njcn/gather/system/log/pojo/param/SysLogParam.java @@ -19,10 +19,8 @@ public class SysLogParam { @Data @EqualsAndHashCode(callSuper = true) public static class QueryParam extends BaseParam { - @ApiModelProperty("日志类型") - private String operateType; @ApiModelProperty("操作用户") - private String createBy; + private String userName; } } diff --git a/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java b/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java index 0ae2af11..ec963d9e 100644 --- a/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java +++ b/system/src/main/java/com/njcn/gather/system/log/service/impl/SysLogAuditServiceImpl.java @@ -58,12 +58,10 @@ public class SysLogAuditServiceImpl extends ServiceImpl listSysLogAudit(SysLogParam.QueryParam param) { QueryWrapper queryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotNull(param)) { - queryWrapper.like(StrUtil.isNotBlank(param.getOperateType()), "sys_log_audit.Operate_Type", param.getOperateType()) - .like(StrUtil.isNotBlank(param.getCreateBy()), "sys_log_audit.Create_By", param.getCreateBy()) - .between(StrUtil.isAllNotBlank(param.getSearchBeginTime(), param.getSearchEndTime()), "sys_log_audit.Create_Time", param.getSearchBeginTime(), param.getSearchEndTime()); + queryWrapper.like(StrUtil.isNotBlank(param.getUserName()), "sys_log_audit.User_name", param.getUserName()) + .between(StrUtil.isAllNotBlank(param.getSearchBeginTime(), param.getSearchEndTime()), "sys_log_audit.Log_time", param.getSearchBeginTime(), param.getSearchEndTime()); } - queryWrapper.orderByDesc("sys_log_audit.Sort") - .orderByDesc("sys_log_audit.Create_Time"); + queryWrapper.orderByDesc("sys_log_audit.Log_time"); return this.page(new Page<>(PageFactory.getPageNum(param), PageFactory.getPageSize(param)), queryWrapper); } @@ -107,9 +105,8 @@ public class SysLogAuditServiceImpl extends ServiceImpl queryWrapper = new QueryWrapper<>(); if (ObjectUtil.isNotNull(param)) { - queryWrapper.like(StrUtil.isNotBlank(param.getOperateType()), "sys_log_audit.Operate_Type", param.getOperateType()) - .like(StrUtil.isNotBlank(param.getCreateBy()), "sys_log_audit.Create_By", param.getCreateBy()) - .between(StrUtil.isAllNotBlank(param.getSearchBeginTime(), param.getSearchEndTime()), "sys_log_audit.Create_Time", param.getSearchBeginTime(), param.getSearchEndTime()); + queryWrapper.like(StrUtil.isNotBlank(param.getUserName()), "sys_log_audit.User_name", param.getUserName()) + .between(StrUtil.isAllNotBlank(param.getSearchBeginTime(), param.getSearchEndTime()), "sys_log_audit.Log_time", param.getSearchBeginTime(), param.getSearchEndTime()); } List list = this.list(queryWrapper); Map collect = list.stream().collect(Collectors.groupingBy(SysLogAudit::getLoginName, Collectors.counting()));