修改信控计算服务

realtime/generationXK-service/src/main/java/com/gyee/generation/service/EquipmentInfo4Service.java

@@ -318,17 +318,18 @@ public class EquipmentInfo4Service {
         }
 
 /**************************************************日三率统计****************************************************************/
-        //大于3米20分钟转换及时次数
-        DoubleSummaryStatistics timerate8_summary = proEconStateTransitionRatesService.list().stream()
+
+
+        List<ProEconStateTransitionRates> pestrls = proEconStateTransitionRatesService.list().stream()
                 .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getWindturbineId().equals(wt.getId())
-                ).mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                ).collect(Collectors.toList());
+        //大于3米20分钟转换及时次数
+        DoubleSummaryStatistics timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
         //大于3米20分钟转换及时次数合计
         double timerate8_sum = timerate8_summary.getSum();
 
         //大于3米状态转换总次数次数
-        DoubleSummaryStatistics timerate14_summary = proEconStateTransitionRatesService.list().stream()
-                .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getWindturbineId().equals(wt.getId())
-                ).mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+        DoubleSummaryStatistics timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
         //大于3米状态转换总次数合计
         double timerate14_sum = timerate14_summary.getSum();
 
@@ -341,16 +342,12 @@ public class EquipmentInfo4Service {
         }
 
         //20分钟复位及时次数
-        DoubleSummaryStatistics timerate19_summary = proEconStateTransitionRatesService.list().stream()
-                .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getWindturbineId().equals(wt.getId())
-                ).mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+        DoubleSummaryStatistics timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
         //20分钟复位及时次数合计
         double timerate19_sum = timerate19_summary.getSum();
 
         //总复位次数
-        DoubleSummaryStatistics timerate20_summary = proEconStateTransitionRatesService.list().stream()
-                .filter(i -> i.getRecordDate().compareTo(begin) == 0 && i.getWindturbineId().equals(wt.getId())
-                ).mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+        DoubleSummaryStatistics timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
         //总复位次数合计
         double timerate20_sum = timerate20_summary.getSum();
 
@@ -361,18 +358,16 @@ public class EquipmentInfo4Service {
         } else {
             pewp.setRfwjsl(100.0);
         }
-
-        //消缺及时次数
-        DoubleSummaryStatistics right_summary = proEconFaultLiminatedefectsService.list().stream()
+        List<ProEconFaultLiminatedefects> peflls=proEconFaultLiminatedefectsService.list().stream()
                 .filter(i -> i.getDateTime().compareTo(begin) == 0 && i.getWindturbineId().equals(wt.getId())
-                ).mapToDouble(ProEconFaultLiminatedefects::getRightCount).summaryStatistics();
+                ).collect(Collectors.toList());
+        //消缺及时次数
+        DoubleSummaryStatistics right_summary = peflls.stream().mapToDouble(ProEconFaultLiminatedefects::getRightCount).summaryStatistics();
         //消缺及时次数合计
         double right_sum = right_summary.getSum();
 
         //故障次数次数
-        DoubleSummaryStatistics fault_summary = proEconFaultLiminatedefectsService.list().stream()
-                .filter(i -> i.getDateTime().compareTo(begin) == 0 && i.getWindturbineId().equals(wt.getId())
-                ).mapToDouble(ProEconFaultLiminatedefects::getFaultCount).summaryStatistics();
+        DoubleSummaryStatistics fault_summary = peflls.stream().mapToDouble(ProEconFaultLiminatedefects::getFaultCount).summaryStatistics();
         //故障次数次数合计
         double fault_sum = fault_summary.getSum();
 
@@ -515,23 +510,21 @@ public class EquipmentInfo4Service {
                 Date monthend = end;
                 cal.set(Calendar.DAY_OF_MONTH, 1);
                 Date monthbiegin = c.getTime();
-                //大于3米20分钟转换及时次数
-                timerate8_summary = proEconStateTransitionRatesService.list().stream()
+
+
+                pestrls =proEconStateTransitionRatesService.list().stream()
                         .filter(i ->
                                 (i.getRecordDate().compareTo(monthbiegin) == 0 || i.getRecordDate().after(monthbiegin))
                                         && (i.getRecordDate().compareTo(monthend) == 0 || i.getRecordDate().before(monthend))
                                         && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                        ).collect(Collectors.toList());
+                //大于3米20分钟转换及时次数
+                timerate8_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
                 //大于3米20分钟转换及时次数合计
                 timerate8_sum = timerate8_summary.getSum();
 
                 //大于3米状态转换总次数次数
-                timerate14_summary = proEconStateTransitionRatesService.list().stream()
-                        .filter(i ->
-                                (i.getRecordDate().compareTo(monthbiegin) == 0 || i.getRecordDate().after(monthbiegin))
-                                        && (i.getRecordDate().compareTo(monthend) == 0 || i.getRecordDate().before(monthend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
                 //大于3米状态转换总次数合计
                 timerate14_sum = timerate14_summary.getSum();
 
@@ -544,22 +537,12 @@ public class EquipmentInfo4Service {
                 }
 
                 //20分钟复位及时次数
-                timerate19_summary = proEconStateTransitionRatesService.list().stream()
-                        .filter(i ->
-                                (i.getRecordDate().compareTo(monthbiegin) == 0 || i.getRecordDate().after(monthbiegin))
-                                        && (i.getRecordDate().compareTo(monthend) == 0 || i.getRecordDate().before(monthend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
                 //20分钟复位及时次数合计
                 timerate19_sum = timerate19_summary.getSum();
 
                 //总复位次数
-                timerate20_summary = proEconStateTransitionRatesService.list().stream()
-                        .filter(i ->
-                                (i.getRecordDate().compareTo(monthbiegin) == 0 || i.getRecordDate().after(monthbiegin))
-                                        && (i.getRecordDate().compareTo(monthend) == 0 || i.getRecordDate().before(monthend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
                 //总复位次数合计
                 timerate20_sum = timerate20_summary.getSum();
 
@@ -571,23 +554,19 @@ public class EquipmentInfo4Service {
                     pewp.setYfwjsl(100.0);
                 }
 
-                //消缺及时次数
-                right_summary = proEconFaultLiminatedefectsService.list().stream()
+                peflls=proEconFaultLiminatedefectsService.list().stream()
                         .filter(i ->
                                 (i.getDateTime().compareTo(monthbiegin) == 0 || i.getDateTime().after(monthbiegin))
                                         && (i.getDateTime().compareTo(monthend) == 0 || i.getDateTime().before(monthend))
                                         && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconFaultLiminatedefects::getRightCount).summaryStatistics();
+                        ).collect(Collectors.toList());
+                //消缺及时次数
+                right_summary = peflls.stream().mapToDouble(ProEconFaultLiminatedefects::getRightCount).summaryStatistics();
                 //消缺及时次数合计
                 right_sum = right_summary.getSum();
 
                 //故障次数次数
-                fault_summary = proEconFaultLiminatedefectsService.list().stream()
-                        .filter(i ->
-                                (i.getDateTime().compareTo(monthbiegin) == 0 || i.getDateTime().after(monthbiegin))
-                                        && (i.getDateTime().compareTo(monthend) == 0 || i.getDateTime().before(monthend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconFaultLiminatedefects::getFaultCount).summaryStatistics();
+                fault_summary = peflls.stream().mapToDouble(ProEconFaultLiminatedefects::getFaultCount).summaryStatistics();
                 //故障次数次数合计
                 fault_sum = fault_summary.getSum();
 
@@ -729,23 +708,20 @@ public class EquipmentInfo4Service {
                 Date yearend = end;
                 cal.set(Calendar.DAY_OF_YEAR, 1);
                 Date yearbiegin = c.getTime();
-                //大于3米20分钟转换及时次数
-                timerate8_summary = proEconStateTransitionRatesService.list().stream()
+
+                pestrls =proEconStateTransitionRatesService.list().stream()
                         .filter(i ->
                                 (i.getRecordDate().compareTo(yearbiegin) == 0 || i.getRecordDate().after(yearbiegin))
                                         && (i.getRecordDate().compareTo(yearend) == 0 || i.getRecordDate().before(yearend))
                                         && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
+                        ).collect(Collectors.toList());
+                //大于3米20分钟转换及时次数
+                timerate8_summary =pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate8).summaryStatistics();
                 //大于3米20分钟转换及时次数合计
                 timerate8_sum = timerate8_summary.getSum();
 
                 //大于3米状态转换总次数次数
-                timerate14_summary = proEconStateTransitionRatesService.list().stream()
-                        .filter(i ->
-                                (i.getRecordDate().compareTo(yearbiegin) == 0 || i.getRecordDate().after(yearbiegin))
-                                        && (i.getRecordDate().compareTo(yearend) == 0 || i.getRecordDate().before(yearend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
+                timerate14_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate14).summaryStatistics();
                 //大于3米状态转换总次数合计
                 timerate14_sum = timerate14_summary.getSum();
 
@@ -758,22 +734,12 @@ public class EquipmentInfo4Service {
                 }
 
                 //20分钟复位及时次数
-                timerate19_summary = proEconStateTransitionRatesService.list().stream()
-                        .filter(i ->
-                                (i.getRecordDate().compareTo(yearbiegin) == 0 || i.getRecordDate().after(yearbiegin))
-                                        && (i.getRecordDate().compareTo(yearend) == 0 || i.getRecordDate().before(yearend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
+                timerate19_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate19).summaryStatistics();
                 //20分钟复位及时次数合计
                 timerate19_sum = timerate19_summary.getSum();
 
                 //总复位次数
-                timerate20_summary = proEconStateTransitionRatesService.list().stream()
-                        .filter(i ->
-                                (i.getRecordDate().compareTo(yearbiegin) == 0 || i.getRecordDate().after(yearbiegin))
-                                        && (i.getRecordDate().compareTo(yearend) == 0 || i.getRecordDate().before(yearend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
+                timerate20_summary = pestrls.stream().mapToDouble(ProEconStateTransitionRates::getTimerate20).summaryStatistics();
                 //总复位次数合计
                 timerate20_sum = timerate20_summary.getSum();
 
@@ -784,24 +750,19 @@ public class EquipmentInfo4Service {
                 } else {
                     pewp.setNfwjsl(100.0);
                 }
-
-                //消缺及时次数
-                right_summary = proEconFaultLiminatedefectsService.list().stream()
+                peflls=proEconFaultLiminatedefectsService.list().stream()
                         .filter(i ->
                                 (i.getDateTime().compareTo(yearbiegin) == 0 || i.getDateTime().after(yearbiegin))
                                         && (i.getDateTime().compareTo(yearend) == 0 || i.getDateTime().before(yearend))
                                         && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconFaultLiminatedefects::getRightCount).summaryStatistics();
+                        ).collect(Collectors.toList());
+                //消缺及时次数
+                right_summary = peflls.stream().mapToDouble(ProEconFaultLiminatedefects::getRightCount).summaryStatistics();
                 //消缺及时次数合计
                 right_sum = right_summary.getSum();
 
                 //故障次数次数
-                fault_summary = proEconFaultLiminatedefectsService.list().stream()
-                        .filter(i ->
-                                (i.getDateTime().compareTo(yearbiegin) == 0 || i.getDateTime().after(yearbiegin))
-                                        && (i.getDateTime().compareTo(yearend) == 0 || i.getDateTime().before(yearend))
-                                        && i.getWindturbineId().equals(wt.getId())
-                        ).mapToDouble(ProEconFaultLiminatedefects::getFaultCount).summaryStatistics();
+                fault_summary = peflls.stream().mapToDouble(ProEconFaultLiminatedefects::getFaultCount).summaryStatistics();
                 //故障次数次数合计
                 fault_sum = fault_summary.getSum();
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo1Service.java

@@ -174,7 +174,6 @@ public class WindPowerInfo1Service {
 
         List<ProEconPowerstationInfoDay1> wpinfodayls = proEconPowerstationInfoDay1Service.list().stream()
                 .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
-//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
                         && i.getLocation().equals(Location.wp.getValue()))
                 .collect(Collectors.toList());
         if(!wpinfodayls.isEmpty())
@@ -227,7 +226,6 @@ public class WindPowerInfo1Service {
             //判断是否有重复记录，先删除重复记录
             List<String> idls = proEconPowerstationInfoDay1Service.list().stream()
                     .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
-//                            && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
                             && i.getLocation().equals(Location.cp.getValue())).map(ProEconPowerstationInfoDay1::getId)
                     .collect(Collectors.toList());
 
@@ -344,7 +342,6 @@ public class WindPowerInfo1Service {
 
 
             //日场内受累故障损失电量
-
             pewp.setRcnslgzssdl(StringUtils.round(summaryStatistics.getSum(),2));
 
             //日检修损失电量
@@ -402,7 +399,159 @@ public class WindPowerInfo1Service {
             summaryStatistics=ls.stream().mapToDouble(n -> n.getRzhd()).summaryStatistics();
             pewp.setRzhd(StringUtils.round(summaryStatistics.getSum(),2));
 
+            //月发电量
+             summaryStatistics=ls.stream().mapToDouble(n -> n.getYfdl()).summaryStatistics();
+            pewp.setYfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月可用电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYkydl()).summaryStatistics();
+            pewp.setYkydl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //月理论发电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYllfdl()).summaryStatistics();
+            pewp.setYllfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //月故障损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYgzssdl()).summaryStatistics();
+            pewp.setYgzssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //月场内受累故障损失电量
+            pewp.setYcnslgzssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月检修损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYjxssdl()).summaryStatistics();
+            pewp.setYjxssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月场内受累检修损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYcnsljxssdl()).summaryStatistics();
+            pewp.setYcnsljxssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //月待机损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYdjssdl()).summaryStatistics();
+            pewp.setYdjssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月缺陷降出力损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYqxjclssdl()).summaryStatistics();
+            pewp.setYqxjclssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月手动停机损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYsdtjssdl()).summaryStatistics();
+            pewp.setYsdtjssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月性能损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYxnssdl()).summaryStatistics();
+            pewp.setYxnssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月限电停机损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYxdtjssdl()).summaryStatistics();
+            pewp.setYxdtjssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月限电降出力损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYxdjclssdl()).summaryStatistics();
+            pewp.setYxdjclssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //月场外受累电网损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYcwsldwssdl()).summaryStatistics();
+            pewp.setYcwsldwssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //月场外受累天气损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYcwsltqssdl()).summaryStatistics();
+            pewp.setYcwsltqssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月增发电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYzfdl()).summaryStatistics();
+            pewp.setYzfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月欠发电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYqfdl()).summaryStatistics();
+            pewp.setYqfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //月自耗电
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getYzhd()).summaryStatistics();
+            pewp.setYzhd(StringUtils.round(summaryStatistics.getSum(),2));
 
+            //年发电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNfdl()).summaryStatistics();
+            pewp.setNfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年可用电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNkydl()).summaryStatistics();
+            pewp.setNkydl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //年理论发电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNllfdl()).summaryStatistics();
+            pewp.setNllfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //年故障损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNgzssdl()).summaryStatistics();
+            pewp.setNgzssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //年场内受累故障损失电量
+            pewp.setNcnslgzssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年检修损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNjxssdl()).summaryStatistics();
+            pewp.setNjxssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年场内受累检修损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNcnsljxssdl()).summaryStatistics();
+            pewp.setNcnsljxssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //年待机损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNdjssdl()).summaryStatistics();
+            pewp.setNdjssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年缺陷降出力损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNqxjclssdl()).summaryStatistics();
+            pewp.setNqxjclssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年手动停机损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNsdtjssdl()).summaryStatistics();
+            pewp.setNsdtjssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年性能损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNxnssdl()).summaryStatistics();
+            pewp.setNxnssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年限电停机损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNxdtjssdl()).summaryStatistics();
+            pewp.setNxdtjssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年限电降出力损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNxdjclssdl()).summaryStatistics();
+            pewp.setNxdjclssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //年场外受累电网损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNcwsldwssdl()).summaryStatistics();
+            pewp.setNcwsldwssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+
+            //年场外受累天气损失电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNcwsltqssdl()).summaryStatistics();
+            pewp.setNcwsltqssdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年增发电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNzfdl()).summaryStatistics();
+            pewp.setNzfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年欠发电量
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNqfdl()).summaryStatistics();
+            pewp.setNqfdl(StringUtils.round(summaryStatistics.getSum(),2));
+
+            //年自耗电
+            summaryStatistics=ls.stream().mapToDouble(n -> n.getNzhd()).summaryStatistics();
+            pewp.setNzhd(StringUtils.round(summaryStatistics.getSum(),2));
 
         }
     }
@@ -454,6 +603,8 @@ public class WindPowerInfo1Service {
                 List<ProEconPowerstationInfoDay1> pepid1ls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {
@@ -518,6 +669,8 @@ public class WindPowerInfo1Service {
                 List<ProEconPowerstationInfoDay1> pepid1ls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {
@@ -581,6 +734,8 @@ public class WindPowerInfo1Service {
                 List<ProEconPowerstationInfoDay1> pepid1ls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo2Service.java

@@ -445,6 +445,8 @@ public class WindPowerInfo2Service {
                 List<ProEconPowerstationInfoDay2> pepidls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {
@@ -511,6 +513,8 @@ public class WindPowerInfo2Service {
                 List<ProEconPowerstationInfoDay2> pepidls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {
@@ -574,6 +578,8 @@ public class WindPowerInfo2Service {
                 List<ProEconPowerstationInfoDay2> pepidls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo3Service.java

@@ -445,6 +445,8 @@ public class WindPowerInfo3Service {
                 List<ProEconPowerstationInfoDay3> pepidls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {
@@ -510,6 +512,8 @@ public class WindPowerInfo3Service {
                 List<ProEconPowerstationInfoDay3> pepidls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {
@@ -573,6 +577,8 @@ public class WindPowerInfo3Service {
                 List<ProEconPowerstationInfoDay3> pepidls =new ArrayList<>();
                 Calendar cl=Calendar.getInstance();
                 cl.setTime(recordDate);
+                //昨日的统计结果
+                cl.add(Calendar.DAY_OF_MONTH,-1);
                 if(cl.get(Calendar.DAY_OF_MONTH)!=1)
 
                 {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo5Service.java

@@ -302,6 +302,8 @@ public class WindPowerInfo5Service {
         if(!ls.isEmpty())
         {
 
+
+
             for(ProEconPowerstationInfoDay5 pepid:ls)
             {
                 //日发电量(升压站)

realtime/generationXK-service/src/main/java/com/gyee/generation/service/WindPowerInfo6Service.java

@@ -561,9 +561,7 @@ public class WindPowerInfo6Service {
             }
 
         }
-        {
 
-        }
 
 
 

realtime/generationXK-service/src/main/java/com/gyee/generation/util/statisticcs/Initial.java

@@ -2914,4 +2914,97 @@ public class Initial {
          */
         pepd.setTimerate22(0.0);
     }
+
+    public static void  initial(ProEconPowerstationInfoDay4 pepd)
+    {
+/**
+ * 日MTBF
+ */
+        pepd.setRmtbf(0.0);
+
+        /**
+         * 日MTTR
+         */
+        pepd.setRmttr(0.0);
+
+        /**
+         * 日MTTF
+         */
+        pepd.setRmttf(0.0);
+
+        /**
+         * 日复位及时率
+         */
+        pepd.setRfwjsl(0.0);
+
+        /**
+         * 日状态转换及时率
+         */
+        pepd.setRztzhjsl(0.0);
+
+        /**
+         * 日故障消缺及时率
+         */
+        pepd.setRgzxqjsl(0.0);
+
+        /**
+         * 月MTBF
+         */
+        pepd.setYmtbf(0.0);
+
+        /**
+         * 月MTTR
+         */
+        pepd.setYmttr(0.0);
+
+        /**
+         * 月MTTF
+         */
+        pepd.setYmttf(0.0);
+
+        /**
+         * 月复位及时率
+         */
+        pepd.setYfwjsl(0.0);
+
+        /**
+         * 月状态转换及时率
+         */
+        pepd.setYztzhjsl(0.0);
+
+        /**
+         * 月故障消缺及时率
+         */
+        pepd.setYgzxqjsl(0.0);
+
+        /**
+         * 年MTBF
+         */
+        pepd.setNmtbf(0.0);
+
+        /**
+         * 年MTTR
+         */
+        pepd.setNmttr(0.0);
+
+        /**
+         * 年MTTF
+         */
+        pepd.setNmttf(0.0);
+
+        /**
+         * 年复位及时率
+         */
+        pepd.setNfwjsl(0.0);
+
+        /**
+         * 年状态转换及时率
+         */
+        pepd.setNztzhjsl(0.0);
+
+        /**
+         * 年故障消缺及时率
+         */
+        pepd.setNgzxqjsl(0.0);
+    }
 }