From 05b6732736c51675c0b0cdc4fdcb6fb6c1e14ddd Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Tue, 13 Apr 2021 11:14:49 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.3=E3=80=91=E6=9B=B4=E6=96=B0?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E8=AF=A6=E6=83=85=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../roses/kernel/log/api/pojo/manage/LogManagerRequest.java | 2 ++ .../roses/kernel/log/db/service/impl/SysLogServiceImpl.java | 2 ++ 2 files changed, 4 insertions(+) diff --git a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java index 252504ad2..c64fb69dc 100644 --- a/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java +++ b/kernel-d-log/log-api/src/main/java/cn/stylefeng/roses/kernel/log/api/pojo/manage/LogManagerRequest.java @@ -29,6 +29,7 @@ import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; /** * 日志管理的查询参数 @@ -43,6 +44,7 @@ public class LogManagerRequest extends BaseRequest { /** * 单条日志id */ + @NotNull(message = "日志id不能为空", groups = {detail.class}) private Long logId; /** diff --git a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java index e2c3637a9..c15876a7e 100644 --- a/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java +++ b/kernel-d-log/log-sdk-db/src/main/java/cn/stylefeng/roses/kernel/log/db/service/impl/SysLogServiceImpl.java @@ -137,7 +137,9 @@ public class SysLogServiceImpl extends ServiceImpl impleme Long userId = logManagerRequest.getUserId(); String clientIp = logManagerRequest.getClientIp(); String url = logManagerRequest.getRequestUrl(); + Long logId = logManagerRequest.getLogId(); + queryWrapper.eq(ObjectUtil.isNotEmpty(logId), SysLog::getLogId, logId); queryWrapper.between(StrUtil.isAllNotBlank(beginDateTime, endDateTime), SysLog::getCreateTime, beginDateTime + " 00:00:00", endDateTime + " 23:59:59"); queryWrapper.like(StrUtil.isNotEmpty(name), SysLog::getLogContent, name); queryWrapper.like(StrUtil.isNotEmpty(appName), SysLog::getAppName, appName);