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

1.前置交互日志扩展模糊查询

Browse Source 
2.解决暂态时间12小时制的问题
3.优化文件工具类
This commit is contained in:
wr
2026-06-16 09:58:24 +08:00
parent 0196277eb2
commit 770b707b84
9 changed files with 123 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
pqs-system/system-boot/src/main/java/com/njcn/system/service/impl/PqFrontLogsServiceImpl.java
View File

@@ -1,29 +1,22 @@
package com.njcn.system.service.impl;
import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.njcn.common.pojo.dto.LogInfoDTO;
import com.njcn.device.pq.pojo.vo.TerminalAlarmVO;
import com.njcn.system.mapper.PqFrontLogsMapper;
import com.njcn.system.mapper.UserLogMapper;
import com.njcn.system.pojo.dto.PqFrontLogsDTO;
import com.njcn.system.pojo.param.PqFrontLogsChildParam;
import com.njcn.system.pojo.param.PqFrontLogsParam;
import com.njcn.system.pojo.po.PqDashboardPage;
import com.njcn.system.pojo.po.PqFrontLogs;
import com.njcn.system.pojo.po.PqFrontLogsChild;
import com.njcn.system.pojo.po.UserLog;
import com.njcn.system.pojo.vo.PqFrontLogsVO;
import com.njcn.system.service.IUserLogService;
import com.njcn.system.service.PqFrontLogsChildService;
import com.njcn.system.service.PqFrontLogsService;
import com.njcn.web.factory.PageFactory;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.apache.poi.util.StringUtil;
import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service;
@@ -99,19 +92,38 @@ public class PqFrontLogsServiceImpl extends ServiceImpl<PqFrontLogsMapper, PqFro
public Page<PqFrontLogsVO> queryPage(PqFrontLogsParam baseParam) {
QueryWrapper<PqFrontLogs> queryWrapper = new QueryWrapper<>();
if (StringUtils.isNotBlank(baseParam.getSearchBeginTime()) && StringUtils.isNotBlank(baseParam.getSearchEndTime())) {
queryWrapper.between("A.update_Time", baseParam.getSearchBeginTime()+" 00:00:00", baseParam.getSearchEndTime()+" 23:59:59");
queryWrapper.between("A.update_Time", baseParam.getSearchBeginTime() + " 00:00:00", baseParam.getSearchEndTime() + " 23:59:59");
}
String searchValue = baseParam.getSearchValue();
String level;
if (StrUtil.equals(searchValue, "设备")) {
level = "terminal";
} else if (StrUtil.equals(searchValue, "监测点")) {
level = "measurepoint";
} else if (StrUtil.equals(searchValue, "进程")) {
level = "process";
} else {
level = null;
}
if(StringUtils.isNotBlank(baseParam.getSearchValue())){
queryWrapper.like("line.name", baseParam.getSearchValue());
if (StringUtils.isNotBlank(baseParam.getSearchValue())) {
queryWrapper.and(x -> {
x.like("line.name", baseParam.getSearchValue())
.or()
.like(StrUtil.isNotBlank(level),"a.level", level)
.or()
.like("sys.name", baseParam.getSearchValue());
}
);
}
queryWrapper.eq(StringUtils.isNotBlank(baseParam.getCode()),"A.code",baseParam.getCode());
queryWrapper.eq(StringUtils.isNotBlank(baseParam.getFrontType()),"A.front_type",baseParam.getFrontType()) ;
queryWrapper.eq(StringUtils.isNotBlank(baseParam.getCode()), "A.code", baseParam.getCode());
queryWrapper.eq(StringUtils.isNotBlank(baseParam.getFrontType()), "A.front_type", baseParam.getFrontType());
queryWrapper.orderByDesc("A.update_Time");
Page<PqFrontLogsVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), queryWrapper);
page.getRecords().forEach(temp->{
if(Objects.equals(temp.getLevel(),"terminal")){
Page<PqFrontLogsVO> page = this.baseMapper.page(new Page<>(PageFactory.getPageNum(baseParam), PageFactory.getPageSize(baseParam)), queryWrapper);
page.getRecords().forEach(temp -> {
if (Objects.equals(temp.getLevel(), "terminal")) {
temp.setLevel("设备");
}else if(Objects.equals(temp.getLevel(),"measurepoint")){
temp.setLevel("监测点");