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

优化日志查询

This commit is contained in:
chenxudong 2025-03-25 14:25:40 +08:00
parent 21ee580fc7
commit 038747d236
4 changed files with 28 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/controller/AccessLogController.java
View File

@ -35,4 +35,10 @@ public class AccessLogController {
return userAccessLogService.info(accessLogQueryDTO, true);
}
@UserOperation(value = "查询所有操作对象", modelName = UserOperationModuleEnum.LOG)
@RequestMapping("operation/module")
public ElectromagneticResult<?> operationModule() {
return userAccessLogService.operationModule();
}
}

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/req/AccessLogQueryDTO.java
View File

@ -13,4 +13,5 @@ public class AccessLogQueryDTO {
private String keyWord;
private String operationModuleKey;
}

1
electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/UserAccessLogService.java
View File

@ -13,4 +13,5 @@ public interface UserAccessLogService {
*/
ElectromagneticResult<?> info(AccessLogQueryDTO accessLogQueryDTO, boolean adminQuery);
ElectromagneticResult<?> operationModule();
}

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

@ -19,11 +19,14 @@ import com.electromagnetic.industry.software.manage.pojo.req.AccessLogQueryDTO;
import com.electromagnetic.industry.software.manage.pojo.resp.AccessLogQueryVO;
import com.electromagnetic.industry.software.manage.pojo.resp.RespPageVO;
import com.electromagnetic.industry.software.manage.service.UserAccessLogService;
import com.google.common.collect.Maps;
import org.springframework.stereotype.Service;
import javax.annotation.Resource;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.stream.Collectors;
@Service
@ -49,6 +52,10 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
queryWrapper.ne(UserAccessLog::getOperationModule, UserOperationModuleEnum.TMP.key);
}
if (StrUtil.isNotEmpty(pars.getOperationModuleKey())) {
queryWrapper.eq(UserAccessLog::getOperationModule, pars.getOperationModuleKey());
}
if (StrUtil.isNotEmpty(pars.getKeyWord())) {
queryWrapper.and(qr -> qr.like(UserAccessLog::getAction, pars.getKeyWord())
.or()
@ -58,9 +65,7 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
.or()
.like(UserAccessLog::getRemoteAddr, pars.getKeyWord())
.or()
.like(UserAccessLog::getOperationMsg, pars.getKeyWord())
.or()
.like(UserAccessLog::getOperationModule, pars.getKeyWord()));
.like(UserAccessLog::getOperationMsg, pars.getKeyWord()));
}
Page<UserAccessLog> logs = this.baseMapper.selectPage(new Page<>(pars.getPageNum(), pars.getPageSize()), queryWrapper);
@ -71,6 +76,18 @@ public class UserAccessLogServiceImpl extends ServiceImpl<UserAccessLogMapper, U
return ElectromagneticResultUtil.success(new RespPageVO<>(logs.getTotal(), res));
}
@Override
public ElectromagneticResult<?> operationModule() {
Map<String, String> map = new HashMap<>();
for (UserOperationModuleEnum e : UserOperationModuleEnum.values()) {
map.put(e.key, e.desc);
}
return ElectromagneticResultUtil.success(map);
}
private void setOtherInfo(List<AccessLogQueryVO> res) {
List<String> userIds = res.stream().map(AccessLogQueryVO::getUserId).collect(Collectors.toList());