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-04 14:02:41 +08:00
parent 11df7ebba1
commit 2b0f149905
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java
View File

@@ -250,15 +250,6 @@ public class RStatLimitServiceImpl implements RStatLimitService {
DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()).getData(); DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()).getData();
List<String> integrityDS0 = integrityDS.stream().filter(x -> 0 == x.getIntegrityData()).map(RStatIntegrityD::getLineIndex).collect(Collectors.toList()); List<String> integrityDS0 = integrityDS.stream().filter(x -> 0 == x.getIntegrityData()).map(RStatIntegrityD::getLineIndex).collect(Collectors.toList());
//在线-离线
GridDiagramVO.RunData runData=new GridDiagramVO.RunData();
List<String> Offline = line.stream().filter(x -> !online.contains(x)).distinct().collect(Collectors.toList());
runData.setLineNumOne(online.size());
runData.setLineListOne(online);
runData.setLineNumTwo(Offline.size());
runData.setLineListTwo(Offline);
info.add(runData);
//合格-告警 //合格-告警
GridDiagramVO.RunData alarmData=new GridDiagramVO.RunData(); GridDiagramVO.RunData alarmData=new GridDiagramVO.RunData();
List<String> lineAlarm = new ArrayList<>(); List<String> lineAlarm = new ArrayList<>();
@@ -272,6 +263,15 @@ public class RStatLimitServiceImpl implements RStatLimitService {
alarmData.setLineListTwo(alarm); alarmData.setLineListTwo(alarm);
info.add(alarmData); info.add(alarmData);
//在线-离线
GridDiagramVO.RunData runData=new GridDiagramVO.RunData();
List<String> Offline = line.stream().filter(x -> !online.contains(x)).distinct().collect(Collectors.toList());
runData.setLineNumOne(online.size());
runData.setLineListOne(online);
runData.setLineNumTwo(Offline.size());
runData.setLineListTwo(Offline);
info.add(runData);
//数据完整性≥90% - <90% //数据完整性≥90% - <90%
GridDiagramVO.RunData integrityData=new GridDiagramVO.RunData(); GridDiagramVO.RunData integrityData=new GridDiagramVO.RunData();
List<String> integrityDS90 = integrityDS.stream().filter(x -> 0.9 <= x.getIntegrityData()).map(RStatIntegrityD::getLineIndex).collect(Collectors.toList()); List<String> integrityDS90 = integrityDS.stream().filter(x -> 0.9 <= x.getIntegrityData()).map(RStatIntegrityD::getLineIndex).collect(Collectors.toList());
@@ -287,9 +287,9 @@ public class RStatLimitServiceImpl implements RStatLimitService {
GridDiagramVO.RunData targetData=new GridDiagramVO.RunData(); GridDiagramVO.RunData targetData=new GridDiagramVO.RunData();
List<String> integrityS = line.stream().filter(x -> !linesTarget.contains(x)).distinct().collect(Collectors.toList()); List<String> integrityS = line.stream().filter(x -> !linesTarget.contains(x)).distinct().collect(Collectors.toList());
targetData.setLineNumOne(integrityS.size()); targetData.setLineNumOne(integrityS.size());
integrityData.setLineListOne(integrityS); targetData.setLineListOne(integrityS);
targetData.setLineNumTwo(linesTarget.size()); targetData.setLineNumTwo(linesTarget.size());
integrityData.setLineListTwo(linesTarget); targetData.setLineListTwo(linesTarget);
info.add(targetData); info.add(targetData);
return info; return info;
} }