From b5b0052aae5a8364603f53c589c87f99125d00ff Mon Sep 17 00:00:00 2001
From: stylefeng <sn93@qq.com>
Date: Wed, 10 Jul 2024 14:25:16 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.1.9=E3=80=91=E3=80=90log=E3=80=91?=
 =?UTF-8?q?=E5=AE=8C=E5=96=84=E4=B8=9A=E5=8A=A1=E6=97=A5=E5=BF=97=E7=9A=84?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=EF=BC=8C=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?http=E6=96=B9=E5=BC=8F=E3=80=81ip=E3=80=81=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E3=80=81=E6=97=B6=E9=97=B4=E6=AE=B5=E8=8C=83=E5=9B=B4=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/SysLogBusinessServiceImpl.java       | 33 +++++++++++++++++--
 1 file changed, 30 insertions(+), 3 deletions(-)

diff --git a/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessServiceImpl.java b/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessServiceImpl.java
index c8fda2d1e..b0523194d 100644
--- a/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessServiceImpl.java
+++ b/kernel-d-log/log-business/src/main/java/cn/stylefeng/roses/kernel/log/business/service/impl/SysLogBusinessServiceImpl.java
@@ -149,9 +149,36 @@ public class SysLogBusinessServiceImpl extends ServiceImpl<SysLogBusinessMapper,
     private LambdaQueryWrapper<SysLogBusiness> createWrapper(SysLogBusinessRequest sysLogBusinessRequest) {
         LambdaQueryWrapper<SysLogBusiness> queryWrapper = new LambdaQueryWrapper<>();
 
-        // 根据日志类型编码查询
+        // 1. 根据日志类型编码查询
         String logTypeCode = sysLogBusinessRequest.getLogTypeCode();
-        queryWrapper.eq(ObjectUtil.isNotEmpty(logTypeCode), SysLogBusiness::getLogTypeCode, logTypeCode);
+        if (StrUtil.isNotBlank(logTypeCode)) {
+            queryWrapper.eq(SysLogBusiness::getLogTypeCode, logTypeCode);
+        }
+
+        // 2. 根据HTTP方法查询
+        String httpMethod = sysLogBusinessRequest.getHttpMethod();
+        if (StrUtil.isNotBlank(httpMethod)) {
+            queryWrapper.eq(SysLogBusiness::getHttpMethod, httpMethod);
+        }
+
+        // 3. 根据客户端IP检索
+        String clientIp = sysLogBusinessRequest.getClientIp();
+        if (StrUtil.isNotBlank(clientIp)) {
+            queryWrapper.likeRight(SysLogBusiness::getClientIp, clientIp);
+        }
+
+        // 4. 根据操作用户检索
+        Long userId = sysLogBusinessRequest.getUserId();
+        if (ObjectUtil.isNotEmpty(userId)) {
+            queryWrapper.eq(SysLogBusiness::getUserId, userId);
+        }
+
+        // 5. 根据日志的时间段进行检索
+        String searchBeginTime = sysLogBusinessRequest.getSearchBeginTime();
+        String searchEndTime = sysLogBusinessRequest.getSearchEndTime();
+        if (StrUtil.isNotBlank(searchBeginTime) && StrUtil.isNotBlank(searchEndTime)) {
+            queryWrapper.between(SysLogBusiness::getCreateTime, searchBeginTime, searchEndTime);
+        }
 
         // 填充搜索名称和排序
         this.buildCommonWrapper(sysLogBusinessRequest, queryWrapper);
@@ -174,7 +201,7 @@ public class SysLogBusinessServiceImpl extends ServiceImpl<SysLogBusinessMapper,
             });
         }
 
-        // 根据请求参数的顺序排列
+        // 根据请求参数的顺序排列，或者根据创建时间倒序排列
         if (ObjectUtil.isNotEmpty(sysLogBusinessRequest.getOrderBy()) && ObjectUtil.isNotEmpty(sysLogBusinessRequest.getSortBy())) {
             queryWrapper.last(sysLogBusinessRequest.getOrderByLastSql());
         } else {