From f31302c96e28acf7b7ed91f32f7a007f6bfe823c Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Tue, 20 Feb 2024 15:04:45 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=97=E6=B3=95=E4=BF=AE=E6=94=B9=E4=BF=9D?= =?UTF-8?q?=E7=95=99=E5=B0=8F=E6=95=B0=E4=BD=8D=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/area/RStatHarmonicServiceImpl.java | 48 +++++++++---------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java index 5344ae171..447cd11a8 100644 --- a/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java +++ b/pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/area/RStatHarmonicServiceImpl.java @@ -285,9 +285,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { between("data_date",begin,end); List rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper); double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble); Integer sum = rStatHarmonicDPOList.stream().mapToInt(RStatHarmonicDPO::getOverLimitMeasurement).sum(); rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1); @@ -360,9 +360,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { between("data_date",begin,end); List rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper); double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble); Integer sum = rStatHarmonicDPOList.stream().mapToInt(RStatHarmonicDPO::getOverLimitMeasurement).sum(); rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1); @@ -474,9 +474,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { between("data_date",begin,end); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble); @@ -557,9 +557,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { between("data_date",begin,end); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble); @@ -681,9 +681,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { between("data_date",begin,end); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble); @@ -764,9 +764,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { between("data_date",begin,end); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble); @@ -913,9 +913,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate)); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble); @@ -996,9 +996,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate)); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicYPO.setOverLimitMeasurementAverage(asDouble); @@ -1116,9 +1116,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate)); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble); @@ -1199,9 +1199,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { eq("QUARTER( data_date)", PublicUtil.getNowQuarter (dataDate)); List list = rStatHarmonicMPOService.list(harmonicMPOQueryWrapper); double asDouble = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementAverage).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = list.stream().mapToDouble(RStatHarmonicMPO::getOverLimitMeasurementRatioAverage).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); int sum1 = list.stream().mapToInt(RStatHarmonicMPO::getOverDay).sum(); rStatHarmonicQPO.setOverLimitMeasurementAverage(asDouble); @@ -1319,9 +1319,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring(0, 7)); List rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper); double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble); double sum = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).sum(); rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1); @@ -1394,9 +1394,9 @@ public class RStatHarmonicServiceImpl implements RStatHarmonicService { eq("DATE_FORMAT( data_date ,'%Y-%m')",dataDate.substring(0, 7)); List rStatHarmonicDPOList = rStatHarmonicDPOService.list(harmonicDPOQueryWrapper); double asDouble = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).average().getAsDouble(); - asDouble = BigDecimal.valueOf(asDouble).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble = BigDecimal.valueOf(asDouble).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); double asDouble1 = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurementRatio).average().getAsDouble(); - asDouble1 = BigDecimal.valueOf(asDouble1).setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue(); + asDouble1 = BigDecimal.valueOf(asDouble1).setScale(5, BigDecimal.ROUND_HALF_UP).doubleValue(); rStatHarmonicMPO.setOverLimitMeasurementAverage(asDouble); double sum = rStatHarmonicDPOList.stream().mapToDouble(RStatHarmonicDPO::getOverLimitMeasurement).sum(); rStatHarmonicMPO.setOverLimitMeasurementRatioAverage(asDouble1);