From f55d4da1beea2d8c6166ab8f44428524434996bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=A8=E6=9C=A8c?= <857448963@qq.com>
Date: Tue, 25 Apr 2023 14:04:34 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E5=A4=84=E7=90=86=E6=B1=A1=E5=8C=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/mysql/Impl/line/PollutionServiceImpl.java       | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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<PublicDTO> getFrequencyDeviation(List<Overlimit> overLimitList,String dataDate){
         Map<String, String> stringStringMap = processMysqlDate(dataDate, Integer.valueOf(BizParamConstant.STAT_BIZ_DAY));
         List<RStatDataVDPO> threePhaseList = dataVDService.list(new QueryWrapper<RStatDataVDPO>()
-                .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) {