From 2b0f1499059fc5960c31ad04f0f1c6aa51209191 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Tue, 4 Jun 2024 14:02:41 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=85=A8=E6=99=AF=E5=B1=95=E7=A4=BA=E5=86=80?= =?UTF-8?q?=E5=8C=97=E8=BF=90=E8=A1=8C=E7=BB=9F=E8=AE=A1bug=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/RStatLimitServiceImpl.java | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java index 67b1acd94..ab5303a41 100644 --- a/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java +++ b/pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/majornetwork/impl/RStatLimitServiceImpl.java @@ -250,15 +250,6 @@ public class RStatLimitServiceImpl implements RStatLimitService { DateUtil.endOfDay(DateUtil.parse(param.getSearchEndTime())).toString()).getData(); List integrityDS0 = integrityDS.stream().filter(x -> 0 == x.getIntegrityData()).map(RStatIntegrityD::getLineIndex).collect(Collectors.toList()); - //在线-离线 - GridDiagramVO.RunData runData=new GridDiagramVO.RunData(); - List 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 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 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 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 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; }