From e685dbff5b3f550d78de05d8d279dd391f9b9bae Mon Sep 17 00:00:00 2001
From: chenxudong <chenxudong@cqida.cn>
Date: Wed, 26 Feb 2025 16:25:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E8=AE=B0=E5=BD=95=E5=92=8C?=
 =?UTF-8?q?=E5=AE=A1=E8=AE=A1=E6=90=9C=E7=B4=A2=E5=8A=9F=E8=83=BD=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/controller/AccessLogController.java   |  1 -
 .../manage/pojo/req/AccessLogQueryDTO.java       |  2 ++
 .../serviceimpl/UserAccessLogServiceImpl.java    | 16 ++++++++++++++++
 3 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/AccessLogController.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/AccessLogController.java
index fffbe27..95016d9 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/AccessLogController.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/AccessLogController.java
@@ -35,5 +35,4 @@ public class AccessLogController {
         return userAccessLogService.info(accessLogQueryDTO, true);
     }
 
-
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java
index 636eadf..c900fb4 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java
@@ -11,4 +11,6 @@ public class AccessLogQueryDTO {
 
     private int pageSize;
 
+    private String keyword;
+
 }
diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
index 88dbf56..a4ce647 100644
--- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
+++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
@@ -1,6 +1,7 @@
 package com.electromagnetic.industry.software.manage.service.serviceimpl;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -48,6 +49,21 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
         if (!adminQuery) {
             queryWrapper.eq(UserAccessLog::getDataId, pars.getDataId());
         }
+
+        if (StrUtil.isNotEmpty(pars.getKeyword())) {
+            queryWrapper.and(qr -> qr.like(UserAccessLog::getAction, pars.getKeyword())
+                    .or()
+                    .like(UserAccessLog::getRequestUrl, pars.getKeyword())
+                    .or()
+                    .like(UserAccessLog::getRequestIp, pars.getKeyword())
+                    .or()
+                    .like(UserAccessLog::getRemoteAddr, pars.getKeyword())
+                    .or()
+                    .like(UserAccessLog::getOperationMsg, pars.getKeyword())
+                    .or()
+                    .like(UserAccessLog::getOperationModule, pars.getKeyword()));
+        }
+
         Page<UserAccessLog> logs = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
         List<UserAccessLog> records = logs.getRecords();
         List<AccessLogQueryVO> res = BeanUtil.copyToList(records, AccessLogQueryVO.class);