chenxudong
/
electromagnetic-data-new
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改审计的问题。

This commit is contained in:
chenxudong 2025-09-24 10:47:44 +08:00
parent 9bd93c68bc
commit 5cc05e1820
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/UserAccessLogServiceImpl.java
View File

@ -27,10 +27,7 @@ import com.electromagnetic.industry.software.manage.service.UserAccessLogService
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.*;
import java.util.Date;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors; import java.util.stream.Collectors;
@Service @Service
@ -75,14 +72,22 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
} }
if (StrUtil.isNotEmpty(pars.getKeyWord())) { if (StrUtil.isNotEmpty(pars.getKeyWord())) {
Set<String> operationObjSet = new HashSet<>();
Set<String> userIdSet = userMapper.selectList(Wrappers.<User>lambdaQuery().select(User::getId).like(User::getUserName, pars.getKeyWord())).stream().map(User::getId).collect(Collectors.toSet());
for (UserOperationModuleEnum e : UserOperationModuleEnum.values()) {
if (e.desc.contains(pars.getKeyWord())){
operationObjSet.add(e.key);
}
}
queryWrapper.and(qr -> qr.like(UserAccessLog::getAction, pars.getKeyWord()) queryWrapper.and(qr -> qr.like(UserAccessLog::getAction, pars.getKeyWord())
// .or() .or()
// .like(UserAccessLog::getRequestUrl, pars.getKeyWord()) .in(CollUtil.isNotEmpty(operationObjSet), UserAccessLog::getOperationModule, operationObjSet)
.or()
.in(CollUtil.isNotEmpty(userIdSet), UserAccessLog::getUserId, userIdSet)
.or() .or()
.like(UserAccessLog::getRequestIp, pars.getKeyWord()) .like(UserAccessLog::getRequestIp, pars.getKeyWord())
.or() .or()
.like(UserAccessLog::getRemoteAddr, pars.getKeyWord())
.or()
.like(UserAccessLog::getOperationMsg, pars.getKeyWord())); .like(UserAccessLog::getOperationMsg, pars.getKeyWord()));
} }