Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

修改bug2117 接口返回过慢

Browse Source
This commit is contained in:
hzj
2023-12-05 10:39:45 +08:00
parent 961e9651cc
commit 7aeb215809
1 changed files with 11 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/AuditServiceImpl.java
View File

@@ -22,6 +22,8 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.nimbusds.jose.JWSObject; import com.nimbusds.jose.JWSObject;
import com.njcn.common.config.GeneralInfo; import com.njcn.common.config.GeneralInfo;
import com.njcn.common.pojo.constant.LogInfo;
import com.njcn.common.pojo.constant.OperateType;
import com.njcn.common.pojo.constant.SecurityConstants; import com.njcn.common.pojo.constant.SecurityConstants;
import com.njcn.common.pojo.dto.UserTokenInfo; import com.njcn.common.pojo.dto.UserTokenInfo;
import com.njcn.common.pojo.exception.BusinessException; import com.njcn.common.pojo.exception.BusinessException;
@@ -83,10 +85,16 @@ public class AuditServiceImpl extends ServiceImpl<UserLogMapper, UserLog> implem
List<AuditLogVO> auditLogVOS = new ArrayList<>(); List<AuditLogVO> auditLogVOS = new ArrayList<>();
Page<UserLog> info = this.page(new Page<>(auditParam.getPageNum(), auditParam.getPageSize()), new LambdaQueryWrapper<UserLog>() Page<UserLog> info = this.page(new Page<>(auditParam.getPageNum(), auditParam.getPageSize()), new LambdaQueryWrapper<UserLog>()
.like(StrUtil.isNotBlank(auditParam.getLoginName()), UserLog::getLoginName, auditParam.getLoginName()) .and(StrUtil.isNotBlank(auditParam.getLoginName()), qw ->
.ne(UserLog::getLoginName, "unknown user") //如果Objects.equals(auditParam.getOperateType(), OperateType.AUTHENTICATE)则是用户登陆信息查询页面，loginname可模糊匹配Ip，CreateTime
qw.like(UserLog::getLoginName, auditParam.getLoginName()).or(Objects.equals(auditParam.getOperateType(), OperateType.AUTHENTICATE)).like(
UserLog::getIp, auditParam.getLoginName()
).or(Objects.equals(auditParam.getOperateType(), OperateType.AUTHENTICATE)).like(
UserLog::getCreateTime, auditParam.getLoginName()
))
.ne(UserLog::getLoginName, LogInfo.UNKNOWN_USER)
.ne(UserLog::getLoginName, "") .ne(UserLog::getLoginName, "")
.ne(UserLog::getOperate, "unknown user") .ne(UserLog::getOperate, LogInfo.UNKNOWN_OPERATE)
.eq(auditParam.getType() != null, UserLog::getType, auditParam.getType()) .eq(auditParam.getType() != null, UserLog::getType, auditParam.getType())
.eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType()) .eq(StrUtil.isNotBlank(auditParam.getOperateType()), UserLog::getOperateType, auditParam.getOperateType())
.ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime()))) .ge(StrUtil.isNotBlank(auditParam.getSearchBeginTime()), UserLog::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(auditParam.getSearchBeginTime())))