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

1.调整全景bug

Browse Source
This commit is contained in:
wr
2024-06-27 19:50:57 +08:00
parent 467906b686
commit f26ec7003e
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-supervision/supervision-boot/src/main/java/com/njcn/supervision/service/gridDiagram/impl/GridDiagramServiceImpl.java
View File

@@ -89,6 +89,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//在线监测问题
List<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
.in(LineWarning::getDeptId, deptIds)
.isNotNull(LineWarning::getStep)
.ge(StrUtil.isNotBlank(param.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime())))
.le(StrUtil.isNotBlank(param.getEndTime()), LineWarning::getCreateTime, DateUtil.endOfDay(DateUtil.parse(param.getEndTime())))
);
@@ -174,6 +175,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
//在线监测问题
List<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
.in(LineWarning::getDeptId, ids)
.isNotNull(LineWarning::getStep)
.ge(StrUtil.isNotBlank(baseParam.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime())))
.le(StrUtil.isNotBlank(baseParam.getEndTime()), LineWarning::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime())))
);