1.专项分析-指标总览算法修改

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java

@@ -53,6 +53,11 @@ public class RStatHarmonicOrgM implements Serializable {
      * 数据类型,字典表（01：主网测点  02：配网测点）
      */
     private String dataType;
+
+    public void setOverLimitMeasurementAverage(Float overLimitMeasurementAverage) {
+        this.overLimitMeasurementAverage = NumberUtil.round(overLimitMeasurementAverage*100,2).floatValue();;
+    }
+
     public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) {
         this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue();
     }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java

@@ -53,6 +53,9 @@ public class RStatHarmonicOrgQ implements Serializable {
      * 数据类型,字典表（01：主网测点  02：配网测点）
      */
     private String dataType;
+    public void setOverLimitMeasurementAverage(Float overLimitMeasurementAverage) {
+        this.overLimitMeasurementAverage = NumberUtil.round(overLimitMeasurementAverage*100,2).floatValue();;
+    }
     public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) {
         this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue();
     }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java

@@ -54,6 +54,9 @@ public class RStatHarmonicOrgY implements Serializable {
      */
     private String dataType;
 
+    public void setOverLimitMeasurementAverage(Float overLimitMeasurementAverage) {
+        this.overLimitMeasurementAverage = NumberUtil.round(overLimitMeasurementAverage*100,2).floatValue();;
+    }
     public void setOverLimitMeasurementRatioAverage(Float overLimitMeasurementRatioAverage) {
         this.overLimitMeasurementRatioAverage = NumberUtil.round(overLimitMeasurementRatioAverage*100,2).floatValue();
     }

pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/WindFarmIndexOverviewPO.java

@@ -43,6 +43,6 @@ public class WindFarmIndexOverviewPO implements Serializable {
     /**
      * 平均超标天数
      */
-    private Integer avgExcessiveDays;
+    private Double avgExcessiveDays;
 
 }

pqs-harmonic/harmonic-boot/src/main/java/com/njcn/harmonic/service/specialanalysis/impl/WindFarmIndexOverviewServiceImpl.java

@@ -114,8 +114,8 @@ public class WindFarmIndexOverviewServiceImpl implements WindFarmIndexOverview {
             RStatOrgWfIndexOverviewVO vo = new RStatOrgWfIndexOverviewVO();
             vo.setMonitorNum(po.getMonitorNum());
             vo.setType(dataMap.get(po.getOrgNo()));
-            vo.setHistograms(po.getAvgExcessiveDays().toString());
+            vo.setHistograms(po.getProportionOfExcessPoints().toString());
-            vo.setLineCharts(po.getMonitorNum().toString());
+            vo.setLineCharts(po.getAvgExcessiveDays().toString());
             vo.setMonitorTag(po.getMonitorTag());
             return vo;
         }).collect(Collectors.toList());

pqs-prepare/prepare-boot/src/main/java/com/njcn/prepare/harmonic/service/mysql/Impl/SpecialAnalysisIndexOverviewServiceImpl.java

@@ -62,7 +62,6 @@ public class SpecialAnalysisIndexOverviewServiceImpl implements SpecialAnalysisI
         Date date = DateUtil.parse(jobParam.getDataDate());
 
         for (DeptGetChildrenMoreDTO deptGetChildrenMoreDTO : data1) {
-            Map<String, List<String>> lineBaseMap = new HashMap<>();
 
             List<LineDevGetDTO> lineBaseList = new ArrayList<>();
             if(CollUtil.isNotEmpty(deptGetChildrenMoreDTO.getLineBaseList())){
@@ -92,10 +91,11 @@ public class SpecialAnalysisIndexOverviewServiceImpl implements SpecialAnalysisI
 
 
                     List<String> collect1 = v.stream().map(LineDevGetDTO::getPointId).collect(Collectors.toList());
-                    List<RStatLimitRateDPO> rStatLimitRateMS = rStatLimitRateDMapper.selectList(new LambdaQueryWrapper<RStatLimitRateDPO>().
+                    List<RStatLimitRateDPO> rStatLimitRateMS = rStatLimitRateDMapper.selectList(new LambdaQueryWrapper<RStatLimitRateDPO>()
-                        in(RStatLimitRateDPO::getLineId, collect1).
+                            .eq(RStatLimitRateDPO::getPhasicType, "T")
-                        ge(StrUtil.isNotBlank(jobParam.getBeginTime()), RStatLimitRateDPO::getTime, DateUtil.beginOfDay(DateUtil.parse(jobParam.getBeginTime()))).
+                            .in(RStatLimitRateDPO::getLineId, collect1)
-                        le(StrUtil.isNotBlank(jobParam.getEndTime()), RStatLimitRateDPO::getTime, DateUtil.endOfDay(DateUtil.parse(jobParam.getEndTime()))));
+                            .ge(StrUtil.isNotBlank(jobParam.getBeginTime()), RStatLimitRateDPO::getTime, DateUtil.beginOfDay(DateUtil.parse(jobParam.getBeginTime())))
+                            .le(StrUtil.isNotBlank(jobParam.getEndTime()), RStatLimitRateDPO::getTime, DateUtil.endOfDay(DateUtil.parse(jobParam.getEndTime()))));
                   if (CollectionUtils.isEmpty(rStatLimitRateMS)){
                       //单位下没数据不补0,0,0的数据
                       return;
@@ -144,17 +144,17 @@ public class SpecialAnalysisIndexOverviewServiceImpl implements SpecialAnalysisI
                             vIndexCount.getAndIncrement();
                         }
                         collect3.forEach((day, temp) -> {
-                            if(isOverLimit(rStatLimitRateDPOList,1)){
+                            if(isOverLimit(temp,1)){
                                 iDayCount.getAndIncrement();
                             }
-                            if(isOverLimit(rStatLimitRateDPOList,2)){
+                            if(isOverLimit(temp,2)){
-                                iDayCount.getAndIncrement();
+                                vDayCount.getAndIncrement();
                             }
-                            if(isOverLimit(rStatLimitRateDPOList,3)){
+                            if(isOverLimit(temp,3)){
-                                iDayCount.getAndIncrement();
+                                iDayIndexCount.getAndIncrement();
                             }
-                            if(isOverLimit(rStatLimitRateDPOList,4)){
+                            if(isOverLimit(temp,4)){
-                                iDayCount.getAndIncrement();
+                                vDayIndexCount.getAndIncrement();
                             }
 
                         });
@@ -167,29 +167,29 @@ public class SpecialAnalysisIndexOverviewServiceImpl implements SpecialAnalysisI
                     specialAnalysisIndexOverviewPO.setVoltageIndexExceedsNum(vIndexCount.get());
 
                     specialAnalysisIndexOverviewDetailedPO.setMonitorHarmonicElectricExceedsProportion(
-                            this.divideAndKeepTwoDecimalPlaces(iCount.get(),collect2.size())
+                            this.divideAndKeepTwoDecimalPlaces(iCount.get()*100.0,rStatLimitRateMS.size())
                     );
                     specialAnalysisIndexOverviewDetailedPO.setMonitorHarmonicElectricExceedsAvgDays(
-                            this.divideAndKeepTwoDecimalPlaces(iDayCount.get(),iCount.get())
+                            this.divideAndKeepTwoDecimalPlaces(iDayCount.get()*1.0,iCount.get())
                     );
                     specialAnalysisIndexOverviewDetailedPO.setMonitorHarmonicVoltageContentExceedsProportion(
-                            this.divideAndKeepTwoDecimalPlaces(vCount.get(),collect2.size())
+                            this.divideAndKeepTwoDecimalPlaces(vCount.get()*100.0,rStatLimitRateMS.size())
                     );
                     specialAnalysisIndexOverviewDetailedPO.setMonitorHarmonicVoltageContentExceedsAvgDays(
-                            this.divideAndKeepTwoDecimalPlaces(vDayCount.get(),vCount.get())
+                            this.divideAndKeepTwoDecimalPlaces(vDayCount.get()*1.0,vCount.get())
                     );
 
                     specialAnalysisIndexOverviewDetailedPO.setElectricIndexExceedsProportion(
-                            this.divideAndKeepTwoDecimalPlaces(iIndexCount.get(),collect2.size())
+                            this.divideAndKeepTwoDecimalPlaces(iIndexCount.get()*100.0,rStatLimitRateMS.size())
                     );
                     specialAnalysisIndexOverviewDetailedPO.setElectricIndexExceedsAvgDays(
-                            this.divideAndKeepTwoDecimalPlaces(iCount.get(),iIndexCount.get())
+                            this.divideAndKeepTwoDecimalPlaces(iDayIndexCount.get()*1.0,iIndexCount.get())
                     );
                     specialAnalysisIndexOverviewDetailedPO.setVoltageIndexExceedsProportion(
-                            this.divideAndKeepTwoDecimalPlaces(iDayIndexCount.get(),collect2.size())
+                            this.divideAndKeepTwoDecimalPlaces(vDayIndexCount.get()*100.0,rStatLimitRateMS.size())
                     );
                     specialAnalysisIndexOverviewDetailedPO.setVoltageIndexExceedsAvgDays(
-                            this.divideAndKeepTwoDecimalPlaces(vDayIndexCount.get(),vIndexCount.get())
+                            this.divideAndKeepTwoDecimalPlaces(vDayIndexCount.get()*1.0,vIndexCount.get())
                     );
 
                     specialAnalysisIndexOverviewPOList.add(specialAnalysisIndexOverviewPO);
@@ -381,11 +381,11 @@ public class SpecialAnalysisIndexOverviewServiceImpl implements SpecialAnalysisI
     * @Author: clam
     * @Date: 2023/11/2
     */
-    public  double divideAndKeepTwoDecimalPlaces(int a, int b) {
+    public  double divideAndKeepTwoDecimalPlaces(double a, int b) {
         if (b == 0) {
             return 0.00;
         }
-        double result = (double) a / b;
+        double result =  a / b;
         DecimalFormat df = new DecimalFormat("#.00");
         return Double.parseDouble(df.format(result));
     }