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 4687454f1..6fb6da9f9 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 @@ -360,7 +360,7 @@ public class PollutionServiceImpl implements PollutionService { for (RStatDataVDPO item1 : threePhaseList) { for (Overlimit item2 : overLimitList) { if (Objects.equals(item1.getLineId(),item2.getId())){ - double vUnbalance = item1.getVUnbalance()/item2.getUaberrance(); + double vUnbalance = item1.getVThd()/item2.getUaberrance(); data = Stream.of(vUnbalance).collect(Collectors.toList()); double result = data.stream().max(Comparator.comparing(Double::doubleValue)).get(); publicDTO = new PublicDTO(); @@ -496,7 +496,7 @@ public class PollutionServiceImpl implements PollutionService { private List getFrequencyDeviation(List overLimitList,String dataDate){ Map stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY)); List threePhaseList = dataVDService.list(new QueryWrapper() - .select("line_id","abs(freq_dev)") + .select("line_id","abs(freq_dev) as freq_dev ") .in("value_type", Arrays.asList("MIN","MAX")) .in("phasic_type", Arrays.asList("T")) .ge("time", stringStringMap.get("startTime")) @@ -744,6 +744,8 @@ public class PollutionServiceImpl implements PollutionService { for (PublicDTO item : harmonicVoltageList) { if (Objects.equals(pollution.getLineId(),item.getId())){ pollution.setVAll(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue()); + pollution.setVHarmonic(BigDecimal.valueOf(item.getData()).setScale(4, RoundingMode.HALF_UP).doubleValue()); + } } for (PublicDTO item : harmonicCurrentList) {