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

19
pqs-device/pq-device/pq-device-boot/src/main/java/com/njcn/device/pq/service/impl/GridDiagramServiceImpl.java
View File

@@ -386,11 +386,14 @@ public class GridDiagramServiceImpl implements GridDiagramService {
.filter(x -> finalI == x.getRunFlag()) .filter(x -> finalI == x.getRunFlag())
.map(Device::getId).distinct().collect(Collectors.toList()); .map(Device::getId).distinct().collect(Collectors.toList());
list.add(String.valueOf(devices.size())); list.add(String.valueOf(devices.size()));
//当终端信息是0标识需要进行在线率查询，并进行赋值
if (i == 0) { if (i == 0) {
onlineRateParam.setIds(devices); if(CollUtil.isNotEmpty(devices)) {
list.add(String.valueOf(onLineRateDMapper.getTotalOnlineRates(onlineRateParam))); onlineRateParam.setIds(devices);
} else { list.add(String.valueOf(onLineRateDMapper.getTotalOnlineRates(onlineRateParam)));
list.add(String.valueOf(3.14159)); }else {
list.add("0");
}
} }
} }
data = new GridDiagramVO.DevData(); data = new GridDiagramVO.DevData();
@@ -398,7 +401,7 @@ public class GridDiagramServiceImpl implements GridDiagramService {
data.setOrgName(dto.getName()); data.setOrgName(dto.getName());
data.setRunNum(Long.valueOf(list.get(0))); data.setRunNum(Long.valueOf(list.get(0)));
data.setOverhaulNum(Long.valueOf(list.get(2))); data.setOverhaulNum(Long.valueOf(list.get(2)));
data.setRefundNum(Long.valueOf(list.get(4))); data.setRefundNum(Long.valueOf(list.get(3)));
data.setOnLineRate(Float.valueOf(list.get(1))); data.setOnLineRate(Float.valueOf(list.get(1)));
info.add(data); info.add(data);
} }
@@ -456,7 +459,11 @@ public class GridDiagramServiceImpl implements GridDiagramService {
details.setOnLineNum(onIds.size()); details.setOnLineNum(onIds.size());
details.setOnLineNumList(onIds); details.setOnLineNumList(onIds);
baseQueryParam.setLineIds(ids); baseQueryParam.setLineIds(ids);
details.setIntegrityRate(integrityDMapper.selectTotalIntegrityByLineIds(baseQueryParam)); if(CollUtil.isNotEmpty(ids)){
details.setIntegrityRate(integrityDMapper.selectTotalIntegrityByLineIds(baseQueryParam));
}else{
details.setIntegrityRate(0.0f);
}
return details; return details;
} }

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>() List<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
.in(LineWarning::getDeptId, deptIds) .in(LineWarning::getDeptId, deptIds)
.isNotNull(LineWarning::getStep)
.ge(StrUtil.isNotBlank(param.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(param.getStartTime()))) .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()))) .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>() List<LineWarning> lineWarningList = lineWarningService.list(new LambdaQueryWrapper<LineWarning>()
.in(LineWarning::getDeptId, ids) .in(LineWarning::getDeptId, ids)
.isNotNull(LineWarning::getStep)
.ge(StrUtil.isNotBlank(baseParam.getStartTime()), LineWarning::getCreateTime, DateUtil.beginOfDay(DateUtil.parse(baseParam.getStartTime()))) .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()))) .le(StrUtil.isNotBlank(baseParam.getEndTime()), LineWarning::getCreateTime, DateUtil.endOfDay(DateUtil.parse(baseParam.getEndTime())))
); );