From 6a1bd88ab8e937c6d8480a1f85b5f36a063fd51d Mon Sep 17 00:00:00 2001
From: hzj <826100833@qq.com>
Date: Fri, 7 Feb 2025 10:13:26 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=AE=97=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/mysql/Impl/area/RStatOrgServiceImpl.java         | 5 +++--
 .../mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java      | 2 +-
 .../mysql/Impl/line/ROperatingMonitorDServiceImpl.java       | 2 +-
 .../service/mysql/line/ROperatingMonitorService.java         | 2 +-
 4 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java
index ef7cf4aea..c8bb615ac 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatOrgServiceImpl.java
@@ -36,6 +36,7 @@ import java.time.LocalDate;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 /**
@@ -293,11 +294,11 @@ public class RStatOrgServiceImpl implements RStatOrgService {
                             between("data_date",begin,end);
                     RMpPassRateMPO rMpPassRateMPO = rMpPassRateMMapper.selectOne(rMpPassRateMPOQueryWrapper);
                     //todo 这边有点问题,每日监测点信息从公共接口获取，当日监测点应该都一样，不存在表数据不一致的情况
-//                    if (!Objects.isNull(rMpPassRateMPO)){
+                    if (!Objects.isNull(rMpPassRateMPO)){
                     rStatOrgMPO.setFreqPassRate(rMpPassRateMPO.getFreqPassRate());
                     rStatOrgMPO.setFlickerPassRate(rMpPassRateMPO.getFlickerPassRate());
                     rStatOrgMPO.setVDevPassRate(rMpPassRateMPO.getVDevPassRate());
-//                    }
+                    }
 
                     /*11、日均监测到暂态指标的监测点数*/
                     rMpEventDetailDPOQueryWrapper.clear();
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
index 844a53a9a..4cd2ffb46 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/RMpMonitorEvaluateDServiceImpl.java
@@ -104,7 +104,7 @@ public class RMpMonitorEvaluateDServiceImpl extends MppServiceImpl<RMpMonitorEva
      * @Description: 3、频率在【45，55】之间；
      * 4、相电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级/1.732
      * 5、线电压有效值在【0.85p.u.，1.2p.u.】之间；p.u=电压等级
-     * 6、电压总谐波畸变率在【0.1%，20%】之间；
+     * 6、电压总谐波畸变率在【0%，20%】之间；
      * 7、负序电压不平衡度在【0，20%】。满足以上条件则是一条有效数据
      * @Param: [fiveItems, pmsAbnormalRules, voltage]
      * @return: java.lang.Integer
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
index 6161c2e39..92417b7a6 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/line/ROperatingMonitorDServiceImpl.java
@@ -93,7 +93,7 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
                     rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf(
                             (Double.valueOf(rMpMonitorEvaluateD.getFreqCount ()+ rMpMonitorEvaluateD.getLineVoltageCount ()+
                                     rMpMonitorEvaluateD.getPhaseVoltageCount ()+ rMpMonitorEvaluateD.getUnbalanceCount ()+
-                                    rMpMonitorEvaluateD.getVThdCount ()))/(5* rMpMonitorEvaluateD.getEffectiveMinuteCount ())
+                                    rMpMonitorEvaluateD.getVThdCount ()))*statisticalInterval/(5*1440)
                     ).setScale(5, BigDecimal.ROUND_HALF_UP));
                 }
 
diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorService.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorService.java
index fbcf024a2..c03f4986b 100644
--- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorService.java
+++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/line/ROperatingMonitorService.java
@@ -20,7 +20,7 @@ public interface ROperatingMonitorService extends IMppService<ROperatingMonitorD
      * @Description: 采用以下公式计算数据完整率：
      * 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100%
      * 	采用以下公式计算数据准确率
-     * 〖数据准确率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(有效值数据个数*5)*100%
+     * 〖数据准确率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(有效值数据个数*5)*100%（有效值数据个数修改为1440/interval)
      * 	采用以下公式计算指标完整率
      * 〖指标完整率〗_日统计=(频率+相电压+线电压+畸变率+不平衡度)/(1440/interval*5)*100%	采用以下公式计算数据完整率：
      * 〖数据完整率〗_日统计=有效值数据个数/(1440/interval)*100%