算法修改

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

@@ -15,64 +15,84 @@ import org.springframework.boot.autoconfigure.SpringBootApplication;
 public class GenerationMain {
     public static void main(String[] args) throws Exception {
         SpringApplication.run(GenerationMain.class, args);
-
+//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+//
+//        AccessStatusService accessStatusService = SpringUtils.getBean("accessStatusService");
+//        accessStatusService.accessStatus();
+//        //全场状态
+//        accessStatusService.fullFieldState();
+//
 //
 //        Calendar c = Calendar.getInstance();
 //        Date begin = null;
 //        Date end = null;
-//        c.set(Calendar.MONTH, 7);
-//        c.set(Calendar.DAY_OF_MONTH, 1);
-//
-//
-//        c.setTime(DateUtils.truncate(c.getTime()));
-//
-//
-//
+//////        c.setTime(DateUtils.truncate(c.getTime()));
+//////        c.set(Calendar.DAY_OF_MONTH, 1);
+//////        c.set(Calendar.HOUR_OF_DAY, 23);
+//////        c.set(Calendar.MINUTE, 59);
+//////        c.set(Calendar.SECOND, 59);
+////
+////
+////
+////
 //        begin = new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 30; i++) {
-//
-//
-//            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
-//
-//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
-//            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
-//            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
-//            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
-//            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
-//            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
-//            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
-//
-//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-//
-//
-//
-//            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
-//            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
-//            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
-//            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
+//        for (int i = 0; i < 1; i++) {
+////            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
+////            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+////            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+////            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+////            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
+////            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
+////            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
+////            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
+////            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
+////            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
+////            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
+////            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
 ////            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
-//            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
-//
-//            windPowerInfo1Service.calLineInfoDay(c.getTime());
-//            windPowerInfo1Service.calProjectInfoDay(c.getTime());
-//            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
-//            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
-//            windPowerInfo1Service.calRegionInfoDay(c.getTime());
-//
-//
-//
+////            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
+////
+//////            CycleCalculationRebuildService cycleCalculationRebuildService = SpringUtils.getBean("cycleCalculationRebuildService");
+//////
+//////            cycleCalculationRebuildService.saveCyle(c.getTime());
+//////
+//            CycleCalculationService cycleCalculationService = SpringUtils.getBean("cycleCalculationService");
+//
+//            cycleCalculationService.saveCyle();
+//////            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+//////            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+//////            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+//////
+//////            windPowerInfo1Service.calLineInfoDay(c.getTime());
+//////            windPowerInfo1Service.calProjectInfoDay(c.getTime());
+//////            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
+//////            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
+//////            windPowerInfo1Service.calRegionInfoDay(c.getTime());
+//////
+//////            windPowerInfo2Service.calLineInfoDay(c.getTime());
+//////            windPowerInfo2Service.calProjectInfoDay(c.getTime());
+//////            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
+//////            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
+//////            windPowerInfo2Service.calRegionInfoDay(c.getTime());
+//////
+//////
+//////            windPowerInfo3Service.calLineInfoDay(c.getTime());
+//////            windPowerInfo3Service.calProjectInfoDay(c.getTime());
+//////            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
+//////            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
+//////            windPowerInfo3Service.calRegionInfoDay(c.getTime());
+////
 //
 //            c.add(Calendar.DAY_OF_MONTH, 1);
 //            System.out.println(end);
 //            System.out.println("完成一次!。。。。。。");
 //        }
 //        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        end = new Date();
+//        System.out.println("执行用时" + DateUtils.secondsDiff(begin, end) + "秒");
 //        System.out.println(end);
-//
-//
+
 
         System.out.println("完成");
     }

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

@@ -7,7 +7,6 @@
 //import org.springframework.context.EnvironmentAware;
 //import org.springframework.context.annotation.Bean;
 //import org.springframework.context.annotation.Configuration;
-//import org.springframework.context.annotation.PropertySource;
 //import org.springframework.core.env.Environment;
 //
 ///**
@@ -30,7 +29,7 @@
 ////@PropertySource("classpath:xxl-job-accuracy.properties")
 ////@PropertySource("classpath:xxl-job-7001.properties")
 ////@PropertySource("classpath:xxl-job-7002.properties")
-//@PropertySource("classpath:xxl-job-7003.properties")
+////@PropertySource("classpath:xxl-job-7003.properties")
 ////@PropertySource("classpath:xxl-job-executorGF000.properties")
 ////@PropertySource("classpath:xxl-job-executorGF001.properties")
 ////@PropertySource("classpath:xxl-job-executorGF002.properties")

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

@@ -53,27 +53,29 @@ public class EquipmentInfo1Service {
 
         Map<String,ProEconEquipmentInfoDay1> pep1map=new HashMap<>();
         Calendar cl=Calendar.getInstance();
-        cl.setTime(recordDate);
-        if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+        cl.setTime(DateUtils.truncate(recordDate));
+        cl.add(Calendar.DAY_OF_MONTH,-1);
+
+        QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper2 = new QueryWrapper<>();
+        queryWrapper2.eq("record_date",cl.getTime());
+        List<ProEconEquipmentInfoDay1> pep1ls = proEconEquipmentInfoDay1Service.list(queryWrapper2);
+        if(!pep1ls.isEmpty())
         {
-            QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper2 = new QueryWrapper<>();
-            queryWrapper2.eq("record_date",cl.getTime());
-            List<ProEconEquipmentInfoDay1> pep1ls = proEconEquipmentInfoDay1Service.list(queryWrapper2);
-            if(!pep1ls.isEmpty())
+            for(ProEconEquipmentInfoDay1 pep:pep1ls)
             {
-                for(ProEconEquipmentInfoDay1 pep:pep1ls)
-                {
-                    pep1map.put(pep.getWindturbineId(),pep);
-                }
+                pep1map.put(pep.getWindturbineId(),pep);
             }
-
         }
-
         List<ProEconEquipmentInfoDay1> dayls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
+        final CountDownLatch latch = new CountDownLatch(CacheContext.wtls.size());
+
+        List<String> wpls=new ArrayList<>();
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
-
+            if(!wpls.contains(wt.getWindpowerstationId()))
+            {
+                wpls.add(wt.getWindpowerstationId());
+            }
             new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
                     recordDate,  end,  begin,dayls,
                     edosUtil,latch)).start();
@@ -93,6 +95,8 @@ public class EquipmentInfo1Service {
 
         QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",recordDate);
+        queryWrapper.in("windpowerstation_id",wpls);
+
         //判断是否有重复记录，先删除重复记录
         List<String> idls = proEconEquipmentInfoDay1Service.list(queryWrapper).stream()
                 .map(ProEconEquipmentInfoDay1::getId)

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

@@ -87,50 +87,16 @@ public class EquipmentInfo2Service {
             }
 
         }
+
+        List<String> wpls=new ArrayList<>();
         List<ProEconEquipmentInfoDay2> dayls=new ArrayList<>();
         final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
-//            if(CacheContext.wtpAimap.containsKey(wt.getId()))
-//            {
-//
-//                ProEconEquipmentInfoDay2 pewp=new ProEconEquipmentInfoDay2();
-//                Initial.initial(pewp);
-//                pewp.setCompanyId(wt.getCompanyId());
-//                pewp.setWindpowerstationId(wt.getWindpowerstationId());
-//                pewp.setLineId(wt.getLineId());
-//                pewp.setProjectId(wt.getProjectId());
-//                pewp.setRegionId(wt.getRegionId());
-//                pewp.setRecordDate(DateUtils.truncate(recordDate));
-//                pewp.setWindturbineId(wt.getId());
-//                //昨日的统计结果
-//                List<ProEconEquipmentInfoDay2> 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)
-////                {
-////                    QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper2 = new QueryWrapper<>();
-////                    queryWrapper2.eq("record_date",cl.getTime())
-////                            .eq("windturbine_Id",wt.getId());
-////                    pepidls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
-//////                            .stream()
-//////                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//////                                    && i.getWindturbineId().equals(wt.getId())
-//////                            )
-//////                            .collect(Collectors.toList());
-////                }
-//
-//                if(pep2map.containsKey(wt.getId()))
-//                {
-//                    pepidls.add(pep2map.get(wt.getId()));
-//                }
-//                calDetiall( pewp, end, begin, wt,pepidls);
-//                calSimple( pewp, end, begin, wt,pepidls);
-//                dayls.add(pewp);
-//                // proEconEquipmentInfoDay2Service.save(pewp);
-//
-//            }
+            if(!wpls.contains(wt.getWindpowerstationId()))
+            {
+                wpls.add(wt.getWindpowerstationId());
+            }
 
 
             new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
@@ -148,6 +114,7 @@ public class EquipmentInfo2Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",recordDate);
+        queryWrapper.in("windpowerstation_id",wpls);
         List<String> idls = proEconEquipmentInfoDay2Service.list(queryWrapper).stream().map(ProEconEquipmentInfoDay2::getId)
                 .collect(Collectors.toList());
 

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

@@ -94,54 +94,17 @@ public class EquipmentInfo3Service {
             }
 
         }
+
+        List<String> wpls=new ArrayList<>();
             List<ProEconEquipmentInfoDay3> dayls=new ArrayList<>();
         final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
-//            if(CacheContext.wtpAimap.containsKey(wt.getId()))
-//            {
-//
-//
-//                ProEconEquipmentInfoDay3 pewp=new ProEconEquipmentInfoDay3();
-//                Initial.initial(pewp);
-//                pewp.setCompanyId(wt.getCompanyId());
-//                pewp.setWindpowerstationId(wt.getWindpowerstationId());
-//                pewp.setLineId(wt.getLineId());
-//                pewp.setProjectId(wt.getProjectId());
-//                pewp.setRegionId(wt.getRegionId());
-//                pewp.setRecordDate(DateUtils.truncate(recordDate));
-//                pewp.setWindturbineId(wt.getId());
-//                //昨日的统计结果
-//                List<ProEconEquipmentInfoDay3> 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)
-////
-////                {
-////                    QueryWrapper<ProEconEquipmentInfoDay3> queryWrapper2 = new QueryWrapper<>();
-////                    queryWrapper2.eq("record_date",cl.getTime())
-////                            .eq("windturbine_Id",wt.getId());
-////                    pepidls = proEconEquipmentInfoDay3Service.list(queryWrapper2);
-//////                            .stream()
-//////                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//////                                    && i.getWindturbineId().equals(wt.getId())
-//////                                  )
-//////                            .collect(Collectors.toList());
-////                }
-//
-//                if(pep3map.containsKey(wt.getId()))
-//                {
-//                    pepidls.add(pep3map.get(wt.getId()));
-//                }
-//                calDetiall( pewp, end, begin,wt,pepidls);
-//                calSimple( pewp, end, begin, wt,pepidls);
-//                dayls.add(pewp);
-//                // proEconEquipmentInfoDay3Service.save(pewp);
-//
-//
-//            }
 
+            if(!wpls.contains(wt.getWindpowerstationId()))
+            {
+                wpls.add(wt.getWindpowerstationId());
+            }
 
             new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
                     recordDate,  end,  begin,dayls,
@@ -156,6 +119,7 @@ public class EquipmentInfo3Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconEquipmentInfoDay3> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",recordDate);
+        queryWrapper.in("windpowerstation_id",wpls);
         List<String> idls = proEconEquipmentInfoDay3Service.list(queryWrapper).stream()
                 .map(ProEconEquipmentInfoDay3::getId)
                 .collect(Collectors.toList());

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

@@ -191,6 +191,8 @@ public class EquipmentInfo4Service {
 //        //拟合优度接口调用
 //        Map<String, Map<String, Double>> nhydMap = goodnessOfFitService.goodnessOfFit(begin);
         List<ProEconEquipmentInfoDay4> dayls=new ArrayList<>();
+
+        List<String> wpls=new ArrayList<>();
         final CountDownLatch latch = new CountDownLatch(CacheContext.wt_fjls.size());
         for (ProBasicEquipment wt : CacheContext.wt_fjls) {
 //            if (CacheContext.wtpAimap.containsKey(wt.getId())) {
@@ -273,7 +275,10 @@ public class EquipmentInfo4Service {
 //                // proEconEquipmentInfoDay1Service.save(pewp);
 //
 //            }
-
+            if(!wpls.contains(wt.getWindpowerstationId()))
+            {
+                wpls.add(wt.getWindpowerstationId());
+            }
 
             new Thread(new EquipmentInfo4Thread(executor,wt, pep2map,
                     pep3map,
@@ -304,6 +309,7 @@ public class EquipmentInfo4Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconEquipmentInfoDay4> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",begin);
+        queryWrapper.in("windpowerstation_id",wpls);
         List<String> idls = proEconEquipmentInfoDay4Service.list(queryWrapper).stream()
                 .map(ProEconEquipmentInfoDay4::getId)
                 .collect(Collectors.toList());

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

@@ -55,7 +55,7 @@ public class EquipmentInfo5Service {
 
 
         Map<String, ProEconEquipmentInfoDay5> rates = new HashMap<>();
-
+        List<String> wpls=new ArrayList<>();
         for (ProBasicEquipment wt : CacheContext.wtls) {
 
             if(wt.getWindpowerstationId().contains("GDC"))
@@ -72,6 +72,11 @@ public class EquipmentInfo5Service {
             rate.setRegionId(wt.getRegionId());
             Initial.initial(rate);
             rates.put(wt.getId(), rate);
+
+            if(!wpls.contains(wt.getWindpowerstationId()))
+            {
+                wpls.add(wt.getWindpowerstationId());
+            }
         }
 
         for (ProEconShutdownEvent2 item : shutdownevents) {
@@ -201,6 +206,7 @@ public class EquipmentInfo5Service {
 
         QueryWrapper<ProEconEquipmentInfoDay5> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.ge("record_date",currentDate);
+        queryWrapper2.in("windpowerstation_id",wpls);
 
         List<String> dayInfoids = proEconEquipmentInfoDay5Service.list(queryWrapper2)
                 .stream()

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

@@ -561,8 +561,6 @@ public class WindPowerInfo1Service {
         Date begin = DateUtils.truncate(c.getTime());
 
 
-
-
         Map<String,List<ProEconEquipmentInfoDay1>> pep1map=new HashMap<>();
         QueryWrapper<ProEconEquipmentInfoDay1> queryWrapper2 = new QueryWrapper<>();
         queryWrapper2.eq("record_date",DateUtils.truncate(recordDate));
@@ -584,6 +582,7 @@ public class WindPowerInfo1Service {
 
             }
         }
+        List<String> wpls=new ArrayList<>();
         List<ProEconPowerstationInfoDay1> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -612,7 +611,7 @@ public class WindPowerInfo1Service {
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay1Service.save(pewp);
 
-
+                wpls.add(wp.getId());
             }
 
 
@@ -622,6 +621,7 @@ public class WindPowerInfo1Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+        .in("windpowerstation_id",wpls)
                 .eq("location",Location.wp.getValue());
         List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
@@ -688,6 +688,8 @@ public class WindPowerInfo1Service {
 
             }
         }
+
+        List<String > pjls=new ArrayList<>();
         List<ProEconPowerstationInfoDay1> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
@@ -720,7 +722,7 @@ public class WindPowerInfo1Service {
 
                 dayls.add(pewp);
                // proEconPowerstationInfoDay1Service.save(pewp);
-
+                pjls.add(pj.getWindpowerstationId());
             }
 
 
@@ -730,6 +732,7 @@ public class WindPowerInfo1Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",pjls)
                 .eq("location",Location.pj.getValue());
         List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
@@ -795,6 +798,8 @@ public class WindPowerInfo1Service {
 
             }
         }
+
+        List<String > lnls=new ArrayList<>();
         List<ProEconPowerstationInfoDay1> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
@@ -832,6 +837,10 @@ public class WindPowerInfo1Service {
 
                 dayls.add(pewp);
 //                proEconPowerstationInfoDay1Service.save(pewp);
+                if(CacheContext.pjmap.containsKey(ln.getProjectId()))
+                {
+                    lnls.add(CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId());
+                }
 
             }
 
@@ -842,6 +851,7 @@ public class WindPowerInfo1Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",lnls)
                 .eq("location",Location.ln.getValue());
         List<String> idls = proEconPowerstationInfoDay1Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
@@ -897,7 +907,7 @@ public class WindPowerInfo1Service {
                     pewp.setRpjfs(summaryStatistics.getAverage());
                 }else
                 {
-                    pewp.setRpjfs(summaryStatistics.getSum());
+                    pewp.setRpjfs(pep1ls.get(0).getRpjfs());
                 }
 
 
@@ -1012,7 +1022,8 @@ public class WindPowerInfo1Service {
                 }else
                 {
                     //月平均风速
-                    pewp.setYpjfs(summaryStatistics.getSum());
+                    pewp.setYpjfs(pep1ls.get(0).getYpjfs());
+
                 }
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getYzdgl).summaryStatistics();
                 //月最大功率
@@ -1123,7 +1134,8 @@ public class WindPowerInfo1Service {
                 }else
                 {
                     //年平均风速
-                    pewp.setNpjfs(summaryStatistics.getSum());
+                    pewp.setNpjfs(pep1ls.get(0).getNpjfs());
+//                    pewp.setNpjfs(summaryStatistics.getSum());
                 }
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getNzdgl).summaryStatistics();
                 //年最大功率

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

@@ -400,7 +400,7 @@ public class WindPowerInfo2Service {
 
 
 
-
+        List<String> wpls=new ArrayList<>();
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -443,7 +443,7 @@ public class WindPowerInfo2Service {
 //                wpinfodayls.add(pewp);
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay2Service.save(pewp);
-
+                wpls.add(wp.getId());
             }
 
 
@@ -452,7 +452,8 @@ public class WindPowerInfo2Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",wpls).eq("location",Location.wp.getValue());
 
         List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
@@ -496,7 +497,7 @@ public class WindPowerInfo2Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-
+        List<String > pjls=new ArrayList<>();
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if(CacheContext.wppointmap.containsKey(pj.getId()))
@@ -543,13 +544,14 @@ public class WindPowerInfo2Service {
             // proEconPowerstationInfoDay2Service.save(pewp);
 
 //            }
-
+            pjls.add(pj.getWindpowerstationId());
 
         }
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",pjls)
                 .eq("location",Location.pj.getValue());
         List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
@@ -594,7 +596,7 @@ public class WindPowerInfo2Service {
         Date begin = DateUtils.truncate(c.getTime());
 
 
-
+        List<String > lnls=new ArrayList<>();
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 //            if(CacheContext.wppointmap.containsKey(ln.getId()))
@@ -643,7 +645,10 @@ public class WindPowerInfo2Service {
             calSimple(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
             dayls.add(pewp);
             // proEconPowerstationInfoDay2Service.save(pewp);
-
+            if(CacheContext.pjmap.containsKey(ln.getProjectId()))
+            {
+                lnls.add(CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId());
+            }
         }
 
 
@@ -653,6 +658,7 @@ public class WindPowerInfo2Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay2> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",lnls)
                 .eq("location",Location.ln.getValue());
         List<String> idls = proEconPowerstationInfoDay2Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0

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

@@ -402,7 +402,7 @@ public class WindPowerInfo3Service {
 //        List<ProEconPowerstationInfoDay3> wpinfodayls=new ArrayList<>();
 
 
-
+        List<String> wpls=new ArrayList<>();
         List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -443,7 +443,7 @@ public class WindPowerInfo3Service {
 //                wpinfodayls.add(pewp);
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay3Service.save(pewp);
-
+                wpls.add(wp.getId());
             }
 
 
@@ -452,7 +452,9 @@ public class WindPowerInfo3Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",wpls)
+                .eq("location",Location.wp.getValue());
         List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
@@ -495,7 +497,7 @@ public class WindPowerInfo3Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-
+        List<String > pjls=new ArrayList<>();
         List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if(CacheContext.wppointmap.containsKey(pj.getId()))
@@ -543,11 +545,12 @@ public class WindPowerInfo3Service {
 
 //            }
 
-
+            pjls.add(pj.getWindpowerstationId());
         }
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",pjls)
                 .eq("location",Location.pj.getValue());
         List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
@@ -590,7 +593,7 @@ public class WindPowerInfo3Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-
+        List<String > lnls=new ArrayList<>();
         List<ProEconPowerstationInfoDay3> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 //            if(CacheContext.linepointmap.containsKey(ln.getId()))
@@ -639,7 +642,10 @@ public class WindPowerInfo3Service {
             calSimple(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
             dayls.add(pewp);
             // proEconPowerstationInfoDay3Service.save(pewp);
-
+            if(CacheContext.pjmap.containsKey(ln.getProjectId()))
+            {
+                lnls.add(CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId());
+            }
         }
 
 
@@ -647,6 +653,7 @@ public class WindPowerInfo3Service {
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay3> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",lnls)
                 .eq("location",Location.ln.getValue());
         List<String> idls = proEconPowerstationInfoDay3Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0

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

@@ -427,7 +427,7 @@ public class WindPowerInfo4Service {
 //        List<ProEconPowerstationInfoDay4> wpinfodayls = new ArrayList<>();
 
 
-
+        List<String> wpls=new ArrayList<>();
         List<ProEconPowerstationInfoDay4> dayls = new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -508,7 +508,7 @@ public class WindPowerInfo4Service {
 //                wpinfodayls.add(pewp);
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay4Service.save(pewp);
-
+                wpls.add(wp.getId());
             }
 
 
@@ -516,7 +516,9 @@ public class WindPowerInfo4Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date", DateUtils.truncate(recordDate)).eq("location", Location.wp.getValue());
+        queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",wpls)
+                .eq("location", Location.wp.getValue());
         List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
@@ -556,7 +558,7 @@ public class WindPowerInfo4Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-
+        List<String > pjls=new ArrayList<>();
         List<ProEconPowerstationInfoDay4> dayls = new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
 //            if (CacheContext.wppointmap.containsKey(pj.getId())) {
@@ -644,12 +646,13 @@ public class WindPowerInfo4Service {
 
 //            }
 
-
+            pjls.add(pj.getWindpowerstationId());
         }
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",pjls)
                 .eq("location", Location.pj.getValue());
         List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
@@ -689,7 +692,7 @@ public class WindPowerInfo4Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-
+        List<String > lnls=new ArrayList<>();
         List<ProEconPowerstationInfoDay4> dayls = new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
 
@@ -761,13 +764,17 @@ public class WindPowerInfo4Service {
             // proEconPowerstationInfoDay4Service.save(pewp);
 
             //          }
-
+            if(CacheContext.pjmap.containsKey(ln.getProjectId()))
+            {
+                lnls.add(CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId());
+            }
 
         }
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay4> queryWrapper = new QueryWrapper<>();
         queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",lnls)
                 .eq("location", Location.ln.getValue());
         List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
 

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

@@ -352,7 +352,7 @@ public class WindPowerInfo5Service {
 //        List<ProEconPowerstationInfoDay5> wpinfodayls=new ArrayList<>();
 
 
-
+        List<String> wpls=new ArrayList<>();
         List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -393,7 +393,7 @@ public class WindPowerInfo5Service {
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay5Service.save(pewp);
 
-
+                wpls.add(wp.getId());
             }
 
 
@@ -401,7 +401,9 @@ public class WindPowerInfo5Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",wpls)
+                .eq("location",Location.wp.getValue());
         List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
@@ -443,7 +445,7 @@ public class WindPowerInfo5Service {
 //
 //        Date begin= DateUtils.truncate(c.getTime());
 
-
+        List<String > pjls=new ArrayList<>();
         List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
@@ -487,7 +489,7 @@ public class WindPowerInfo5Service {
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay5Service.save(pewp);
 
-
+                pjls.add(pj.getWindpowerstationId());
             }
 
 
@@ -495,7 +497,9 @@ public class WindPowerInfo5Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.pj.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",pjls)
+                .eq("location",Location.pj.getValue());
         List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.pjmap.containsKey(i.getProjectId())
@@ -537,7 +541,7 @@ public class WindPowerInfo5Service {
 //
 //        Date begin= DateUtils.truncate(c.getTime());
 
-
+        List<String > lnls=new ArrayList<>();
         List<ProEconPowerstationInfoDay5> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
@@ -586,7 +590,10 @@ public class WindPowerInfo5Service {
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay5Service.save(pewp);
 
-
+                if(CacheContext.pjmap.containsKey(ln.getProjectId()))
+                {
+                    lnls.add(CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId());
+                }
             }
 
 
@@ -594,7 +601,9 @@ public class WindPowerInfo5Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay5> queryWrapper= new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.ln.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",lnls)
+                .eq("location",Location.ln.getValue());
         List<String> idls = proEconPowerstationInfoDay5Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.lnmap.containsKey(i.getLineId())

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

@@ -393,7 +393,7 @@ public class WindPowerInfo6Service {
 //        List<ProEconPowerstationInfoDay6> wpinfodayls=new ArrayList<>();
 
 
-
+        List<String> wpls=new ArrayList<>();
         List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
             if (CacheContext.wppointmap.containsKey(wp.getId())) {
@@ -430,7 +430,7 @@ public class WindPowerInfo6Service {
 //                wpinfodayls.add(pewp);
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay6Service.save(pewp);
-
+                wpls.add(wp.getId());
             }
 
 
@@ -438,7 +438,9 @@ public class WindPowerInfo6Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.wp.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",wpls)
+                .eq("location",Location.wp.getValue());
         List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
@@ -465,7 +467,7 @@ public class WindPowerInfo6Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-
+        List<String > pjls=new ArrayList<>();
         List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
@@ -507,7 +509,7 @@ public class WindPowerInfo6Service {
 
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay6Service.save(pewp);
-
+                pjls.add(pj.getWindpowerstationId());
             }
 
 
@@ -515,7 +517,9 @@ public class WindPowerInfo6Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.pj.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",pjls)
+                .eq("location",Location.pj.getValue());
         List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.pjmap.containsKey(i.getProjectId())
@@ -542,7 +546,7 @@ public class WindPowerInfo6Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
-
+        List<String > lnls=new ArrayList<>();
         List<ProEconPowerstationInfoDay6> dayls=new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
@@ -587,7 +591,10 @@ public class WindPowerInfo6Service {
 
                 dayls.add(pewp);
                 // proEconPowerstationInfoDay6Service.save(pewp);
-
+                if(CacheContext.pjmap.containsKey(ln.getProjectId()))
+                {
+                    lnls.add(CacheContext.pjmap.get(ln.getProjectId()).getWindpowerstationId());
+                }
             }
 
 
@@ -595,7 +602,9 @@ public class WindPowerInfo6Service {
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconPowerstationInfoDay6> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",DateUtils.truncate(recordDate)).eq("location",Location.ln.getValue());
+        queryWrapper.eq("record_date",DateUtils.truncate(recordDate))
+                .in("windpowerstation_id",lnls)
+                .eq("location",Location.ln.getValue());
         List<String> idls = proEconPowerstationInfoDay6Service.list(queryWrapper).stream()
 //                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
 //                        && CacheContext.lnmap.containsKey(i.getLineId())

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

@@ -3,9 +3,6 @@ package com.gyee.generation.service.initalcache;/*
 @date   2022/11/3-9:14
 */
 
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
 import lombok.extern.slf4j.Slf4j;
@@ -13,10 +10,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
 
 @Service
 @Slf4j
@@ -68,24 +61,24 @@ public class CacheService {
 ////                        i.getWindpowerstationId().equals("SXJ_KGDL_PDL_FDC_STA")  ||
 ////                        i.getWindpowerstationId().equals("SXJ_KGDL_ZK_FDC_STA")
 //        ) &&  i.getIsable().equals(1)).collect(Collectors.toList());
-        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i-> i.getIsable().equals(1)).collect(Collectors.toList());
+//        List<ProBasicEquipment> windturbineList = windturbineService.list().stream().filter(i-> i.getIsable().equals(1)).collect(Collectors.toList());
+//
+//        log.info("--------------------------windturbineList"+windturbineList.size());
+//        windturbineList.stream().forEach(i->{
+//            Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
+//            QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
+//            qw.eq("windturbine_id",i.getId());
+//            List<ProBasicEquipmentPoint> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
+//            log.info("--------------------------windturbinetestingpointai2List"+windturbinetestingpointai2List.size());
+//            windturbinetestingpointai2List.stream().forEach(x->{
+//                codeaimap.put(x.getUniformCode(),x);
+//            });
+//            log.info("--------------------------codeaimap"+codeaimap.size());
+//            String s = JSONObject.toJSONString(codeaimap);
+//            redisService.set(i.getId(),s);
+//        });
 
-        log.info("--------------------------windturbineList"+windturbineList.size());
-        windturbineList.stream().forEach(i->{
-            Map<String, ProBasicEquipmentPoint> codeaimap = new HashMap<>();
-            QueryWrapper<ProBasicEquipmentPoint> qw = new QueryWrapper<>();
-            qw.eq("windturbine_id",i.getId());
-            List<ProBasicEquipmentPoint> windturbinetestingpointai2List = windturbinetestingpointnewService.list(qw);
-            log.info("--------------------------windturbinetestingpointai2List"+windturbinetestingpointai2List.size());
-            windturbinetestingpointai2List.stream().forEach(x->{
-                codeaimap.put(x.getUniformCode(),x);
-            });
-            log.info("--------------------------codeaimap"+codeaimap.size());
-            String s = JSONObject.toJSONString(codeaimap);
-            redisService.set(i.getId(),s);
-        });
 
-                log.info("--------------------------完成");
 
 
 //        log.info("--------------------------redisSQ");
@@ -266,5 +259,7 @@ public class CacheService {
 //            }
 //        });
 //        redisService.set("SSZZT", JSONObject.toJSONString(sszztMap));
+
+        log.info("--------------------------完成");
     }
 }

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

@@ -101,9 +101,9 @@ public class AccessStatusService {
                 Map<String, ProBasicPowerstationPoint> basicPowerstationPointMap = wswppointmap.get(wsOptional.get().getId());
 
                 ProBasicPowerstationPoint proBasicPowerstationPoint = null;
-                if (wp.getSpare4().equals("1")){
+                if (wp.getWindType().equals("-1")){
                     proBasicPowerstationPoint = basicPowerstationPointMap.get(ContantXk.FCCFTWD);
-                }else if(wp.getSpare4().equals("2")){
+                }else if(wp.getWindType().equals("-2")){
                     proBasicPowerstationPoint = basicPowerstationPointMap.get(ContantXk.QXZWD);
                 }
 

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

@@ -6,8 +6,10 @@ import com.gyee.common.util.DateUtils;
 import com.gyee.common.util.DoubleUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.vo.PowerVo;
 import com.gyee.generation.util.PointUtil;
 import com.gyee.generation.util.StringUtils;
+import com.gyee.generation.util.math.LightToTheoreticalPower;
 import com.gyee.generation.util.math.PowerIntegration;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import lombok.SneakyThrows;
@@ -15,6 +17,8 @@ import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
@@ -33,6 +37,8 @@ public class CycleCalculationService {
     @Value("${notCalculatePower}")
     private String notCalculatePower;
 
+    @Resource
+    private LightToTheoreticalPower lightToTheoreticalPower;
     @SneakyThrows
     public void saveCyle() throws Exception {
 
@@ -75,6 +81,10 @@ public class CycleCalculationService {
 
             Map<String, Double> dataMap = new HashMap<>();
             Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
+
+            Map<String, ProBasicPowerstationPoint> wpPointMap = wppointmap.get(wt.getWindpowerstationId());
+
+            ProBasicPowerstationPoint gzdPoint=wpPointMap.get("GCGZQD");
             ProBasicEquipmentPoint ssfsPoint = equipmentPointMap.get(ContantXk.CJ_SSFS);
             ProBasicEquipmentPoint ssglPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
             ProBasicEquipmentPoint rssfdlPoint = equipmentPointMap.get(ContantXk.CJ_FDL);
@@ -284,39 +294,107 @@ public class CycleCalculationService {
                     if (zsglFirst.isPresent()) {
                         dataMap.put("zsdl", zsglFirst.get().getPointValueInDouble());
                     }
-                    List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
+//                    List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
                     //实际功率
 //                    List<PointData> ssglPointDatas = edosUtil.getHistoryDatasSnap(ssglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
                     //拟合功率
 //                    List<PointData> zsglPointDatas = edosUtil.getHistoryDatasSnap(zsglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
-                    //实时功率平均值
-                    List<PointData> ssglPointDatas = edosUtil.getHistStat(ssglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
-                    //实时风速平均值
-                    List<PointData> pjfsointDatas = edosUtil.getHistStat(ssfsPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
                     //故障
-                    double gzss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 4,wt);
+                    double gzss =0.0;
                     //故障受累
-                    double gzsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 5,wt);
+                    double gzsl =0.0;
                     //检修
-                    double jxss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 6,wt);
+                    double jxss=0.0;
                     //检修受累
-                    double jxsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 7,wt);
+                    double jxsl =0.0;
                     //待机
-                    double djss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 0,wt);
+                    double djss=0.0;
                     //手动停机
-                    double sdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 1,wt);
+                    double sdtj =0.0;
                     //性能
-                    double xnss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 2,wt);
+                    double xnss =0.0;
                     //发电降出力
-                    double fdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 3,wt);
+                    double fdjcl =0.0;
                     //限电降出力
-                    double xdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 8,wt);
+                    double xdjcl =0.0;
                     //限电停机
-                    double xdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 9,wt);
+                    double xdtj =0.0;
                     //电网受累
-                    double dwsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 10,wt);
+                    double dwsl =0.0;
                     //环境受累
-                    double hjsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 11,wt);
+                    double hjsl =0.0;
+                    if(wt.getId().contains("_F_"))
+                    {
+                        List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
+
+                        //实时功率平均值
+                        List<PointData> ssglPointDatas = edosUtil.getHistStat(ssglPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
+                        //实时风速平均值
+                        List<PointData> pjfsointDatas = edosUtil.getHistStat(ssfsPoint, date15age.getTime() / 1000, currentDate.getTime() / 1000, 15l, 60l, 2);
+                        //故障
+                        gzss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 4,wt);
+                        //故障受累
+                        gzsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 5,wt);
+                        //检修
+                        jxss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 6,wt);
+                        //检修受累
+                        jxsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 7,wt);
+                        //待机
+                        djss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 0,wt)*0.1;
+                        //手动停机
+                        sdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 1,wt)*0.1;
+                        //性能
+                        xnss = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 2,wt)*0.1;
+                        //发电降出力
+                        fdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 3,wt)*0.1;
+                        //限电降出力
+                        xdjcl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 8,wt);
+                        //限电停机
+                        xdtj = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 9,wt);
+                        //电网受累
+                        dwsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 10,wt);
+                        //环境受累
+                        hjsl = generalLossBySpeed(mxztPointDatas, pjfsointDatas, ssglPointDatas, 11,wt);
+                    }
+                    else
+                    {
+                        List<PointData> mxztPointDatas = edosUtil.getHistoryDatasSnap(mxztPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
+                        List<PointData> rfdlPointDatas = edosUtil.getHistoryDatasSnap(rfdlPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
+                        List<PointData> gzdPointDatas = edosUtil.getHistoryDatasSnap(gzdPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
+
+                        if(CacheContext.modelMap.containsKey(wt.getModelId()))
+                        {
+                            ProEconEquipmentmodel model=CacheContext.modelMap.get(wt.getModelId());
+                            PowerVo vo= lightToTheoreticalPower.calculateEnergy(rfdlPointDatas, gzdPointDatas, mxztPointDatas,gzdPoint.getNemCode(),model.getPowerProduction());
+                            //故障
+                            gzss = vo.getRgzssdl();
+                            //故障受累
+                            gzsl = vo.getRcnslgzssdl();
+                            //检修
+                            jxss = vo.getRjxssdl();
+                            //检修受累
+                            jxsl = vo.getRcnsljxssdl();
+                            //待机
+                            djss = vo.getRdjssdl();
+                            //手动停机
+                            sdtj = vo.getRsdtjssdl();
+                            //性能
+                            xnss = vo.getRxnssdl();
+                            //发电降出力
+                            fdjcl = vo.getRqxjclssdl();
+                            //限电降出力
+                            xdjcl = vo.getRxdjclssdl();
+                            //限电停机
+                            xdtj = vo.getRxdtjssdl();
+                            //电网受累
+                            dwsl = vo.getRcwsldwssdl();
+                            //环境受累
+                            hjsl = vo.getRcwsltqssdl();
+
+                        }
+
+                    }
+
 
                     double rgzss = 0;
                     double rgzsl = 0;
@@ -409,51 +487,102 @@ public class CycleCalculationService {
                                 lsfs = 0;
                             }
                             rpjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
+
+                            double lsgl = edosUtil.getSectionData(rpjglPoint, currentDate.getTime()).getPointValueInDouble();
+                            rpjgl = DoubleUtils.ave(lsgl, dataMap.get("pjgl"));
+                            double lskydl = edosUtil.getSectionData(rkydlPoint, currentDate.getTime()).getPointValueInDouble();
+                            rkydl = DoubleUtils.sum(lskydl, dataMap.get("kydl"));
+                            double lslldlzs = edosUtil.getSectionData(rlldlzsPoint, currentDate.getTime()).getPointValueInDouble();
+                            rzsdl = DoubleUtils.sum(lslldlzs, dataMap.get("zsdl"));
+                            double lsgzss = edosUtil.getSectionData(rgzssPoint, currentDate.getTime()).getPointValueInDouble();
+                            rgzss = DoubleUtils.sum(lsgzss, gzss);
+                            double lsgzsl = edosUtil.getSectionData(rgzslPoint, currentDate.getTime()).getPointValueInDouble();
+                            rgzsl = DoubleUtils.sum(lsgzsl, gzsl);
+                            double lsjxss = edosUtil.getSectionData(rjxssPoint, currentDate.getTime()).getPointValueInDouble();
+                            rjxss = DoubleUtils.sum(lsjxss, jxss);
+                            double lsjxsl = edosUtil.getSectionData(rjxslPoint, currentDate.getTime()).getPointValueInDouble();
+                            rjxsl = DoubleUtils.sum(lsjxsl, jxsl);
+
+                            double lsdjss = edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble();
+                            rdjss = DoubleUtils.sum(lsdjss, djss);;
+                            double lssdtj = edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble();
+                            rsdtj = DoubleUtils.sum(lssdtj, sdtj);;
+                            double lsxnss = edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble();
+                            rxnss = DoubleUtils.sum(lsxnss, xnss);;
+
+                            double lsfdjcl = edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble();
+                            rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
+
+                            double lsxdjcl = edosUtil.getSectionData(rxdjclPoint, currentDate.getTime()).getPointValueInDouble();
+                            rxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
+                            double lsxdtj = edosUtil.getSectionData(rxdtjPoint, currentDate.getTime()).getPointValueInDouble();
+                            rxdtj = DoubleUtils.sum(lsxdtj, xdtj);
+                            double lsdwsl = edosUtil.getSectionData(rdwslPoint, currentDate.getTime()).getPointValueInDouble();
+                            rdwsl = DoubleUtils.sum(lsdwsl, dwsl);
+                            double lshjsl = edosUtil.getSectionData(rhjslPoint, currentDate.getTime()).getPointValueInDouble();
+                            rhjsl = DoubleUtils.sum(lshjsl, hjsl);
+                            double temp = rgzss + rgzsl + rjxss + rjxsl + rdjss + rsdtj + rxnss + rfdjcl + rxdjcl + rxdtj + rdwsl + rhjsl;
+                            if (temp >= 0) {
+                                rqfdl = temp;
+                            } else {
+                                rzfdl = Math.abs(temp);
+                            }
                         } else {
-                            double lsfs = edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble();
-                            rpjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
-                        }
-                        double lsgl = edosUtil.getSectionData(rpjglPoint, currentDate.getTime()).getPointValueInDouble();
-                        rpjgl = DoubleUtils.ave(lsgl, dataMap.get("pjgl"));
-                        double lskydl = edosUtil.getSectionData(rkydlPoint, currentDate.getTime()).getPointValueInDouble();
-                        rkydl = DoubleUtils.sum(lskydl, dataMap.get("kydl"));
-                        double lslldlzs = edosUtil.getSectionData(rlldlzsPoint, currentDate.getTime()).getPointValueInDouble();
-                        rzsdl = DoubleUtils.sum(lslldlzs, dataMap.get("zsdl"));
-                        double lsgzss = edosUtil.getSectionData(rgzssPoint, currentDate.getTime()).getPointValueInDouble();
-                        rgzss = DoubleUtils.sum(lsgzss, gzss);
-                        double lsgzsl = edosUtil.getSectionData(rgzslPoint, currentDate.getTime()).getPointValueInDouble();
-                        rgzsl = DoubleUtils.sum(lsgzsl, gzsl);
-                        double lsjxss = edosUtil.getSectionData(rjxssPoint, currentDate.getTime()).getPointValueInDouble();
-                        rjxss = DoubleUtils.sum(lsjxss, jxss);
-                        double lsjxsl = edosUtil.getSectionData(rjxslPoint, currentDate.getTime()).getPointValueInDouble();
-                        rjxsl = DoubleUtils.sum(lsjxsl, jxsl);
-
-                        double lsdjss = edosUtil.getSectionData(rdjssPoint, currentDate.getTime()).getPointValueInDouble();
-                        rdjss = DoubleUtils.sum(lsdjss, djss);
-                        double lssdtj = edosUtil.getSectionData(rsdtjPoint, currentDate.getTime()).getPointValueInDouble();
-                        rsdtj = DoubleUtils.sum(lssdtj, sdtj);
-                        double lsxnss = edosUtil.getSectionData(rxnssPoint, currentDate.getTime()).getPointValueInDouble();
-                        rxnss = DoubleUtils.sum(lsxnss, xnss);
-                        ;
-                        double lsfdjcl = edosUtil.getSectionData(rfdjclPoint, currentDate.getTime()).getPointValueInDouble();
-                        rfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
-                        ;
-
-
-                        double lsxdjcl = edosUtil.getSectionData(rxdjclPoint, currentDate.getTime()).getPointValueInDouble();
-                        rxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
-                        double lsxdtj = edosUtil.getSectionData(rxdtjPoint, currentDate.getTime()).getPointValueInDouble();
-                        rxdtj = DoubleUtils.sum(lsxdtj, xdtj);
-                        double lsdwsl = edosUtil.getSectionData(rdwslPoint, currentDate.getTime()).getPointValueInDouble();
-                        rdwsl = DoubleUtils.sum(lsdwsl, dwsl);
-                        double lshjsl = edosUtil.getSectionData(rhjslPoint, currentDate.getTime()).getPointValueInDouble();
-                        rhjsl = DoubleUtils.sum(lshjsl, hjsl);
-                        double temp = rgzss + rgzsl + rjxss + rjxsl + rdjss + rsdtj + rxnss + rfdjcl + rxdjcl + rxdtj + rdwsl + rhjsl;
-                        if (temp >= 0) {
-                            rqfdl = temp;
-                        } else {
-                            rzfdl = Math.abs(temp);
+
+                            Date tempdate=DateUtils.truncate(currentDate);
+                            List<PointData> pointls=edosUtil.getHistoryDatasSnap(ssfsPoint.getNemCode(), tempdate.getTime()/1000, currentDate.getTime()/1000);
+                            if(!pointls.isEmpty())
+                            {
+                                List<PointData> filterls=new ArrayList<>();
+                                for(PointData po:pointls)
+                                {
+                                    if(po.getPointValueInDouble()>10)
+                                    {
+                                        filterls.add(po);
+                                    }
+                                }
+
+                                if(!filterls.isEmpty()) {
+                                    Date beginTime = new Date(filterls.get(0).getPointTime());
+                                    Date endTime = new Date(filterls.get(filterls.size() - 1).getPointTime());
+                                    double hours = com.gyee.generation.util.DateUtils.hoursDiff(beginTime, endTime);
+                                    DoubleSummaryStatistics summaryStatistics = filterls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+                                    double avg = com.gyee.common.model.StringUtils.round(summaryStatistics.getAverage(), 2);
+                                    //累计光照度
+                                    rpjfs = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+                                }
+
+                            }
+
+                            double lsgl = edosUtil.getSectionData(rpjglPoint, currentDate.getTime()).getPointValueInDouble();
+                            rpjgl = DoubleUtils.ave(lsgl, dataMap.get("pjgl"));
+                            double lskydl = edosUtil.getSectionData(rkydlPoint, currentDate.getTime()).getPointValueInDouble();
+                            rkydl = DoubleUtils.sum(lskydl, dataMap.get("kydl"));
+                            double lslldlzs = edosUtil.getSectionData(rlldlzsPoint, currentDate.getTime()).getPointValueInDouble();
+                            rzsdl = DoubleUtils.sum(lslldlzs, dataMap.get("zsdl"));
+                            double lsgzss = edosUtil.getSectionData(rgzssPoint, currentDate.getTime()).getPointValueInDouble();
+
+                            rgzss = gzss;
+                            rgzsl = gzsl;
+                            rjxss = jxss;
+                            rjxsl = jxsl;
+                            rdjss = djss;
+                            rsdtj = sdtj;
+                            rxnss = xnss;
+                            rfdjcl = fdjcl;
+                            rxdjcl =xdjcl;
+                            rxdtj = xdtj;
+                            rdwsl = dwsl;
+                            rhjsl =hjsl;
+                            double temp = rgzss + rgzsl + rjxss + rjxsl + rdjss + rsdtj + rxnss + rfdjcl + rxdjcl + rxdtj + rdwsl + rhjsl;
+                            if (temp >= 0) {
+                                rqfdl = temp;
+                            } else {
+                                rzfdl = Math.abs(temp);
+                            }
                         }
+
                     }
                     if (date.getTime() > monthFirstZero.getTime() && date.getTime() <= monthFirstZeroAdd15.getTime()) {
                         ypjfs = dataMap.get("pjfs");
@@ -491,8 +620,27 @@ public class CycleCalculationService {
                             }
                             ypjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
                         } else {
-                            double lsfs = edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble();
-                            ypjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
+//                            double lsfs = edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble();
+//                            ypjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
+
+                            Date tempdate=DateUtils.truncate(currentDate);
+                            Calendar c=new GregorianCalendar();
+                            c.setTime(tempdate);
+                            c.set(Calendar.DAY_OF_MONTH,1);
+                            List<PointData> pointls=edosUtil.getHistoryDatasSnap(rpjgzdPoint.getNemCode(), tempdate.getTime()/1000, currentDate.getTime()/1000,null,24*60*60l);
+                            if(!pointls.isEmpty())
+                            {
+                                double value=0.0;
+                                for(PointData po:pointls)
+                                {
+                                    if(po.getPointValueInDouble()>10)
+                                    {
+                                       value=value+po.getPointValueInDouble();
+                                    }
+                                }
+                                //累计光照度
+                                ypjfs = new BigDecimal(value).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                            }
                         }
 
                         double lsgl = edosUtil.getSectionData(ypjglPoint, currentDate.getTime()).getPointValueInDouble();
@@ -569,8 +717,24 @@ public class CycleCalculationService {
                             }
                             npjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
                         } else {
-                            double lsfs = edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble();
-                            npjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
+//                            double lsfs = edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble();
+//                            npjfs = DoubleUtils.ave(lsfs, dataMap.get("pjfs"));
+
+                            Date tempdate=DateUtils.truncate(currentDate);
+                            Calendar c=new GregorianCalendar();
+                            c.setTime(tempdate);
+                            c.set(Calendar.DAY_OF_YEAR,1);
+                            List<PointData> pointls=edosUtil.getHistoryDatasSnap(rpjgzdPoint.getNemCode(), tempdate.getTime()/1000, currentDate.getTime()/1000,null,24*60*60l);
+                            if(!pointls.isEmpty()) {
+                                double value = 0.0;
+                                for (PointData po : pointls) {
+                                    if (po.getPointValueInDouble() > 10) {
+                                        value = value + po.getPointValueInDouble();
+                                    }
+                                }
+                                //累计光照度
+                                npjfs = new BigDecimal(value).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                            }
                         }
 
                         double lsgl = edosUtil.getSectionData(npjglPoint, currentDate.getTime()).getPointValueInDouble();
@@ -591,16 +755,16 @@ public class CycleCalculationService {
 
                         double lsdjss = edosUtil.getSectionData(ndjssPoint, currentDate.getTime()).getPointValueInDouble();
                         ndjss = DoubleUtils.sum(lsdjss, djss);
-                        ;
+
                         double lssdtj = edosUtil.getSectionData(nsdtjPoint, currentDate.getTime()).getPointValueInDouble();
                         nsdtj = DoubleUtils.sum(lssdtj, sdtj);
-                        ;
+
                         double lsxnss = edosUtil.getSectionData(nxnssPoint, currentDate.getTime()).getPointValueInDouble();
                         nxnss = DoubleUtils.sum(lsxnss, xnss);
-                        ;
+
                         double lsfdjcl = edosUtil.getSectionData(nfdjclPoint, currentDate.getTime()).getPointValueInDouble();
                         nfdjcl = DoubleUtils.sum(lsfdjcl, fdjcl);
-                        ;
+
 
                         double lsxdjcl = edosUtil.getSectionData(nxdjclPoint, currentDate.getTime()).getPointValueInDouble();
                         nxdjcl = DoubleUtils.sum(lsxdjcl, xdjcl);
@@ -1089,7 +1253,7 @@ public class CycleCalculationService {
                 } else {
                     rpjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -1097,7 +1261,7 @@ public class CycleCalculationService {
                     });
                     ypjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) ( edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -1105,7 +1269,7 @@ public class CycleCalculationService {
                     });
                     npjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -1113,7 +1277,7 @@ public class CycleCalculationService {
                     });
                     pjfs15.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) ( edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -1766,18 +1930,18 @@ public class CycleCalculationService {
                 });
 //            });
             }
-//            if (CacheContext.pjmap.get(CacheContext.lnmap.get(line.getId()).getProjectId()).getWindpowerstationId().contains("_FDC_")) {
+            if (CacheContext.pjmap.get(CacheContext.lnmap.get(line.getId()).getProjectId()).getWindpowerstationId().contains("_FDC_")) {
             lineResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicWindturbines.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
             lineResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicWindturbines.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
             lineResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicWindturbines.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
             lineResultList.add(PointUtil.createPointData(date, pjfs15.get() / proBasicWindturbines.size(), wppjfs15Point.getNemCode(), wppjfs15Point.getName()));
-//            }else
-//            {
-//                lineResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
-//                lineResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
-//                lineResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
-//                lineResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
-//            }
+            }else
+            {
+                lineResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
+                lineResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
+                lineResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
+                lineResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
+            }
             lineResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicWindturbines.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
             lineResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicWindturbines.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
             lineResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicWindturbines.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
@@ -2212,7 +2376,7 @@ public class CycleCalculationService {
                 } else {
                     rpjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -2220,7 +2384,7 @@ public class CycleCalculationService {
                     });
                     ypjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -2228,7 +2392,7 @@ public class CycleCalculationService {
                     });
                     npjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) ( edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -2236,7 +2400,7 @@ public class CycleCalculationService {
                     });
                     pjfs15.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -2887,19 +3051,19 @@ public class CycleCalculationService {
                 });
             });
 
-//            if (project.getWindpowerstationId().contains("_FDC_"))
-//            {
+            if (project.getWindpowerstationId().contains("_FDC_"))
+            {
             projectResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicLines.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
             projectResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicLines.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
             projectResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicLines.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
             projectResultList.add(PointUtil.createPointData(date, pjfs15.get() / proBasicLines.size(), wppjfs15Point.getNemCode(), wppjfs15Point.getName()));
-//           }else {
-//                projectResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
-//                projectResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
-//                projectResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
-//                projectResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
-//
-//            }
+           }else {
+                projectResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
+                projectResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
+                projectResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
+                projectResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
+
+            }
 
             projectResultList.add(PointUtil.createPointData(date, rpjgl.get(), wprpjglPoint.getNemCode(), wprpjglPoint.getName()));
             projectResultList.add(PointUtil.createPointData(date, ypjgl.get(), wpypjglPoint.getNemCode(), wpypjglPoint.getName()));
@@ -3000,12 +3164,12 @@ public class CycleCalculationService {
             ProBasicPowerstationPoint wpypjfsPoint = null;
             ProBasicPowerstationPoint wpnpjfsPoint = null;
             ProBasicPowerstationPoint wppjfs15Point = null;
-            if (wp.getSpare4().equals("1")) {
+            if (wp.getWindType().equals("-1")) {
                 wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJFS);
                 wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJFS);
                 wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJFS);
                 wppjfs15Point = proBasicWppointMap.get(ContantXk.PJFS15);
-            } else if (wp.getSpare4().equals("2")) {
+            } else if (wp.getWindType().equals("-2")) {
                 wprpjfsPoint = proBasicWppointMap.get(ContantXk.RPJGZD);
                 wpypjfsPoint = proBasicWppointMap.get(ContantXk.YPJGZD);
                 wpnpjfsPoint = proBasicWppointMap.get(ContantXk.NPJGZD);
@@ -3329,7 +3493,7 @@ public class CycleCalculationService {
                 } else {
                     rpjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (edosUtil.getSectionData(rpjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -3337,7 +3501,7 @@ public class CycleCalculationService {
                     });
                     ypjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) ( edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -3345,7 +3509,7 @@ public class CycleCalculationService {
                     });
                     npjfs.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) (edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -3353,7 +3517,7 @@ public class CycleCalculationService {
                     });
                     pjfs15.updateAndGet(v -> {
                         try {
-                            return new Double((double) (v + edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
+                            return new Double((double) ( edosUtil.getSectionData(pjgzd15Point, currentDate.getTime()).getPointValueInDouble()));
                         } catch (Exception e) {
                             e.printStackTrace();
                         }
@@ -4004,21 +4168,21 @@ public class CycleCalculationService {
                 });
             });
 
-//            if (wp.getId().contains("_FDC_"))
-//            {
+            if (wp.getId().contains("_FDC_"))
+            {
             windpowerResultList.add(PointUtil.createPointData(date, rpjfs.get() / proBasicProjects.size(), wprpjfsPoint.getNemCode(), wprpjfsPoint.getName()));
             windpowerResultList.add(PointUtil.createPointData(date, ypjfs.get() / proBasicProjects.size(), wpypjfsPoint.getNemCode(), wpypjfsPoint.getName()));
             windpowerResultList.add(PointUtil.createPointData(date, npjfs.get() / proBasicProjects.size(), wpnpjfsPoint.getNemCode(), wpnpjfsPoint.getName()));
             windpowerResultList.add(PointUtil.createPointData(date, pjfs15.get() / proBasicProjects.size(), wppjfs15Point.getNemCode(), wppjfs15Point.getName()));
-//
-//            }else
-//            {
-//                windpowerResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
-//                windpowerResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
-//                windpowerResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
-//                windpowerResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
-//
-//            }
+
+            }else
+            {
+                windpowerResultList.add(PointUtil.createPointData(date,rpjfs.get(),wprpjfsPoint.getNemCode(),wprpjfsPoint.getName()));
+                windpowerResultList.add(PointUtil.createPointData(date,ypjfs.get(),wpypjfsPoint.getNemCode(),wpypjfsPoint.getName()));
+                windpowerResultList.add(PointUtil.createPointData(date,npjfs.get(),wpnpjfsPoint.getNemCode(),wpnpjfsPoint.getName()));
+                windpowerResultList.add(PointUtil.createPointData(date,pjfs15.get(),wppjfs15Point.getNemCode(),wppjfs15Point.getName()));
+
+            }
 
             windpowerResultList.add(PointUtil.createPointData(date, rpjgl.get(), wprpjglPoint.getNemCode(), wprpjglPoint.getName()));
             windpowerResultList.add(PointUtil.createPointData(date, ypjgl.get(), wpypjglPoint.getNemCode(), wpypjglPoint.getName()));
@@ -4148,12 +4312,16 @@ public class CycleCalculationService {
         return zsss;
     }
 
-
     private double generalLossBySpeed(List<PointData> ztmxDatasSnap, List<PointData> speedDatasSnap, List<PointData> powerDatasSnap, double statusValue,ProBasicEquipment wt) {
         List<PointData> pointDataList = ztmxDatasSnap.stream().filter(zt -> zt.getPointValueInDouble() == statusValue).collect(Collectors.toList());
         Double zsss = 0.0;
         if (ztmxDatasSnap.size() == speedDatasSnap.size() && speedDatasSnap.size() == powerDatasSnap.size()) {
+
+            PowerIntegration powerIntegration=new PowerIntegration();
+            Map<Integer, Double> powerData=new HashMap<>();
             if (statusValue == 2.0 || statusValue == 3.0 || statusValue == 8.0) {
+
+                int time=0;
                 for (int i = 0; i < ztmxDatasSnap.size(); i++) {
                     for (int j = 0; j < pointDataList.size(); j++) {
                         if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())) {
@@ -4170,20 +4338,24 @@ public class CycleCalculationService {
                                     if (power > 0) {
                                         double temp1 = bzgl - power;
                                         if (temp1 > 0) {
-                                            zsss += temp1;
+//                                            zsss += temp1;
+                                            powerData.put(time,temp1);
+                                            time++;
                                         }
                                     }
                                 }
                             }
-
-
                         }
                     }
                 }
+//                zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
             } else {
+                int time=0;
                 for (int i = 0; i < ztmxDatasSnap.size(); i++) {
                     for (int j = 0; j < pointDataList.size(); j++) {
                         if (pointDataList.get(j).getPointTime().equals(ztmxDatasSnap.get(i).getPointTime())) {
+
+
                             double pjfs = StringUtils.round(speedDatasSnap.get(i).getPointValueInDouble(),2);
                             if (CacheContext.theoreticalPowerMap.containsKey(wt.getModelId()))
                             {
@@ -4191,17 +4363,22 @@ public class CycleCalculationService {
                                 if(valuemap.containsKey(pjfs))
                                 {
                                     double bzgl=  valuemap.get(pjfs).getTheoryPower();
-                                    zsss += bzgl;
+
+                                    powerData.put(time,bzgl);
+                                    time++;
+
                                 }
                             }
 
                         }
                     }
                 }
+
             }
-            zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
+//            zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
+            zsss= powerIntegration.calculateEnergy(powerData, 1/60);
         }
 
         return zsss;
     }
-}
+}

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

@@ -456,12 +456,12 @@ public class RealtimeService {
 //            ProBasicPowerstationPoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
             ProBasicPowerstationPoint ssglsyzWpPoint = proBasicWppointMap.get(ContantXk.SSZGLSYZ);
 
-            proBasicLines.stream().forEach(wp -> {
-                Map<String, ProBasicPowerstationPoint> basicWppointMap = linepointmap.get(wp.getId());
+            proBasicLines.stream().forEach(ln -> {
+                Map<String, ProBasicPowerstationPoint> basicWppointMap = linepointmap.get(ln.getId());
                 ProBasicPowerstationPoint ssbfPoint = null;
-                if (wp.getSpare4().equals("1")){
+                if (ln.getSpare4().equals("1")){
                     ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
-                }else if (wp.getSpare4().equals("2")){
+                }else if (ln.getSpare4().equals("2")){
                     ssbfPoint = basicWppointMap.get(ContantXk.SSPJGZD);
                 }
 
@@ -569,9 +569,9 @@ public class RealtimeService {
 //            AtomicReference<Double> zkygl = new AtomicReference<>((double) 0);
 
             ProBasicPowerstationPoint ssfsWpPoint = null;
-            if (wps.getSpare4().equals("1")){
+            if (wps.getWindType().equals("-1")){
                 ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJFS);
-            }else if (wps.getSpare4().equals("2")){
+            }else if (wps.getWindType().equals("-2")){
                 ssfsWpPoint = proBasicWppointMap.get(ContantXk.SSPJGZD);
             }
 
@@ -583,13 +583,13 @@ public class RealtimeService {
             ProBasicPowerstationPoint zyglWpPoint = proBasicWppointMap.get(ContantXk.SSZZYGL);
 //            ProBasicPowerstationPoint kyglWpPoint = proBasicWppointMap.get(ContantXk.SSZKYGL);
 
-            proBasicProjects.stream().forEach(wp -> {
-                Map<String, ProBasicPowerstationPoint> basicWppointMap = propointmap.get(wp.getId());
+            proBasicProjects.stream().forEach(pj -> {
+                Map<String, ProBasicPowerstationPoint> basicWppointMap = propointmap.get(pj.getId());
 
                 ProBasicPowerstationPoint ssbfPoint = null;
-                if (wp.getSpare4().equals("1")){
+                if (pj.getSpare4().equals("1")){
                     ssbfPoint = basicWppointMap.get(ContantXk.SSPJFS);
-                }else if (wp.getSpare4().equals("2")){
+                }else if (pj.getSpare4().equals("2")){
                     ssbfPoint = basicWppointMap.get(ContantXk.SSPJGZD);
                 }
                 ProBasicPowerstationPoint ssglPoint = basicWppointMap.get(ContantXk.SSZGL);

realtime/generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo1ThreadPool.java

@@ -15,6 +15,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.Serializable;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.Callable;
 import java.util.stream.Collectors;
@@ -38,6 +40,8 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 	private List<ProEconEquipmentInfoDay1> dayls;
 	private IEdosUtil edosUtil;
 
+
+
 	public EquipmentInfo1ThreadPool(Object tasks, ProBasicEquipment wt, Map<String,ProEconEquipmentInfoDay1> pep1map,
 									Date recordDate, Date end, Date begin,List<ProEconEquipmentInfoDay1> dayls,
 									IEdosUtil edosUtil
@@ -87,9 +91,17 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 
 				if(pep1map.containsKey(wt.getId()))
 				{
-					pep1ls.add(pep1map.get(wt.getId()));
+
+					Calendar c=Calendar.getInstance();
+					c.setTime(recordDate);
+
+					if(c.get(Calendar.DAY_OF_MONTH)==1)
+					{
+						pep1ls.add(pep1map.get(wt.getId()));
+					}
+
 				}
-				extracted(recordDate, end, begin, pointmap, pewp,pep1ls);
+				extracted(pep1map,recordDate, end, begin, pointmap, pewp,pep1ls);
 
 				dayls.add(pewp);
 				// proEconEquipmentInfoDay1Service.save(pewp);
@@ -106,7 +118,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 
 	}
 
-	private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicEquipmentPoint> pointmap, ProEconEquipmentInfoDay1 pewp,List<ProEconEquipmentInfoDay1> pepid1ls) throws Exception {
+	private void extracted(Map<String,ProEconEquipmentInfoDay1> pep1map,Date recordDate, Date end, Date begin,Map<String, ProBasicEquipmentPoint> pointmap, ProEconEquipmentInfoDay1 pewp,List<ProEconEquipmentInfoDay1> pepid1ls) throws Exception {
 
 
 		if(pewp.getWindpowerstationId().contains(WpType.FDC.id))
@@ -133,7 +145,6 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 					}
 
 					//日最小风速
-
 					if(summaryStatistics.getMin()<0)
 					{
 						pewp.setRzxfs(StringUtils.round(0,2));
@@ -142,7 +153,6 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 						pewp.setRzxfs(StringUtils.round(summaryStatistics.getMin(),2));
 					}
 					//日平均风速
-
 					if(summaryStatistics.getAverage()>30)
 					{
 						pewp.setRpjfs(StringUtils.round(25,2));
@@ -160,19 +170,45 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		}else
 		{
 			//*******************************************日信息统计*********************************************************/
-			if(pointmap.containsKey(ContantXk.RPJGZD))
+			if(pointmap.containsKey(ContantXk.CJ_SSFS))
 			{
-				ProBasicEquipmentPoint point= pointmap.get(ContantXk.RPJGZD);
+				ProBasicEquipmentPoint point= pointmap.get(ContantXk.CJ_SSFS);
 				List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
 				if(!pointls.isEmpty())
 				{
-					DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
-					//日最大风速
-					pewp.setRzdfs(StringUtils.round(summaryStatistics.getMax(),2));
-					//日最小风速
-					pewp.setRzxfs(StringUtils.round(summaryStatistics.getMin(),2));
-					//日平均风速
-					pewp.setRpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+					List<PointData> filterls=new ArrayList<>();
+					for(PointData po:pointls)
+					{
+						if(po.getPointValueInDouble()>10)
+						{
+							filterls.add(po);
+						}
+					}
+
+
+					if(!filterls.isEmpty())
+					{
+						Date beginTime=new Date(filterls.get(0).getPointTime());
+						Date endTime=new Date(filterls.get(filterls.size()-1).getPointTime());
+						double hours=DateUtils.hoursDiff(beginTime,endTime);
+
+						DoubleSummaryStatistics summaryStatistics=filterls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+						//日最大风速
+						pewp.setRzdfs(StringUtils.round(summaryStatistics.getMax(),2));
+						//日最小风速
+						pewp.setRzxfs(StringUtils.round(summaryStatistics.getMin(),2));
+
+						double avg= StringUtils.round(summaryStatistics.getAverage(),2);
+
+						double result =new BigDecimal(avg*hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+
+						//日平均风速
+						pewp.setRpjfs(result);
+
+
+					}
+
+
 				}
 
 			}
@@ -460,7 +496,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 
 //*******************************************月信息统计*********************************************************/
 
-		if(pepid1ls.isEmpty())
+		if(!pepid1ls.isEmpty())
 		{
 			setPowerandSpeedMonth(pewp);
 		}else
@@ -517,22 +553,24 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			}else
 			{
 				//*******************************************日信息统计*********************************************************/
-				if(pointmap.containsKey(ContantXk.YPJGZD))
+
+				if(pep1map.containsKey(wt.getId()))
 				{
-					ProBasicEquipmentPoint point= pointmap.get(ContantXk.YPJGZD);
-					List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
-					if(!pointls.isEmpty())
+					ProEconEquipmentInfoDay1 day1=pep1map.get(wt.getId());
+					//月累计光照度
+					pewp.setYpjfs(StringUtils.round(day1.getYpjfs()+pewp.getRpjfs(),2));
+					//月最大光照度
+					if(day1.getYzdfs()<pewp.getRpjfs())
 					{
-						DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
-						//月最大风速
-						pewp.setYzdfs(StringUtils.round(summaryStatistics.getMax(),2));
-						//月最小风速
-						pewp.setYzxfs(StringUtils.round(summaryStatistics.getMin(),2));
-						//月平均风速
-						pewp.setYpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+						pewp.setYzdfs(StringUtils.round(pewp.getRpjfs(),2));
+					}
+					//月最小光照度
+					if(day1.getYzxfs()>pewp.getRpjfs())
+					{
+						pewp.setYzxfs(StringUtils.round(pewp.getRpjfs(),2));
 					}
-
 				}
+
 			}
 
 
@@ -812,7 +850,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 //*******************************************月信息统计*********************************************************/
 
 //*******************************************年信息统计*********************************************************/
-		if(pepid1ls.isEmpty())
+		if(!pepid1ls.isEmpty())
 		{
 			setPowerandSpeedYear(pewp);
 		}else
@@ -869,19 +907,20 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			}else
 			{
 				//*******************************************日信息统计*********************************************************/
-				if(pointmap.containsKey(ContantXk.NPJGZD))
+				if(pep1map.containsKey(wt.getId()))
 				{
-					ProBasicEquipmentPoint point= pointmap.get(ContantXk.NPJGZD);
-					List<PointData> pointls=edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime()/1000, end.getTime()/1000);
-					if(!pointls.isEmpty())
+					ProEconEquipmentInfoDay1 day1=pep1map.get(wt.getId());
+					//年累计光照度
+					pewp.setNpjfs(StringUtils.round(day1.getNpjfs()+pewp.getRpjfs(),2));
+					//年最大光照度
+					if(day1.getNzdfs()<pewp.getRpjfs())
 					{
-						DoubleSummaryStatistics summaryStatistics=pointls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
-						//年最大风速
-						pewp.setNzdfs(StringUtils.round(summaryStatistics.getMax(),2));
-						//年最小风速
-						pewp.setNzxfs(StringUtils.round(summaryStatistics.getMin(),2));
-						//年平均风速
-						pewp.setNpjfs(StringUtils.round(summaryStatistics.getAverage(),2));
+						pewp.setNzdfs(StringUtils.round(pewp.getRpjfs(),2));
+					}
+					//年最小光照度
+					if(day1.getNzxfs()>pewp.getRpjfs())
+					{
+						pewp.setNzxfs(StringUtils.round(pewp.getRpjfs(),2));
 					}
 
 				}

realtime/generationXK-service/src/main/java/com/gyee/generation/task/thread/EquipmentInfo2ThreadPool.java

@@ -352,23 +352,25 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 		pewp.setRsdtjxsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计性能小时（明细）
 		pewp.setRbwxsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-//		//日合计限电停机小时（明细）
-//		pewp.setRxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-//		//日合计限电降出力小时（明细）
-//		pewp.setRxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-//		//日合计场外受累电网小时（明细）
-//		pewp.setRcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-//		//日合计场外受累电网小时（明细）
-//		pewp.setRcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 
 		//日合计限电停机小时（明细）
-		pewp.setRxdtjxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计限电降出力小时（明细）
-		pewp.setRxdjclxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计场外受累电网小时（明细）
-		pewp.setRcwsldwxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计场外受累电网小时（明细）
-		pewp.setRcwsltqxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+//		//日合计限电停机小时（明细）
+//		pewp.setRxdtjxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计限电降出力小时（明细）
+//		pewp.setRxdjclxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计场外受累电网小时（明细）
+//		pewp.setRcwsldwxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+//		//日合计场外受累电网小时（明细）
+//		pewp.setRcwsltqxsmx(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 
 		//日合计通讯中断小时（明细）
 		pewp.setRtxzdxsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
@@ -376,6 +378,41 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 		pewp.setRlxxsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 
 
+		double sc=pewp.getRgzxsmx()+pewp.getRcnslgzxsmx()+pewp.getRjxxsmx()+pewp.getRcnsljxxsmx()+
+				pewp.getRdjxsmx()+pewp.getRqxjclxsmx()+pewp.getRsdtjxsmx()+pewp.getRbwxsmx()+
+				pewp.getRxdtjxsmx()+pewp.getRxdjclxsmx()+pewp.getRcwsldwxsmx()+pewp.getRcwsltqxsmx()+
+				pewp.getRtxzdxsmx()+pewp.getRlxxsmx();
+
+		if(sc>24)
+		{
+			double value=sc-24;
+			if(pewp.getRbwxsmx()>value)
+			{
+				pewp.setRbwxsmx(pewp.getRbwxsmx()-value);
+			}else if(pewp.getRdjxsmx()>value)
+			{
+				pewp.setRdjxsmx(pewp.getRdjxsmx()-value);
+			}else if(pewp.getRgzxsmx()>value)
+			{
+				pewp.setRgzxsmx(pewp.getRgzxsmx()-value);
+			}else if(pewp.getRjxxsmx()>value)
+			{
+				pewp.setRjxxsmx(pewp.getRjxxsmx()-value);
+			}else if(pewp.getRlxxsmx()>value)
+			{
+				pewp.setRlxxsmx(pewp.getRlxxsmx()-value);
+			}else if(pewp.getRtxzdxsmx()>value)
+			{
+				pewp.setRtxzdxsmx(pewp.getRtxzdxsmx()-value);
+			}
+		}else if(sc<24)
+		{
+			double value=24-sc;
+			pewp.setRdjxsmx(pewp.getRdjxsmx()+value);
+
+		}
+
+
 
 //*******************************************日信息统计*********************************************************/
 
@@ -409,24 +446,24 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setYbwxsmx(StringUtils.round(pepid.getYbwxsmx()+pewp.getRbwxsmx(),2));
 
 
-//			//月合计限电停机小时（明细）
-//			pewp.setYxdtjxsmx(StringUtils.round(pepid.getYxdtjxsmx()+pewp.getRxdtjxsmx(),2));
-//			//月合计限电降出力小时（明细）
-//			pewp.setYxdjclxsmx(StringUtils.round(pepid.getYxdjclxsmx()+pewp.getRxdjclxsmx(),2));
-//			//月合计场外受累电网小时（明细）
-//			pewp.setYcwsldwxsmx(StringUtils.round(pepid.getYcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
-//			//月合计场外受累电网小时（明细）
-//			pewp.setYcwsltqxsmx(StringUtils.round(pepid.getYcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
-
-
 			//月合计限电停机小时（明细）
-			pewp.setYxdtjxsmx(StringUtils.round(0,2));
+			pewp.setYxdtjxsmx(StringUtils.round(pepid.getYxdtjxsmx()+pewp.getRxdtjxsmx(),2));
 			//月合计限电降出力小时（明细）
-			pewp.setYxdjclxsmx(StringUtils.round(0,2));
+			pewp.setYxdjclxsmx(StringUtils.round(pepid.getYxdjclxsmx()+pewp.getRxdjclxsmx(),2));
 			//月合计场外受累电网小时（明细）
-			pewp.setYcwsldwxsmx(StringUtils.round(0,2));
+			pewp.setYcwsldwxsmx(StringUtils.round(pepid.getYcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
 			//月合计场外受累电网小时（明细）
-			pewp.setYcwsltqxsmx(StringUtils.round(0,2));
+			pewp.setYcwsltqxsmx(StringUtils.round(pepid.getYcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+
+
+//			//月合计限电停机小时（明细）
+//			pewp.setYxdtjxsmx(StringUtils.round(0,2));
+//			//月合计限电降出力小时（明细）
+//			pewp.setYxdjclxsmx(StringUtils.round(0,2));
+//			//月合计场外受累电网小时（明细）
+//			pewp.setYcwsldwxsmx(StringUtils.round(0,2));
+//			//月合计场外受累电网小时（明细）
+//			pewp.setYcwsltqxsmx(StringUtils.round(0,2));
 
 
 			//月合计通讯中断小时（明细）
@@ -465,24 +502,24 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setNsdtjxsmx(StringUtils.round(pepid.getNsdtjxsmx()+pewp.getRsdtjxsmx(),2));
 			//年合计性能小时（明细）
 			pewp.setNbwxsmx(StringUtils.round(pepid.getNbwxsmx()+pewp.getRbwxsmx(),2));
-//			//年合计限电停机小时（明细）
-//			pewp.setNxdtjxsmx(StringUtils.round(pepid.getNxdtjxsmx()+pewp.getRxdtjxsmx(),2));
-//			//年合计限电降出力小时（明细）
-//			pewp.setNxdjclxsmx(StringUtils.round(pepid.getNxdjclxsmx()+pewp.getRxdjclxsmx(),2));
-//			//年合计场外受累电网小时（明细）
-//			pewp.setNcwsldwxsmx(StringUtils.round(pepid.getNcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
-//			//年合计场外受累电网小时（明细）
-//			pewp.setNcwsltqxsmx(StringUtils.round(pepid.getNcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
-
-
 			//年合计限电停机小时（明细）
-			pewp.setNxdtjxsmx(StringUtils.round(0,2));
+			pewp.setNxdtjxsmx(StringUtils.round(pepid.getNxdtjxsmx()+pewp.getRxdtjxsmx(),2));
 			//年合计限电降出力小时（明细）
-			pewp.setNxdjclxsmx(StringUtils.round(0,2));
+			pewp.setNxdjclxsmx(StringUtils.round(pepid.getNxdjclxsmx()+pewp.getRxdjclxsmx(),2));
 			//年合计场外受累电网小时（明细）
-			pewp.setNcwsldwxsmx(StringUtils.round(0,2));
+			pewp.setNcwsldwxsmx(StringUtils.round(pepid.getNcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
 			//年合计场外受累电网小时（明细）
-			pewp.setNcwsltqxsmx(StringUtils.round(0,2));
+			pewp.setNcwsltqxsmx(StringUtils.round(pepid.getNcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+
+
+//			//年合计限电停机小时（明细）
+//			pewp.setNxdtjxsmx(StringUtils.round(0,2));
+//			//年合计限电降出力小时（明细）
+//			pewp.setNxdjclxsmx(StringUtils.round(0,2));
+//			//年合计场外受累电网小时（明细）
+//			pewp.setNcwsldwxsmx(StringUtils.round(0,2));
+//			//年合计场外受累电网小时（明细）
+//			pewp.setNcwsltqxsmx(StringUtils.round(0,2));
 
 			//年合计通讯中断小时（明细）
 			pewp.setNtxzdxsmx(StringUtils.round(pepid.getNtxzdxsmx()+pewp.getRtxzdxsmx(),2));
@@ -706,28 +743,57 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 
 
 
-		//日合计待机小时
-		pewp.setRdjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		//日合计故障停机小时
+		pewp.setRgztjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计维护停机小时
 		pewp.setRjxtjxs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		// 日合计待机小时
 		pewp.setRdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 		//日合计运行小时
 		pewp.setRyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-//		//日合计限电小时
-//		pewp.setRxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-
 		//日合计限电小时
-		pewp.setRxdxs(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+
 		//日合计通讯中断小时
 		pewp.setRtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-//		//日合计受累小时
-//		pewp.setRslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-
 		//日合计受累小时
-		pewp.setRslxs(new BigDecimal(0).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+		pewp.setRslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
 
 
+
+		double sc=pewp.getRdjxs()+pewp.getRgztjxs()+pewp.getRjxtjxs()+pewp.getRyxxs()+
+				pewp.getRxdxs()+pewp.getRtxzdxs()+pewp.getRslxs();
+
+		if(sc>24)
+		{
+			double value=sc-24;
+			if(pewp.getRyxxs()>value)
+			{
+				pewp.setRyxxs(pewp.getRyxxs()-value);
+			}else if(pewp.getRdjxs()>value)
+			{
+				pewp.setRdjxs(pewp.getRdjxs()-value);
+			}else if(pewp.getRjxtjxs()>value)
+			{
+				pewp.setRjxtjxs(pewp.getRjxtjxs()-value);
+			}else if(pewp.getRjxxsmx()>value)
+			{
+				pewp.setRjxxsmx(pewp.getRjxxsmx()-value);
+			}else if(pewp.getRgztjxs()>value)
+			{
+				pewp.setRgztjxs(pewp.getRgztjxs()-value);
+			}else if(pewp.getRxdxs()>value)
+			{
+				pewp.setRxdxs(pewp.getRxdxs()-value);
+			}
+		}else if(sc<24)
+		{
+			double value=24-sc;
+			pewp.setRyxxs(pewp.getRyxxs()+value);
+
+		}
 		//*******************************************日信息统计*********************************************************/
 
 		//*******************************************月信息统计*********************************************************/
@@ -748,16 +814,16 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setYgztjxs(StringUtils.round(pepid.getYgztjxs()+pewp.getRgztjxs(),2));
 			//月合计运行小时
 			pewp.setYyxxs(StringUtils.round(pepid.getYyxxs()+pewp.getRyxxs(),2));
-//			//月合计限电小时
-//			pewp.setYxdxs(StringUtils.round(pepid.getYxdxs()+pewp.getRxdxs(),2));
+			//月合计限电小时
+			pewp.setYxdxs(StringUtils.round(pepid.getYxdxs()+pewp.getRxdxs(),2));
 
 
 			//月合计限电小时
 			pewp.setYxdxs(StringUtils.round(0,2));
 			//月合计通讯中断小时
 			pewp.setYtxzdxs(StringUtils.round(pepid.getYtxzdxs()+pewp.getRtxzdxs(),2));
-//			//月合计受累小时
-//			pewp.setYslxs(StringUtils.round(pepid.getYslxs()+pewp.getRslxs(),2));
+			//月合计受累小时
+			pewp.setYslxs(StringUtils.round(pepid.getYslxs()+pewp.getRslxs(),2));
 
 			//月合计受累小时
 			pewp.setYslxs(StringUtils.round(0,2));
@@ -782,15 +848,15 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 			pewp.setNgztjxs(StringUtils.round(pepid.getNgztjxs()+pewp.getRgztjxs(),2));
 			//年合计运行小时
 			pewp.setNyxxs(StringUtils.round(pepid.getNyxxs()+pewp.getRyxxs(),2));
-//			//年合计限电小时
-//			pewp.setNxdxs(StringUtils.round(pepid.getNxdxs()+pewp.getRxdxs(),2));
+			//年合计限电小时
+			pewp.setNxdxs(StringUtils.round(pepid.getNxdxs()+pewp.getRxdxs(),2));
 
 			//年合计限电小时
 			pewp.setNxdxs(StringUtils.round(0,2));
 			//年合计通讯中断小时
 			pewp.setNtxzdxs(StringUtils.round(pepid.getNtxzdxs()+pewp.getRtxzdxs(),2));
-//			//年合计受累小时
-//			pewp.setNslxs(StringUtils.round(pepid.getNslxs()+pewp.getRslxs(),2));
+			//年合计受累小时
+			pewp.setNslxs(StringUtils.round(pepid.getNslxs()+pewp.getRslxs(),2));
 
 			//年合计受累小时
 			pewp.setNslxs(StringUtils.round(0,2));

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

@@ -238,10 +238,10 @@ public final class ExcelExport {
 
         if(StringUtils.notEmp(filename))
         {
-            //  StringBuilder sb=new StringBuilder("/usr/local/gyee/monitor/");
-            StringBuilder sb=new StringBuilder("d:\\");
+            StringBuilder sb=new StringBuilder("/usr/local/gyee/temprun/");
+          //  StringBuilder sb=new StringBuilder("d:\\powerdata\\");
             sb.append(filename);
-            sb.append(".xls");
+            sb.append(".csv");
 
             FileUtils.deleteFile(String.valueOf(sb));
 

realtime/generationXK-service/src/main/java/com/gyee/generation/util/math/PowerIntegration.java

@@ -20,14 +20,22 @@ public class PowerIntegration {
     // 计算电量
     public double calculateEnergy(Map<Integer, Double> powerData, double timeInterval) {
         double energy = 0.0;
-        for (int time = 0; time < powerData.size() - 1; time++) {
-            double power1 = powerData.get(time);
-            double power2 = powerData.get(time + 1);
-            double averagePower = (power1 + power2) / 2.0;
-            double timeIntervalHours = timeInterval;
-            double intervalEnergy = averagePower * timeIntervalHours;
-            energy += intervalEnergy;
+        try {
+
+
+            for (int time = 0; time < powerData.size() - 1; time++) {
+                double power1 = powerData.get(time);
+                double power2 = powerData.get(time + 1);
+                double averagePower = (power1 + power2) / 2.0;
+                double timeIntervalHours = timeInterval;
+                double intervalEnergy = averagePower * timeIntervalHours;
+                energy += intervalEnergy;
+            }
+        }catch (Exception e)
+        {
+            System.out.println("");
         }
+
         return energy;
     }
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/util/realtimesource/EdosUtil.java

@@ -269,60 +269,62 @@ public class EdosUtil implements IEdosUtil {
 
                     if(snapList.isEmpty())
                     {
-                        for (PointData snapItem : resultList) {
-                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
-                        }
+//                        for (PointData snapItem : resultList) {
+//                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+//                        }
                         getHistsnapSameTiem(point.getNemCode(), beginDate, pried, resultList);
                     }else
                     {
-                        for (PointData snapItem : snapList) {
-
-                            long subTime = snapItem.getPointTime() - pried;
-                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                            // 则代表该时间节点快照有效，否则为0
-                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
-                            if (point.getNemCode().startsWith("GF-")){
-                                rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
-                            }
-                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                            JSONObject jsonObjectSection = sectionResp.getBody();
 
-                            if (jsonObjectSection != null) {
-                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                                if (sectionlist.size() > 0) {
-                                    if(sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                        snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
-                                        resultList.add(snapItem);
-                                    }
-                                    else{
-                                        PointData data = new PointData();
-                                        data.setEdnaId(point.getNemCode());
-                                        data.setPointTime(snapItem.getPointTime());
-                                        data.setPointValue("0");
-                                        data.setPointName("1");
-                                        data.setPointValueInDouble(0.0);
-                                        resultList.add(data);
-                                    }
-                                } else {
-                                    PointData data = new PointData();
-                                    data.setEdnaId(point.getNemCode());
-                                    data.setPointTime(0l);
-                                    data.setPointValue("0");
-                                    data.setPointName("1");
-                                    data.setPointValueInDouble(0.0);
-                                    resultList.add(data);
-                                }
-                            } else {
-                                PointData data = new PointData();
-                                data.setEdnaId(point.getNemCode());
-                                data.setPointTime(0l);
-                                data.setPointValue("0");
-                                data.setPointName("1");
-                                data.setPointValueInDouble(0.0);
-                                resultList.add(data);
-                            }
-                        }
+                        resultList=snapList;
+//                        for (PointData snapItem : snapList) {
+//
+//                            long subTime = snapItem.getPointTime() - pried;
+//                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+//                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+//                            // 则代表该时间节点快照有效，否则为0
+//                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
+//                            if (point.getNemCode().startsWith("GF-")){
+//                                rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
+//                            }
+//                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+//                            JSONObject jsonObjectSection = sectionResp.getBody();
+//
+//                            if (jsonObjectSection != null) {
+//                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+//                                if (sectionlist.size() > 0) {
+//                                    if(sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+//                                        snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+//                                        resultList.add(snapItem);
+//                                    }
+//                                    else{
+//                                        PointData data = new PointData();
+//                                        data.setEdnaId(point.getNemCode());
+//                                        data.setPointTime(snapItem.getPointTime());
+//                                        data.setPointValue("0");
+//                                        data.setPointName("1");
+//                                        data.setPointValueInDouble(0.0);
+//                                        resultList.add(data);
+//                                    }
+//                                } else {
+//                                    PointData data = new PointData();
+//                                    data.setEdnaId(point.getNemCode());
+//                                    data.setPointTime(0l);
+//                                    data.setPointValue("0");
+//                                    data.setPointName("1");
+//                                    data.setPointValueInDouble(0.0);
+//                                    resultList.add(data);
+//                                }
+//                            } else {
+//                                PointData data = new PointData();
+//                                data.setEdnaId(point.getNemCode());
+//                                data.setPointTime(0l);
+//                                data.setPointValue("0");
+//                                data.setPointName("1");
+//                                data.setPointValueInDouble(0.0);
+//                                resultList.add(data);
+//                            }
+//                        }
                     }
 
 
@@ -587,61 +589,66 @@ public class EdosUtil implements IEdosUtil {
 
                     if(snapList.isEmpty())
                     {
-                        for (PointData snapItem : resultList) {
-                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
-                        }
+//                        for (PointData snapItem : resultList) {
+//                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+//                        }
                         getHistsnapSameTiem(point.getNemCode(), beginDate, pried, resultList);
-                    }else
+                    }
+                    else
                     {
-                        for (PointData snapItem : snapList) {
-                            long subTime = snapItem.getPointTime() - pried;
-                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
-                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
-                            // 则代表该时间节点快照有效，否则为0
-
-                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
-                             if (point.getNemCode().startsWith("GF-")){
-                                rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
-                            }
-
-                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-                            JSONObject jsonObjectSection = sectionResp.getBody();
+                        resultList=snapList;
 
-                            if (jsonObjectSection != null) {
-                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
-                                if (sectionlist.size() > 0) {
-                                    if(sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
-                                        snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
-                                        resultList.add(snapItem);
-                                    }
-                                    else{
-                                        PointData data = new PointData();
-                                        data.setEdnaId(point.getNemCode());
-                                        data.setPointTime(snapItem.getPointTime());
-                                        data.setPointValue("0");
-                                        data.setPointName("1");
-                                        data.setPointValueInDouble(0.0);
-                                        resultList.add(data);
-                                    }
-                                } else {
-                                    PointData data = new PointData();
-                                    data.setEdnaId(point.getNemCode());
-                                    data.setPointTime(0l);
-                                    data.setPointValue("0");
-                                    data.setPointName("1");
-                                    data.setPointValueInDouble(0.0);
-                                    resultList.add(data);
-                                }
-                            } else {
-                                PointData data = new PointData();
-                                data.setEdnaId(point.getNemCode());
-                                data.setPointTime(0l);
-                                data.setPointValue("0");
-                                data.setPointName("1");
-                                data.setPointValueInDouble(0.0);
-                                resultList.add(data);
-                            }
-                        }
+//
+//
+//                        for (PointData snapItem : snapList) {
+//                            long subTime = snapItem.getPointTime() - pried;
+//                            //查询时间区间的截面值(截面值为传入时间节点的上一个最近值，返回时间为值的真实时间)，
+//                            // 再进行比较，若截面值的时间戳在以快照时间节点前推一个单位的时间区间中，
+//                            // 则代表该时间节点快照有效，否则为0
+//
+//                            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
+//                             if (point.getNemCode().startsWith("GF-")){
+//                                rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + snapItem.getPointTime() ;
+//                            }
+//
+//                            ResponseEntity<JSONObject> sectionResp = restTemplate.getForEntity(rawUrl, JSONObject.class);
+//                            JSONObject jsonObjectSection = sectionResp.getBody();
+//
+//                            if (jsonObjectSection != null) {
+//                                List<PointData> sectionlist = JsonObjectHelper.phrasePointData(jsonObjectSection);
+//                                if (sectionlist.size() > 0) {
+//                                    if(sectionlist.get(0).getPointTime()<=snapItem.getPointTime()){
+//                                        snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+//                                        resultList.add(snapItem);
+//                                    }
+//                                    else{
+//                                        PointData data = new PointData();
+//                                        data.setEdnaId(point.getNemCode());
+//                                        data.setPointTime(snapItem.getPointTime());
+//                                        data.setPointValue("0");
+//                                        data.setPointName("1");
+//                                        data.setPointValueInDouble(0.0);
+//                                        resultList.add(data);
+//                                    }
+//                                } else {
+//                                    PointData data = new PointData();
+//                                    data.setEdnaId(point.getNemCode());
+//                                    data.setPointTime(0l);
+//                                    data.setPointValue("0");
+//                                    data.setPointName("1");
+//                                    data.setPointValueInDouble(0.0);
+//                                    resultList.add(data);
+//                                }
+//                            } else {
+//                                PointData data = new PointData();
+//                                data.setEdnaId(point.getNemCode());
+//                                data.setPointTime(0l);
+//                                data.setPointValue("0");
+//                                data.setPointName("1");
+//                                data.setPointValueInDouble(0.0);
+//                                resultList.add(data);
+//                            }
+//                        }
                     }
 
 
@@ -1641,16 +1648,30 @@ public class EdosUtil implements IEdosUtil {
 
         List<JSONObject> writeList = new ArrayList<>();
 
-        for (PointData entity : pointls) {
-            writeList.add(convertPointData(entity));
-        }
-        try {
-            String result = restTemplate.postForObject(url, writeList, String.class);
-        } catch (HttpClientErrorException exception) {
-            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
-                return;
-            } else {
-                throw exception;
+        int batchSize = 500; // 设置每次传输的批次大小
+
+        int totalSize = pointls.size();
+        int batchCount = totalSize % batchSize == 0 ? totalSize / batchSize : totalSize / batchSize + 1;
+
+        for (int i = 0; i < batchCount; i++) {
+            int startIndex = i * batchSize;
+            int endIndex = Math.min((i + 1) * batchSize, totalSize);
+            List<PointData> batch = pointls.subList(startIndex, endIndex);
+
+            List<JSONObject> batchWriteList = new ArrayList<>();
+            for (PointData entity : batch) {
+                batchWriteList.add(convertPointData(entity));
+            }
+
+            try {
+                String result = restTemplate.postForObject(url, batchWriteList, String.class);
+                // 处理返回的结果
+            } catch (HttpClientErrorException exception) {
+                if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                    throw new Exception("404请求错误");
+                } else {
+                    throw exception;
+                }
             }
         }
     }
@@ -1891,9 +1912,9 @@ public class EdosUtil implements IEdosUtil {
 
                     if(resultList.isEmpty())
                     {
-                        for (PointData snapItem : resultList) {
-                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
-                        }
+//                        for (PointData snapItem : resultList) {
+//                            snapItem.setPointValueInDouble(StringUtils.round(snapItem.getPointValueInDouble(),4));
+//                        }
                         getHistsnapSameTiem(pointid, beginDate, finalInterval, resultList);
                     }else
                     {

realtime/generationXK-service/src/main/resources/application-jn.yml

@@ -130,7 +130,7 @@ db:
 #  url2: http://127.0.0.1:8011/ts
 
 #参与计算的场站
-runWindpowerstation: SXJ_KGDL_DJY_FDC_STA
+runWindpowerstation: SXJ_KGDL_FS_GDC_STA
 #runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA
 #runWindpowerstation: SXJ_KGDL_DJY_FDC_STA,SXJ_KGDL_NJL_FDC_STA,SXJ_KGDL_YF_FDC_STA,SXJ_KGDL_YLZ_FDC_STA,SXJ_KGDL_XWT_FDC_STA,SXJ_KGDL_PTZ_FDC_STA,SXJ_KGDL_GJY_FDC_STA,SXJ_KGDL_BHB_FDC_STA,SXJ_KGDL_HSM_FDC_STA,SXJ_KGDL_YTY_FDC_STA,SXJ_KGDL_BHB3_FDC_STA,SXJ_KGDL_PDL_FDC_STA,SXJ_KGDL_ZK_FDC_STA
 #runWindpowerstation: SXJ_KGDL_SY_GDC_STA,SXJ_KGDL_JR_GDC_STA,SXJ_KGDL_FS_GDC_STA,SXJ_KGDL_HR_GDC_STA,SXJ_KGDL_YY_GDC_STA,SXJ_KGDL_PL_GDC_STA,SXJ_KGDL_YG_GDC_STA,SXJ_KGDL_YX_GDC_STA,SXJ_KGDL_TZ_GDC_STA,SXJ_KGDL_TL_GDC_STA,SXJ_KGDL_SY_GDC_STA

realtime/generationXK-service/src/test/java/com/gyee/generation/HealthTest.java

@@ -274,9 +274,9 @@ public class HealthTest {
 //        begin=new Date();
 //        System.out.println("设备数据和场站数据风资源调度程序执行开始!。。。。。。");
 //        WpwindDayInfoService wpwindDayInfoService= SpringUtils.getBean("wpwindDayInfoService");
-//        WtwindDayInfoService wtwindDayInfoService= SpringUtils.getBean("wtwindDayInfoService");
+//        //WtwindDayInfoService wtwindDayInfoService= SpringUtils.getBean("wtwindDayInfoService");
 //        wpwindDayInfoService.calWpwindDayInfo(c.getTime());
-//        wtwindDayInfoService.calWtwindDayInfo(c.getTime());
+//       // wtwindDayInfoService.calWtwindDayInfo(c.getTime());
 //        end=new Date();
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println("设备数据和场站数据风资源调度程序执行结束!。。。。。。");

realtime/generationXK-service/src/test/java/com/gyee/generation/RealTest.java

@@ -17,6 +17,7 @@ public class RealTest {
         CycleCalculationService cycleCalculationService= SpringUtils.getBean("cycleCalculationService");
 
         CalculationService calculationService= SpringUtils.getBean("calculationService");
+        CycleCalculationRebuildService cycleCalculationRebuildService= SpringUtils.getBean("cycleCalculationRebuildService");
         RealtimeService realtimeService= SpringUtils.getBean("realtimeService");
 
         RegionCalreService regionCalreService= SpringUtils.getBean("regionCalreService");
@@ -28,24 +29,27 @@ public class RealTest {
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();
 //
-//        c.set(Calendar.DAY_OF_MONTH,19);
+        c.set(Calendar.DAY_OF_MONTH,1);
+
+        c.set(Calendar.HOUR_OF_DAY, 23);
+        c.set(Calendar.MINUTE, 59);
+        c.set(Calendar.SECOND, 59);
+
 
-//        c.set(Calendar.HOUR_OF_DAY, 9);
-//        c.set(Calendar.MINUTE, 0);
-//        c.set(Calendar.SECOND, 0);
-//        c.set(Calendar.MILLISECOND, 0);
 //
-//        c.setTime(DateUtils.truncate(c.getTime()));
+        c.setTime(DateUtils.truncate(c.getTime()));
 
         begin=new Date();
         System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+
+        cycleCalculationRebuildService.saveCyle(c.getTime());
 //        for(int i=0;i<19;i++)
 //        {
 
 //        statusService.middleStatusReal();
-//        statusService.startStatusReal();
+//       statusService.startStatusReal();
 //        calculationService.calWp();
-        cycleCalculationService.saveCyle();
+//        cycleCalculationService.saveCyle();
 
         c.add(Calendar.DAY_OF_MONTH,1);