From 73a107068f635b410a58547e100906efaa23248c Mon Sep 17 00:00:00 2001 From: JackyTang Date: Fri, 16 Dec 2022 01:12:31 +0800 Subject: [PATCH] =?UTF-8?q?update=20=E4=BC=98=E5=8C=96=E9=87=8D=E5=A4=8D?= =?UTF-8?q?=E4=BB=A3=E7=A0=81=E5=92=8C=E4=B8=8D=E5=BF=85=E8=A6=81=E7=9A=84?= =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/SysLogininforServiceImpl.java | 59 ++++++++++--------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java index 1cd176f79..f15244744 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysLogininforServiceImpl.java @@ -14,18 +14,17 @@ import com.ruoyi.common.utils.ip.AddressUtils; import com.ruoyi.system.domain.SysLogininfor; import com.ruoyi.system.mapper.SysLogininforMapper; import com.ruoyi.system.service.ISysLogininforService; +import java.util.Arrays; +import java.util.Date; +import java.util.List; +import java.util.Map; +import javax.servlet.http.HttpServletRequest; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.context.event.EventListener; import org.springframework.scheduling.annotation.Async; import org.springframework.stereotype.Service; -import javax.servlet.http.HttpServletRequest; -import java.util.Arrays; -import java.util.Date; -import java.util.List; -import java.util.Map; - /** * 系统访问日志情况信息 服务层处理 * @@ -51,14 +50,13 @@ public class SysLogininforServiceImpl implements ISysLogininforService { final String ip = ServletUtils.getClientIP(request); String address = AddressUtils.getRealAddressByIP(ip); - StringBuilder s = new StringBuilder(); - s.append(getBlock(ip)); - s.append(address); - s.append(getBlock(logininforEvent.getUsername())); - s.append(getBlock(logininforEvent.getStatus())); - s.append(getBlock(logininforEvent.getMessage())); + String s = getBlock(ip) + + address + + getBlock(logininforEvent.getUsername()) + + getBlock(logininforEvent.getStatus()) + + getBlock(logininforEvent.getMessage()); // 打印信息到日志 - log.info(s.toString(), logininforEvent.getArgs()); + log.info(s, logininforEvent.getArgs()); // 获取客户端操作系统 String os = userAgent.getOs().getName(); // 获取客户端浏览器 @@ -85,18 +83,12 @@ public class SysLogininforServiceImpl implements ISysLogininforService { if (msg == null) { msg = ""; } - return "[" + msg.toString() + "]"; + return "[" + msg + "]"; } @Override public TableDataInfo selectPageLogininforList(SysLogininfor logininfor, PageQuery pageQuery) { - Map params = logininfor.getParams(); - LambdaQueryWrapper lqw = new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")); + LambdaQueryWrapper lqw = buildQueryWrapper(logininfor); if (StringUtils.isBlank(pageQuery.getOrderByColumn())) { pageQuery.setOrderByColumn("info_id"); pageQuery.setIsAsc("desc"); @@ -124,14 +116,9 @@ public class SysLogininforServiceImpl implements ISysLogininforService { */ @Override public List selectLogininforList(SysLogininfor logininfor) { - Map params = logininfor.getParams(); - return baseMapper.selectList(new LambdaQueryWrapper() - .like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()) - .eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()) - .like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()) - .between(params.get("beginTime") != null && params.get("endTime") != null, - SysLogininfor::getLoginTime, params.get("beginTime"), params.get("endTime")) - .orderByDesc(SysLogininfor::getInfoId)); + LambdaQueryWrapper lqw = buildQueryWrapper(logininfor); + lqw.orderByDesc(SysLogininfor::getInfoId); + return baseMapper.selectList(lqw); } /** @@ -152,4 +139,18 @@ public class SysLogininforServiceImpl implements ISysLogininforService { public void cleanLogininfor() { baseMapper.delete(new LambdaQueryWrapper<>()); } + + private static LambdaQueryWrapper buildQueryWrapper(SysLogininfor logininfor) { + Map params = logininfor.getParams(); + Object beginTime = params.get("beginTime"); + Object endTime = params.get("endTime"); + + LambdaQueryWrapper lqw = new LambdaQueryWrapper<>(); + lqw.eq(StringUtils.isNotBlank(logininfor.getStatus()), SysLogininfor::getStatus, logininfor.getStatus()); + lqw.like(StringUtils.isNotBlank(logininfor.getIpaddr()), SysLogininfor::getIpaddr, logininfor.getIpaddr()); + lqw.like(StringUtils.isNotBlank(logininfor.getUserName()), SysLogininfor::getUserName, logininfor.getUserName()); + lqw.between(beginTime != null && endTime != null, SysLogininfor::getLoginTime, beginTime, endTime); + return lqw; + } + }