From 55124e749eacb7853142f80822fca85060de55b7 Mon Sep 17 00:00:00 2001 From: cdf <857448963@qq.com> Date: Wed, 15 May 2024 13:47:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8D=95=E4=BD=8D=E7=AE=97=E6=B3=95bug?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mysql/Impl/area/RStatHarmonicServiceImpl.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java index 2dc5f8571..6a0b29872 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java @@ -263,6 +263,11 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { List rOperatingMonitorDPOS = rOperatingMonitorDMapper.selectList(rOperatingMonitorDPOQueryWrapper); List effLineIds = rOperatingMonitorDPOS.stream().map(ROperatingMonitorDPO::getMeasurementPointId).distinct().collect(Collectors.toList()); + if(CollUtil.isEmpty(effLineIds)){ + //目前部门下面没有有效监测点，先做调过处理 + return; + } + queryWrapper.clear(); queryWrapper.select("measurement_point_id","freq_over_day", "v_dev_over_day", "v_over_day", "i_over_day", "unbalance_over_day", "i_neg_over_day"). in("measurement_point_id", effLineIds). @@ -675,7 +680,10 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { between("data_date",begin,end); List rOperatingMonitorDPOS = rOperatingMonitorDMapper.selectList(rOperatingMonitorDPOQueryWrapper); List effLineIds = rOperatingMonitorDPOS.stream().map(ROperatingMonitorDPO::getMeasurementPointId).distinct().collect(Collectors.toList()); - + if(CollUtil.isEmpty(effLineIds)){ + //目前部门下面没有有效监测点，先做调过处理 + return; + } queryWrapper.clear(); queryWrapper.select("measurement_point_id","freq_over_day", "v_dev_over_day", "v_over_day", "i_over_day", "unbalance_over_day", "i_neg_over_day"). in("measurement_point_id", effLineIds).