From 7f9012820c054667f9dc5a26f1e2c2082ed9f802 Mon Sep 17 00:00:00 2001
From: wr <1754607820@qq.com>
Date: Fri, 15 Mar 2024 10:54:26 +0800
Subject: [PATCH] =?UTF-8?q?1.=E7=AE=97=E6=B3=95=E8=B0=83=E6=95=B4=202.bug?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../PqTypicalSourceCreatePOServiceImpl.java   | 33 ++++++++++---------
 1 file changed, 17 insertions(+), 16 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
index 0b68cf5f2..765585114 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/send/impl/PqTypicalSourceCreatePOServiceImpl.java
@@ -409,6 +409,11 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
                 pqTypicalSourceCreatePO.setStatisticalType("03");
                 PqTypicalSourceCreatePO  po= this.baseMapper.selectAvgMonth(pqTypicalSourceCreatePO, begin, end);
                 if(ObjectUtil.isNotNull(po)){
+                    int ovNum = po.getInseqOvNum() + po.getFlickerOvNum() + po.getUnbanOvNum() + po.getVOvNum() + po.getIOvNum();
+                    if(po.getOvNum()>ovNum||po.getOvCount()>ovNum){
+                        pqTypicalSourceCreatePO.setOvNum(ovNum);
+                        pqTypicalSourceCreatePO.setOvCount(ovNum);
+                    }
                     po.setStatisticalType("02");
                     po.setIndexType(temp);
                     po.setStatisticalDate(date);
@@ -565,6 +570,11 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
                 pqTypicalSourceCreatePO.setStatisticalType("02");
                 PqTypicalSourceCreatePO  po= this.baseMapper.selectAvgYear(pqTypicalSourceCreatePO, begin, end);
                 if(ObjectUtil.isNotNull(po)){
+                    int ovNum = po.getInseqOvNum() + po.getFlickerOvNum() + po.getUnbanOvNum() + po.getVOvNum() + po.getIOvNum();
+                    if(po.getOvNum()>ovNum||po.getOvCount()>ovNum){
+                        pqTypicalSourceCreatePO.setOvNum(ovNum);
+                        pqTypicalSourceCreatePO.setOvCount(ovNum);
+                    }
                     po.setStatisticalType("01");
                     po.setIndexType(temp);
                     po.setStatisticalDate(date);
@@ -602,45 +612,36 @@ public class PqTypicalSourceCreatePOServiceImpl extends ServiceImpl<PqTypicalSou
         BigDecimal initialvalue = new BigDecimal(0.00);
         pqTypicalSourceCreatePO.setInterferenceSourceNum(count);
 
-        pqTypicalSourceCreatePO.setFlickerOvNum(0);
-        pqTypicalSourceCreatePO.setFlickerOvRate(initialvalue);
-        pqTypicalSourceCreatePO.setFlickerAvgOvRate(initialvalue);
-
-        pqTypicalSourceCreatePO.setIOvNum(0);
-        pqTypicalSourceCreatePO.setIOvRate(initialvalue);
-        pqTypicalSourceCreatePO.setIAvgOvRate(initialvalue);
         //负序电流
         int inseqOvNum = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsINeg()==1).count()+"");
         pqTypicalSourceCreatePO.setInseqOvNum(inseqOvNum);
         pqTypicalSourceCreatePO.setInseqOvRate(divideAndRound(inseqOvNum,count));
         pqTypicalSourceCreatePO.setInseqAvgOvRate(divideAndRound(inseqOvNum,count));
 
-        pqTypicalSourceCreatePO.setUnbanOvNum(0);
-        pqTypicalSourceCreatePO.setUnbanOvRate(initialvalue);
-        pqTypicalSourceCreatePO.setUnbanAvgOvRate(initialvalue);
-
-        pqTypicalSourceCreatePO.setVOvNum(0);
-        pqTypicalSourceCreatePO.setVOvRate(initialvalue);
-        pqTypicalSourceCreatePO.setVAvgOvRate(initialvalue);
 
+        //闪变
         int flickervalue = Integer.valueOf(rMpSurplusHarmonicDetailDS.stream().filter(temp ->temp.getIsFlicker()==1).count()+"");
         pqTypicalSourceCreatePO.setFlickerOvNum(flickervalue);
         pqTypicalSourceCreatePO.setFlickerOvRate(divideAndRound(flickervalue,count));
         pqTypicalSourceCreatePO.setFlickerAvgOvRate(divideAndRound(flickervalue,count));
 
-
+        //三相电压不平衡度
         int phase_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsUnbalance()==1).count()+"");
         pqTypicalSourceCreatePO.setUnbanOvNum(phase_voltagevalue);
         pqTypicalSourceCreatePO.setUnbanOvRate(divideAndRound(phase_voltagevalue,count));
         pqTypicalSourceCreatePO.setUnbanAvgOvRate(divideAndRound(phase_voltagevalue,count));
 
+        //谐波电压
         int harmonic_voltagevalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsV()==1).count()+"");
         pqTypicalSourceCreatePO.setVOvNum(harmonic_voltagevalue);
         pqTypicalSourceCreatePO.setVOvRate(divideAndRound(harmonic_voltagevalue,count));
         pqTypicalSourceCreatePO.setVAvgOvRate(divideAndRound(harmonic_voltagevalue,count));
 
+        //谐波电流
         int harmonic_Ivalue = Integer.valueOf(rMpPartHarmonicDetailDS.stream().filter(temp ->temp.getIsI()==1).count()+"");
-
+        pqTypicalSourceCreatePO.setIOvNum(harmonic_Ivalue);
+        pqTypicalSourceCreatePO.setIOvRate(divideAndRound(harmonic_Ivalue,count));
+        pqTypicalSourceCreatePO.setIAvgOvRate(divideAndRound(harmonic_Ivalue,count));
 
 
         pqTypicalSourceCreatePO.setFlickerOvCount(flickervalue);