From 10273dd2b00322897b1ae670bb014cf4ecf674f2 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Sat, 13 Dec 2025 11:09:23 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=85=A8=E6=99=AF=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E8=AF=A6=E6=83=85=E9=87=8C=EF=BC=8C=E7=9B=91?= =?UTF-8?q?=E6=B5=8B=E7=82=B9=E8=B6=85=E6=A0=87=E4=B8=BA=E5=8F=AA=E4=B8=BA?= =?UTF-8?q?=E8=B0=90=E6=B3=A2=E7=94=B5=E5=8E=8B=E8=B6=85=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../majornetwork/impl/RStatLimitServiceImpl.java | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 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 5552b2c36..459fc0c6f 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 @@ -96,12 +96,14 @@ public class RStatLimitServiceImpl implements RStatLimitService { //监测点总数量 List lineIds = list.stream().flatMap(x -> x.getLineIndexes().stream()).distinct().collect(Collectors.toList()); //超标监测点信息 - List limitTargetList = new ArrayList<>(); + List limitTargetList = new ArrayList<>(); List integrityList = new ArrayList<>(); if (CollUtil.isNotEmpty(lineIds)) { - limitTargetList = rStatLimitTargetDMapper.getSumTargetDetails(lineIds, - DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())).toString(), - DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())).toString()); + StatSubstationBizBaseParam baseParam = new StatSubstationBizBaseParam(); + baseParam.setIds(lineIds); + baseParam.setStartTime(DateUtil.beginOfDay(DateUtil.parse(deviceInfoParam.getSearchBeginTime())).toString()); + baseParam.setEndTime(DateUtil.endOfDay(DateUtil.parse(deviceInfoParam.getSearchEndTime())).toString()); + limitTargetList = targetDService.getLinesHarmTarget(baseParam); integrityList = lineIntegrityClient.getIntegrityByLineIds(lineIds, deviceInfoParam.getSearchBeginTime(), deviceInfoParam.getSearchEndTime()).getData(); } //终端在线率 @@ -576,7 +578,7 @@ public class RStatLimitServiceImpl implements RStatLimitService { } - private void onLineAndIntegrity(List lineIds, List onIntegrityByIds, List devIds, List onlineRateByDevIds, List limitTargetList, GridDiagramVO.LineData lineData) { + private void onLineAndIntegrity(List lineIds, List onIntegrityByIds, List devIds, List onlineRateByDevIds, List limitTargetList, GridDiagramVO.LineData lineData) { //监测完整率 List integrityDS = onIntegrityByIds.stream().filter(x -> lineIds.contains(x.getLineIndex())).collect(Collectors.toList()); if (CollUtil.isNotEmpty(integrityDS)) { @@ -596,9 +598,9 @@ public class RStatLimitServiceImpl implements RStatLimitService { lineData.setOnLineRate(0.0f); } //监测点超标占比 - List limitTarget = limitTargetList.stream().filter(x -> lineIds.contains(x.getLineId())).collect(Collectors.toList()); + List limitTarget = limitTargetList.stream().filter(x -> lineIds.contains(x)).collect(Collectors.toList()); if (CollUtil.isNotEmpty(limitTarget)) { - long count = limitTarget.stream().filter(o -> o.getAllOvertime() > 0 || o.getFlickerAllTime() > 0).count(); + long count = limitTarget.size(); lineData.setOutOfStandardRate(NumberUtil.round(count * 100.0 / lineIds.size(), 2).floatValue()); } else { lineData.setOutOfStandardRate(0.0f);