diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java index 89f52c940..5fdda820c 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/PollutionServiceImpl.java @@ -594,8 +594,19 @@ public class PollutionServiceImpl implements PollutionService { for (RStatDataVDPO dayV : list) { for (Overlimit overlimit : overLimitList) { if (Objects.equals(dayV.getLineId(),overlimit.getId())){ - double vlDev = Math.abs(dayV.getVlDev()/overlimit.getUvoltageDev()); - double vuDev = Math.abs(dayV.getVuDev()/overlimit.getVoltageDev()); + double vlDev; + double vuDev; + if(overlimit.getVoltageDev() == 0){ + vlDev = 0; + }else { + vlDev = Math.abs(dayV.getVlDev()/overlimit.getVoltageDev()); + } + + if(overlimit.getUvoltageDev() == 0){ + vuDev = 0; + }else { + vuDev = Math.abs(dayV.getVuDev()/overlimit.getUvoltageDev()); + } data = Stream.of(vuDev,vlDev).collect(Collectors.toList()); double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get(); publicDTO = new PublicDTO();