From 7ac58df780e8f66a753f6332cefaebe2989680e9 Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Tue, 21 Nov 2023 18:13:09 +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

---
 .../Impl/line/ROperatingMonitorDServiceImpl.java   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

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 27cfa69e6..d05caba2b 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
@@ -150,23 +150,23 @@ public class ROperatingMonitorDServiceImpl extends MppServiceImpl<ROperatingMoni
                 rOperatingMonitorDPO.setDataDate (localDate);
                 rOperatingMonitorDPO.setIsUnusual (rStatAbnormalDPO.getValueAlarm ());
                 rOperatingMonitorDPO.setEffectiveMinuteCount (rMpMonitorEvaluateDPO.getEffectiveMinuteCount ());
-                rOperatingMonitorDPO.setDataIntegrityRate (BigDecimal.valueOf (rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()*statisticalInterval/1440));
+                rOperatingMonitorDPO.setDataIntegrityRate (BigDecimal.valueOf (Double.valueOf(rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()*statisticalInterval)/1440).setScale(2, BigDecimal.ROUND_HALF_UP));
                 if(rMpMonitorEvaluateDPO.getEffectiveMinuteCount ()==0){
                     rOperatingMonitorDPO.setDataRightRate(BigDecimal.valueOf(0.00));
                 }else{
                     rOperatingMonitorDPO.setDataRightRate (BigDecimal.valueOf(
-                            (rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
+                            (Double.valueOf(rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
                                     rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+
-                                    rMpMonitorEvaluateDPO.getVThdCount ())/(5*rMpMonitorEvaluateDPO.getEffectiveMinuteCount ())
-                    ));
+                                    rMpMonitorEvaluateDPO.getVThdCount ()))/(5*rMpMonitorEvaluateDPO.getEffectiveMinuteCount ())
+                    ).setScale(2, BigDecimal.ROUND_HALF_UP));
                 }
 
                 rOperatingMonitorDPO.setIndexIntegrityRate (
                         BigDecimal.valueOf(
-                                (rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
+                                (Double.valueOf(rMpMonitorEvaluateDPO.getFreqCount ()+ rMpMonitorEvaluateDPO.getLineVoltageCount ()+
                                         rMpMonitorEvaluateDPO.getPhaseVoltageCount ()+rMpMonitorEvaluateDPO.getUnbalanceCount ()+
-                                        rMpMonitorEvaluateDPO.getVThdCount ())*statisticalInterval/(5*1440)
-                        )
+                                        rMpMonitorEvaluateDPO.getVThdCount ())*statisticalInterval)/(5*1440)
+                        ).setScale(2, BigDecimal.ROUND_HALF_UP)
                 );
                 rOperatingMonitorDPO.setDevId (lineDTO.getDevId());
                 rOperatingMonitorDPO.setMonitorState("0");