From 39b5fdd527bed6edc662aaf0932c5f777d192cfb Mon Sep 17 00:00:00 2001 From: fengshuonan Date: Thu, 20 May 2021 14:42:22 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=907.0.4=E3=80=91=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../loginlog/mapper/SysLoginLogMapper.java | 12 ------ .../mapper/mapping/SysLoginLogMapper.xml | 14 ------ .../service/impl/SysLoginLogServiceImpl.java | 43 +++++++++++++++++-- .../db/service/impl/SysLogServiceImpl.java | 13 +++++- 4 files changed, 51 insertions(+), 31 deletions(-) diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java index 07e8f031a..603839d41 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/SysLoginLogMapper.java @@ -24,12 +24,8 @@ */ package cn.stylefeng.roses.kernel.system.modular.loginlog.mapper; -import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogDto; -import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.apache.ibatis.annotations.Param; /** * 系统应用mapper接口 @@ -39,12 +35,4 @@ import org.apache.ibatis.annotations.Param; */ public interface SysLoginLogMapper extends BaseMapper { - /** - * 分页查询登录日志 - * - * @author fengshuonan - * @date 2021/3/30 20:52 - */ - Page customFindPage(@Param("page") Page page, @Param("sysLoginLogRequest") SysLoginLogRequest sysLoginLogRequest); - } diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml index fc4f6711c..11372cf04 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/mapper/mapping/SysLoginLogMapper.xml @@ -2,18 +2,4 @@ - - diff --git a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java index 0a9ec69c0..56fc68587 100644 --- a/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java +++ b/kernel-d-log/log-business-login-log/src/main/java/cn/stylefeng/roses/kernel/system/modular/loginlog/service/impl/SysLoginLogServiceImpl.java @@ -25,6 +25,8 @@ package cn.stylefeng.roses.kernel.system.modular.loginlog.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.convert.Convert; +import cn.hutool.core.date.DateUtil; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.StrUtil; import cn.stylefeng.roses.kernel.db.api.factory.PageFactory; @@ -35,7 +37,9 @@ import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogDto; import cn.stylefeng.roses.kernel.log.api.pojo.loginlog.SysLoginLogRequest; import cn.stylefeng.roses.kernel.rule.exception.base.ServiceException; import cn.stylefeng.roses.kernel.rule.util.HttpServletUtil; +import cn.stylefeng.roses.kernel.system.api.UserServiceApi; import cn.stylefeng.roses.kernel.system.api.exception.enums.log.LogExceptionEnum; +import cn.stylefeng.roses.kernel.system.api.pojo.user.SysUserDTO; import cn.stylefeng.roses.kernel.system.modular.loginlog.constants.LoginLogConstant; import cn.stylefeng.roses.kernel.system.modular.loginlog.entity.SysLoginLog; import cn.stylefeng.roses.kernel.system.modular.loginlog.mapper.SysLoginLogMapper; @@ -45,6 +49,10 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import org.springframework.stereotype.Service; +import javax.annotation.Resource; +import java.util.ArrayList; +import java.util.Date; + /** * 系统应用service接口实现类 * @@ -54,6 +62,9 @@ import org.springframework.stereotype.Service; @Service public class SysLoginLogServiceImpl extends ServiceImpl implements SysLoginLogService, LoginLogServiceApi { + @Resource + private UserServiceApi userServiceApi; + @Override public void del(SysLoginLogRequest sysLoginLogRequest) { SysLoginLog sysLoginLog = this.querySysLoginLogById(sysLoginLogRequest); @@ -68,8 +79,23 @@ public class SysLoginLogServiceImpl extends ServiceImpl findPage(SysLoginLogRequest sysLoginLogRequest) { - Page page = baseMapper.customFindPage(PageFactory.defaultPage(), sysLoginLogRequest); - return PageResultFactory.createPageResult(page); + LambdaQueryWrapper wrapper = this.createWrapper(sysLoginLogRequest); + Page page = this.page(PageFactory.defaultPage(), wrapper); + + ArrayList sysLoginLogDtos = new ArrayList<>(); + for (SysLoginLog record : page.getRecords()) { + SysLoginLogDto sysLoginLogDto = new SysLoginLogDto(); + BeanUtil.copyProperties(record, sysLoginLogDto); + + // 填充用户姓名 + SysUserDTO userInfoByUserId = userServiceApi.getUserInfoByUserId(sysLoginLogDto.getUserId()); + if (userInfoByUserId != null) { + sysLoginLogDto.setUserName(userInfoByUserId.getRealName()); + } + sysLoginLogDtos.add(sysLoginLogDto); + } + + return PageResultFactory.createPageResult(sysLoginLogDtos, page.getTotal(), Convert.toInt(page.getSize()), Convert.toInt(page.getCurrent())); } @Override @@ -155,10 +181,19 @@ public class SysLoginLogServiceImpl extends ServiceImpl impleme String beginDateTime = logManagerRequest.getBeginDate(); String endDateTime = logManagerRequest.getEndDate(); + Date beginDate = null; + Date endDate = null; + if (StrUtil.isNotBlank(beginDateTime)) { + beginDate = DateUtil.parseDate(beginDateTime + " 00:00:00").toJdkDate(); + } + if (StrUtil.isNotBlank(endDateTime)) { + endDate = DateUtil.parseDate(endDateTime + " 23:59:59").toJdkDate(); + } + // SQL条件拼接 String name = logManagerRequest.getLogName(); String appName = logManagerRequest.getAppName(); @@ -140,7 +151,7 @@ public class SysLogServiceImpl extends ServiceImpl impleme 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.between(ObjectUtil.isAllNotEmpty(beginDate, endDate), SysLog::getCreateTime, beginDate, endDate); queryWrapper.like(StrUtil.isNotEmpty(name), SysLog::getLogContent, name); queryWrapper.like(StrUtil.isNotEmpty(appName), SysLog::getAppName, appName); queryWrapper.like(StrUtil.isNotEmpty(serverIp), SysLog::getServerIp, serverIp);