1.全景展示冀北运行统计bug修改
This commit is contained in:
@@ -250,15 +250,6 @@ public class RStatLimitServiceImpl implements RStatLimitService {
|
||||
DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()).getData();
|
||||
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();
|
||||
List<String> lineAlarm = new ArrayList<>();
|
||||
@@ -272,6 +263,15 @@ public class RStatLimitServiceImpl implements RStatLimitService {
|
||||
alarmData.setLineListTwo(alarm);
|
||||
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%
|
||||
GridDiagramVO.RunData integrityData=new GridDiagramVO.RunData();
|
||||
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();
|
||||
List<String> integrityS = line.stream().filter(x -> !linesTarget.contains(x)).distinct().collect(Collectors.toList());
|
||||
targetData.setLineNumOne(integrityS.size());
|
||||
integrityData.setLineListOne(integrityS);
|
||||
targetData.setLineListOne(integrityS);
|
||||
targetData.setLineNumTwo(linesTarget.size());
|
||||
integrityData.setLineListTwo(linesTarget);
|
||||
targetData.setLineListTwo(linesTarget);
|
||||
info.add(targetData);
|
||||
return info;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user