场站计算服务修改

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

@@ -24,84 +24,84 @@ public class GenerationMain {
 //        Date begin = null;
 //        Date end = null;
 //        c.setTime(DateUtils.truncate(c.getTime()));
-//        c.set(Calendar.DAY_OF_MONTH, 23);
-////        c.set(Calendar.HOUR_OF_DAY, 23);
-////        c.set(Calendar.MINUTE, 59);
-////        c.set(Calendar.SECOND, 59);
-//////
-//////
-//////
-//////
+//        c.set(Calendar.DAY_OF_MONTH, 3);
+//        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 < 5; 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");
-//////
-//////            PowerCurveFittingByTimeService powerCurveFittingByTimeService = SpringUtils.getBean("powerCurveFittingByTimeService");
-//////             System.out.println("日序执行开始!........");
-//////            powerCurveFittingByTimeService.cureFittingDay(c.getTime(), "SXJ_KGDL_XWT_FDC_STA");
-//////             System.out.println("日处理完成!........");
-//////
-//////             System.out.println("月序执行开始!........");
-//////            powerCurveFittingByTimeService.cureFittingMonth(c.getTime(), "0", "SXJ_KGDL_XWT_FDC_STA");
-//////             System.out.println("月处理完成!........");
-//////
-//////             System.out.println("年序执行开始!........");
-//////            powerCurveFittingByTimeService.cureFittingYear(c.getTime(), "SXJ_KGDL_XWT_FDC_STA");
-//////             System.out.println("年处理完成!........");
-//////
-////////            CycleCalculationRebuildService cycleCalculationRebuildService = SpringUtils.getBean("cycleCalculationRebuildService");
+//        for (int i = 0; i < 6; 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");
 ////////
-////////            cycleCalculationRebuildService.saveCyle(c.getTime());
+////////            PowerCurveFittingByTimeService powerCurveFittingByTimeService = SpringUtils.getBean("powerCurveFittingByTimeService");
+////////             System.out.println("日序执行开始!........");
+////////            powerCurveFittingByTimeService.cureFittingDay(c.getTime(), "SXJ_KGDL_XWT_FDC_STA");
+////////             System.out.println("日处理完成!........");
 ////////
-//////            CycleCalculationService cycleCalculationService = SpringUtils.getBean("cycleCalculationService");
-//////
-//////            cycleCalculationService.saveCyle();
-////////            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-////////            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
-////////            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+////////             System.out.println("月序执行开始!........");
+////////            powerCurveFittingByTimeService.cureFittingMonth(c.getTime(), "0", "SXJ_KGDL_XWT_FDC_STA");
+////////             System.out.println("月处理完成!........");
 ////////
-////////            windPowerInfo1Service.calLineInfoDay(c.getTime());
-////////            windPowerInfo1Service.calProjectInfoDay(c.getTime());
-////////            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
-////////            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
-////////            windPowerInfo1Service.calRegionInfoDay(c.getTime());
+////////             System.out.println("年序执行开始!........");
+////////            powerCurveFittingByTimeService.cureFittingYear(c.getTime(), "SXJ_KGDL_XWT_FDC_STA");
+////////             System.out.println("年处理完成!........");
 ////////
-////////            windPowerInfo2Service.calLineInfoDay(c.getTime());
-////////            windPowerInfo2Service.calProjectInfoDay(c.getTime());
-////////            windPowerInfo2Service.calWindpowerInfoDay(c.getTime());
-////////            windPowerInfo2Service.calCompanyInfoDay(c.getTime());
-////////            windPowerInfo2Service.calRegionInfoDay(c.getTime());
+//////////            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());
 ////////
 ////////
-////////            windPowerInfo3Service.calLineInfoDay(c.getTime());
-////////            windPowerInfo3Service.calProjectInfoDay(c.getTime());
-////////            windPowerInfo3Service.calWindpowerInfoDay(c.getTime());
-////////            windPowerInfo3Service.calCompanyInfoDay(c.getTime());
-////////            windPowerInfo3Service.calRegionInfoDay(c.getTime());
+//////        ShutdownnewService shutdownnewService = SpringUtils.getBean("shutdownnewService");
+//////         shutdownnewService.execShutdown(c.getTime());
 //////
 //////
-////        ShutdownnewService shutdownnewService = SpringUtils.getBean("shutdownnewService");
-////         shutdownnewService.execShutdown(c.getTime());
-////
-//
 //        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
 //        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
-//
-//            c.add(Calendar.DAY_OF_MONTH, 1);
+////
+////            c.add(Calendar.DAY_OF_MONTH, 1);
 //            System.out.println(end);
 //            System.out.println("完成一次!。。。。。。");
 //        }

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

@@ -1,88 +1,88 @@
-//package com.gyee.generation.config;
-//
-//
-//import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
-//import org.slf4j.Logger;
-//import org.slf4j.LoggerFactory;
-//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;
-//
-///**
-// * xxl-job config
-// *
-// * @author xuxueli 2017-04-28
-// */
-//
-//
-//@Configuration
-////@PropertySource("classpath:xxl-job-executor.properties")
+package com.gyee.generation.config;
+
+
+import com.xxl.job.core.executor.impl.XxlJobSpringExecutor;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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;
+
+/**
+ * xxl-job config
+ *
+ * @author xuxueli 2017-04-28
+ */
+
+
+@Configuration
+@PropertySource("classpath:xxl-job-executor.properties")
 //@PropertySource("classpath:xxl-job-executor2.properties")
-////@PropertySource("classpath:xxl-job-executor3.properties")
-////@PropertySource("classpath:xxl-job-executor4.properties")
-////@PropertySource("classpath:xxl-job-executor5.properties")
-////@PropertySource("classpath:xxl-job-executorWPLY.properties")
-////@PropertySource("classpath:xxl-job-executorRG.properties")
-////@PropertySource("classpath:xxl-job-executorJN.properties")
-////
-////@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-executorGF000.properties")
-////@PropertySource("classpath:xxl-job-executorGF001.properties")
-////@PropertySource("classpath:xxl-job-executorGF002.properties")
-////@PropertySource("classpath:xxl-job-executorGF003.properties")
-////@PropertySource("classpath:xxl-job-executorGF004.properties")
-////@PropertySource("classpath:xxl-job-executorGF005.properties")
-////@PropertySource("classpath:xxl-job-executorGF006.properties")
-//
-////@PropertySource("classpath:xxl-job-region.properties")
-//public class XxlJobConfig implements EnvironmentAware {
-//    private Environment env;
-//
-//
-//    @Override
-//    public void setEnvironment(Environment environment) {
-//        this.env = environment;
-//    }
-//
-//    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
-//
-//
-//    @Bean
-//    public XxlJobSpringExecutor xxlJobExecutor() {
-//        logger.info(">>>>>>>>>>> xxl-job config init.");
-//        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
-//        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
-//        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
-//        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
-//        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
-//        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
-//        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
-//        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
-//        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
-//        return xxlJobSpringExecutor;
-//    }
-//
-//    /**
-//     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
-//     *
-//     *      1、引入依赖：
-//     *          <dependency>
-//     *             <groupId>org.springframework.cloud</groupId>
-//     *             <artifactId>spring-cloud-commons</artifactId>
-//     *             <version>${version}</version>
-//     *         </dependency>
-//     *
-//     *      2、配置文件，或者容器启动变量
-//     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
-//     *
-//     *      3、获取IP
-//     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
-//     */
-//
+//@PropertySource("classpath:xxl-job-executor3.properties")
+//@PropertySource("classpath:xxl-job-executor4.properties")
+//@PropertySource("classpath:xxl-job-executor5.properties")
+//@PropertySource("classpath:xxl-job-executorWPLY.properties")
+//@PropertySource("classpath:xxl-job-executorRG.properties")
+//@PropertySource("classpath:xxl-job-executorJN.properties")
 //
-//}
+//@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-executorGF000.properties")
+//@PropertySource("classpath:xxl-job-executorGF001.properties")
+//@PropertySource("classpath:xxl-job-executorGF002.properties")
+//@PropertySource("classpath:xxl-job-executorGF003.properties")
+//@PropertySource("classpath:xxl-job-executorGF004.properties")
+//@PropertySource("classpath:xxl-job-executorGF005.properties")
+//@PropertySource("classpath:xxl-job-executorGF006.properties")
+
+//@PropertySource("classpath:xxl-job-region.properties")
+public class XxlJobConfig implements EnvironmentAware {
+    private Environment env;
+
+
+    @Override
+    public void setEnvironment(Environment environment) {
+        this.env = environment;
+    }
+
+    private Logger logger = LoggerFactory.getLogger(XxlJobConfig.class);
+
+
+    @Bean
+    public XxlJobSpringExecutor xxlJobExecutor() {
+        logger.info(">>>>>>>>>>> xxl-job config init.");
+        XxlJobSpringExecutor xxlJobSpringExecutor = new XxlJobSpringExecutor();
+        xxlJobSpringExecutor.setAdminAddresses(env.getProperty("xxl.job.admin.addresses"));
+        xxlJobSpringExecutor.setAppname(env.getProperty("xxl.job.executor.appname"));
+        xxlJobSpringExecutor.setAddress(env.getProperty("xxl.job.executor.address"));
+        xxlJobSpringExecutor.setIp(env.getProperty("xxl.job.executor.ip"));
+        xxlJobSpringExecutor.setPort(Integer.parseInt(env.getProperty("xxl.job.executor.port")));
+        xxlJobSpringExecutor.setAccessToken(env.getProperty("xxl.job.accessToken"));
+        xxlJobSpringExecutor.setLogPath(env.getProperty("xxl.job.executor.logpath"));
+        xxlJobSpringExecutor.setLogRetentionDays(Integer.parseInt(env.getProperty("xxl.job.executor.logretentiondays")));
+        return xxlJobSpringExecutor;
+    }
+
+    /**
+     * 针对多网卡、容器内部署等情况，可借助 "spring-cloud-commons" 提供的 "InetUtils" 组件灵活定制注册IP；
+     *
+     *      1、引入依赖：
+     *          <dependency>
+     *             <groupId>org.springframework.cloud</groupId>
+     *             <artifactId>spring-cloud-commons</artifactId>
+     *             <version>${version}</version>
+     *         </dependency>
+     *
+     *      2、配置文件，或者容器启动变量
+     *          spring.cloud.inetutils.preferred-networks: 'xxx.xxx.xxx.'
+     *
+     *      3、获取IP
+     *          String ip_ = inetUtils.findFirstNonLoopbackHostInfo().getIpAddress();
+     */
+
+
+}

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

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.alibaba.fastjson.TypeReference;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.vo.CurveType;
 import com.gyee.generation.service.InputOrOutPutService;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.service.realtimelibrary.TheoreticalPowerService;
@@ -47,6 +48,9 @@ public class CacheContext implements CommandLineRunner {
     private IProEconWtPowerCurveFittingService proEconWtPowerCurveFittingService;
 
     @Resource
+    private IProEconWtCurveFittingMonthService proEconWtCurveFittingMonthService;
+
+    @Resource
     private IProBasicWindturbinePowerService proBasicWindturbinePowerService;
     @Resource
     private RedisService redisService;
@@ -147,6 +151,8 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicModelPowerRd> theoreticalPowerList=new ArrayList<>();
     public static Map<String, Map<Double,ProBasicModelPowerRd>> theoreticalPowerMap = new HashMap<>(); //理论，保证功率
     public static Map<String, Map<Double,ProEconWtPowerCurveFitting>> curveFittingPowerMap = new HashMap<>(); //自算，最优功率
+
+    public static Map<String, Map<Double,ProEconWtCurveFittingMonth>> curveFittingMonthMap = new HashMap<>(); //自算，最
     public static Map<String,List<ProBasicStatusPoint>> statusMap = new HashMap<>();
     public static Map<String,Map<String, ProBasicPowerstationPoint>> wspointmap =new HashMap<>();
     public static Map<String,Map<String, ProBasicEquipmentPoint>> zlpointmap =new HashMap<>();
@@ -564,18 +570,46 @@ public class CacheContext implements CommandLineRunner {
         statusMap = JSONObject.parseObject(sszzt, new TypeReference<Map<String,List<ProBasicStatusPoint>>>() {
         });
 
-        List<ProEconWtPowerCurveFitting> econWtPowerCurveFittings = proEconWtPowerCurveFittingService.list();
-        if (StringUtils.isNotNull(econWtPowerCurveFittings)){
-            econWtPowerCurveFittings.stream().forEach(curveFitting->{
-                if (curveFittingPowerMap.containsKey(curveFitting.getWindturbineId())){
-                    curveFittingPowerMap.get(curveFitting.getWindturbineId()).put(curveFitting.getSpeed(),curveFitting);
-                }else {
-                    Map<Double,ProEconWtPowerCurveFitting> powerMap = new HashMap<>();
-                    powerMap.put(curveFitting.getSpeed(),curveFitting);
-                    curveFittingPowerMap.put(curveFitting.getWindturbineId(),powerMap);
-                }
-            });
-        }
+//        List<ProEconWtPowerCurveFitting> econWtPowerCurveFittings = proEconWtPowerCurveFittingService.list();
+//        if (StringUtils.isNotNull(econWtPowerCurveFittings)){
+//            econWtPowerCurveFittings.stream().forEach(curveFitting->{
+//                if (curveFittingPowerMap.containsKey(curveFitting.getWindturbineId())){
+//                    curveFittingPowerMap.get(curveFitting.getWindturbineId()).put(curveFitting.getSpeed(),curveFitting);
+//                }else {
+//                    Map<Double,ProEconWtPowerCurveFitting> powerMap = new HashMap<>();
+//                    powerMap.put(curveFitting.getSpeed(),curveFitting);
+//                    curveFittingPowerMap.put(curveFitting.getWindturbineId(),powerMap);
+//                }
+//            });
+//        }
+
+
+
+
+        wtls.forEach(wt->{
+
+            if (redisService.hasKey(CurveType.monthCurve.id+"_"+wt.getId())){
+                String cp0String = redisService.get(CurveType.monthCurve.id+"_"+wt.getId());
+                List<ProEconWtCurveFittingMonth>   powerList = JSONObject.parseObject(cp0String, new TypeReference< List<ProEconWtCurveFittingMonth>>() {
+                });
+                    if(!powerList.isEmpty())
+                    {
+                        powerList.stream().forEach(curveFitting->{
+                            if (curveFittingMonthMap.containsKey(curveFitting.getWindturbineId())){
+                                curveFittingMonthMap.get(curveFitting.getWindturbineId()).put(curveFitting.getSpeed(),curveFitting);
+                            }else {
+                                Map<Double,ProEconWtCurveFittingMonth> powerMap = new HashMap<>();
+                                powerMap.put(curveFitting.getSpeed(),curveFitting);
+                                curveFittingMonthMap.put(curveFitting.getWindturbineId(),powerMap);
+                            }
+                        });
+                    }
+
+            }
+
+
+        });
+
         for (int i = 0; i < 9; i++) {
             Set<String> keys = redisService.keys(i);
 

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

@@ -72,9 +72,10 @@ public class EquipmentInfo2Service {
         Map<String, ProEconEquipmentInfoDay2> pep2map=new HashMap<>();
         Calendar cl=Calendar.getInstance();
         cl.setTime(recordDate);
-        cl.add(Calendar.DAY_OF_MONTH,-1);
+//
         if(cl.get(Calendar.DAY_OF_MONTH)!=1)
         {
+            cl.add(Calendar.DAY_OF_MONTH,-1);
             QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("record_date",cl.getTime());
             List<ProEconEquipmentInfoDay2> pep2ls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
@@ -90,7 +91,7 @@ public class EquipmentInfo2Service {
 
         List<String> wpls=new ArrayList<>();
         List<ProEconEquipmentInfoDay2> dayls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
+        final CountDownLatch latch = new CountDownLatch(CacheContext.wtls.size());
         for(ProBasicEquipment wt:CacheContext.wtls)
         {
             if(!wpls.contains(wt.getWindpowerstationId()))

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

@@ -79,9 +79,10 @@ public class EquipmentInfo3Service {
         Map<String,ProEconEquipmentInfoDay3> pep3map=new HashMap<>();
         Calendar cl=Calendar.getInstance();
         cl.setTime(recordDate);
-        cl.add(Calendar.DAY_OF_MONTH,-1);
+
         if(cl.get(Calendar.DAY_OF_MONTH)!=1)
         {
+           cl.add(Calendar.DAY_OF_MONTH,-1);
             QueryWrapper<ProEconEquipmentInfoDay3> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("record_date",cl.getTime());
             List<ProEconEquipmentInfoDay3> pep3ls = proEconEquipmentInfoDay3Service.list(queryWrapper2);

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

@@ -114,9 +114,10 @@ public class EquipmentInfo4Service {
         Map<String,ProEconEquipmentInfoDay4> pep4map=new HashMap<>();
         Calendar cl=Calendar.getInstance();
         cl.setTime(recordDate);
-        cl.add(Calendar.DAY_OF_MONTH,-1);
+
         if(cl.get(Calendar.DAY_OF_MONTH)!=1)
         {
+            cl.add(Calendar.DAY_OF_MONTH,-1);
             QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper2 = new QueryWrapper<>();
             queryWrapper2.eq("record_date",cl.getTime());
             List<ProEconEquipmentInfoDay2> pep2ls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
@@ -156,7 +157,7 @@ public class EquipmentInfo4Service {
         Map<String, ProEconInOrOutSpeedTotal> peioomap = new HashMap<>();
 
         QueryWrapper<ProEconInOrOutSpeedTotal> queryWrapper2 = new QueryWrapper<>();
-        queryWrapper2.eq("record_date",begin);
+        queryWrapper2.eq("record_date",lastDay);
 
         List<ProEconInOrOutSpeedTotal> peioostls = proEconInOrOutSpeedTotalService.list(queryWrapper2);
 //                .stream().filter(i ->
@@ -335,7 +336,7 @@ public class EquipmentInfo4Service {
         List<ProEconEquipmentInfoDay4> templs=new ArrayList<>();
         for(ProEconEquipmentInfoDay4 vo:dayls)
         {
-            if(StringUtils.notEmp(vo.getWindturbineId()))
+            if(StringUtils.notEmp(vo) && StringUtils.notEmp(vo.getWindturbineId()))
             {
                 templs.add(vo);
                 if(templs.size()==1000)

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

@@ -348,8 +348,8 @@ public class PowerCurveFittingByTimeService {
     }
 
     public void cureFittingMonth(Date recordDate,String type,String wpId) throws Exception {
-        //日期变为昨天
-        Date end = DateUtils.addDays(DateUtils.truncate(recordDate), -1);
+        //日期变为下一天
+        Date end = DateUtils.addDays(DateUtils.truncate(recordDate), 1);
 
         Calendar c = Calendar.getInstance();
         c.setTime(recordDate);
@@ -374,7 +374,7 @@ public class PowerCurveFittingByTimeService {
         proEconCurveFittMonthMainService.deleteProEconCurveFittMonthMainFByMonth(String.valueOf(day_year),String.valueOf(day_month), wtIds);
         proEconCurveFittMonthSubService.deleteProEconCurveFittMonthSubFByMonth(String.valueOf(day_year),String.valueOf(day_month),wtIds);
         c.set(Calendar.DAY_OF_MONTH, 1);
-        Date begin = c.getTime();
+        Date begin = DateUtils.truncate(c.getTime());
 
         //上个月
         c.setTime(DateUtils.addMonths(begin, -1));
@@ -659,7 +659,7 @@ public class PowerCurveFittingByTimeService {
 
     public void cureFittingYear(Date recordDate,String wpId) throws Exception {
         //日期变为昨天
-        Date end = DateUtils.addDays(DateUtils.truncate(recordDate), -1);
+        Date end = DateUtils.addDays(DateUtils.truncate(recordDate), 1);
 
         Calendar c = Calendar.getInstance();
 

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

@@ -1,14 +1,13 @@
 package com.gyee.generation.service;//package com.gyee.generation.service;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.common.contant.ContantXk;
-import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.model.vo.CompanyType;
 import com.gyee.generation.model.vo.Location;
 import com.gyee.generation.model.vo.WpType;
+import com.gyee.generation.service.auto.IProEconEquipmentInfoDay2Service;
 import com.gyee.generation.service.auto.IProEconPowerstationInfoDay2Service;
 import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
@@ -16,8 +15,6 @@ import com.gyee.generation.util.statisticcs.Initial;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
-import java.math.BigDecimal;
-import java.math.RoundingMode;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -31,7 +28,8 @@ public class WindPowerInfo2Service {
     @Resource
     private IProEconPowerstationInfoDay2Service proEconPowerstationInfoDay2Service;
 
-
+    @Resource
+    private IProEconEquipmentInfoDay2Service proEconEquipmentInfoDay2Service;
     /**
      * 计算区域日信息
      */
@@ -400,6 +398,30 @@ public class WindPowerInfo2Service {
 
 
 
+
+        Map<String,List<ProEconEquipmentInfoDay2>> pep2map=new HashMap<>();
+        QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("record_date",DateUtils.truncate(recordDate));
+        List<ProEconEquipmentInfoDay2> pep1ls = proEconEquipmentInfoDay2Service.list(queryWrapper1);
+        if(!pep1ls.isEmpty())
+        {
+            for(ProEconEquipmentInfoDay2 pep:pep1ls)
+            {
+                if(pep2map.containsKey(pep.getWindpowerstationId()))
+                {
+                    List<ProEconEquipmentInfoDay2> pepls=pep2map.get(pep.getWindpowerstationId());
+                    pepls.add(pep);
+                }else
+                {
+                    List<ProEconEquipmentInfoDay2> pepls=new ArrayList<>();
+                    pepls.add(pep);
+                    pep2map.put(pep.getWindpowerstationId(),pepls);
+                }
+
+            }
+        }
+
+
         List<String> wpls=new ArrayList<>();
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicPowerstation wp : CacheContext.wpls) {
@@ -436,9 +458,9 @@ public class WindPowerInfo2Service {
 //                            )
 //                            .collect(Collectors.toList());
                 }
-                calDetiall(pewp, end, begin, CacheContext.wpwtmap.get(wp.getId()), pepidls);
+                calDetiall(pewp, wp.getId(), pep2map);
 
-                calSimple(pewp, end, begin, CacheContext.wpwtmap.get(wp.getId()), pepidls);
+                calSimple(pewp, wp.getId(), pep2map);
 //*******************************************年信息统计*********************************************************/
 //                wpinfodayls.add(pewp);
                 dayls.add(pewp);
@@ -497,6 +519,28 @@ public class WindPowerInfo2Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
+
+        Map<String,List<ProEconEquipmentInfoDay2>> pep2map=new HashMap<>();
+        QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("record_date",DateUtils.truncate(recordDate));
+        List<ProEconEquipmentInfoDay2> pep1ls = proEconEquipmentInfoDay2Service.list(queryWrapper1);
+        if(!pep1ls.isEmpty())
+        {
+            for(ProEconEquipmentInfoDay2 pep:pep1ls)
+            {
+                if(pep2map.containsKey(pep.getProjectId()))
+                {
+                    List<ProEconEquipmentInfoDay2> pepls=pep2map.get(pep.getProjectId());
+                    pepls.add(pep);
+                }else
+                {
+                    List<ProEconEquipmentInfoDay2> pepls=new ArrayList<>();
+                    pepls.add(pep);
+                    pep2map.put(pep.getProjectId(),pepls);
+                }
+
+            }
+        }
         List<String > pjls=new ArrayList<>();
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
         for (ProBasicProject pj : CacheContext.pjls) {
@@ -537,8 +581,11 @@ public class WindPowerInfo2Service {
 //                        )
 //                        .collect(Collectors.toList());
             }
-            calDetiall(pewp, end, begin, CacheContext.pjwtmap.get(pj.getId()), pepidls);
-            calSimple(pewp, end, begin, CacheContext.pjwtmap.get(pj.getId()), pepidls);
+
+
+            calDetiall(pewp, pj.getId(), pep2map);
+
+            calSimple(pewp, pj.getId(), pep2map);
 
             dayls.add(pewp);
             // proEconPowerstationInfoDay2Service.save(pewp);
@@ -595,6 +642,27 @@ public class WindPowerInfo2Service {
 
         Date begin = DateUtils.truncate(c.getTime());
 
+        Map<String,List<ProEconEquipmentInfoDay2>> pep2map=new HashMap<>();
+        QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper1 = new QueryWrapper<>();
+        queryWrapper1.eq("record_date",DateUtils.truncate(recordDate));
+        List<ProEconEquipmentInfoDay2> pep1ls = proEconEquipmentInfoDay2Service.list(queryWrapper1);
+        if(!pep1ls.isEmpty())
+        {
+            for(ProEconEquipmentInfoDay2 pep:pep1ls)
+            {
+                if(pep2map.containsKey(pep.getLineId()))
+                {
+                    List<ProEconEquipmentInfoDay2> pepls=pep2map.get(pep.getLineId());
+                    pepls.add(pep);
+                }else
+                {
+                    List<ProEconEquipmentInfoDay2> pepls=new ArrayList<>();
+                    pepls.add(pep);
+                    pep2map.put(pep.getLineId(),pepls);
+                }
+
+            }
+        }
 
         List<String > lnls=new ArrayList<>();
         List<ProEconPowerstationInfoDay2> dayls=new ArrayList<>();
@@ -641,8 +709,9 @@ public class WindPowerInfo2Service {
 //                        )
 //                        .collect(Collectors.toList());
             }
-            calDetiall(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
-            calSimple(pewp, end, begin, CacheContext.lnwtmap.get(ln.getId()), pepidls);
+            calDetiall(pewp, ln.getId(), pep2map);
+
+            calSimple(pewp, ln.getId(), pep2map);
             dayls.add(pewp);
             // proEconPowerstationInfoDay2Service.save(pewp);
             if(CacheContext.pjmap.containsKey(ln.getProjectId()))
@@ -690,7 +759,7 @@ public class WindPowerInfo2Service {
 //        proEconPowerstationInfoDay2Service.saveBatch(dayls);
     }
 
-    private void calDetiall(ProEconPowerstationInfoDay2 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay2> pepidls) throws Exception {
+    private void calDetiall(ProEconPowerstationInfoDay2 pewp, String id,Map<String,List<ProEconEquipmentInfoDay2>> pep2map) throws Exception {
         //        //                0	待机
 //                1	手动停机
 //                2	正常发电
@@ -723,271 +792,166 @@ public class WindPowerInfo2Service {
         double txzdsc = 0;//通讯中断时长
         double sblxsc = 0;//设备离线时长
 
-        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
-
-        if(!wtls.isEmpty())
-        {
-            for (ProBasicEquipment wt : wtls) {
-
-                lastState = -1;//上一分钟状态
-                Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
-                if (aimap.containsKey(ContantXk.MXZT)) {
-
-                    ProBasicEquipmentPoint point = aimap.get(ContantXk.MXZT);
-                    //按照分钟时间进行统计状态快照值
-                    List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
-                    if (!pointls.isEmpty()) {
-                        for (PointData po : pointls) {
-
-                            if (po.getPointValueInDouble() == 0) {
-
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-                                //待机时长加1分钟
-                                djsc++;
-                            } else if (po.getPointValueInDouble() == 1) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //手动停机时长加1分钟
-                                sdtjsc++;
-                            } else if (po.getPointValueInDouble() == 2) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-                                //正常发电时长加1分钟
-                                zcfdsc++;
-                            } else if (po.getPointValueInDouble() == 3) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //发电降出力时长加1分钟
-                                fdjclsc++;
-                            } else if (po.getPointValueInDouble() == 4) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //故障时长加1分钟
-                                gzsc++;
-                            } else if (po.getPointValueInDouble() == 5) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //故障受累时长加1分钟
-                                gzslsc++;
-                            } else if (po.getPointValueInDouble() == 6) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //检修时长加1分钟
-                                jxsc++;
-                            } else if (po.getPointValueInDouble() == 7) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //检修受累时长加1分钟
-                                jxslsc++;
-                            } else if (po.getPointValueInDouble() == 8) {
-                                if (lastState != po.getPointValueInDouble()) {
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //限电降出力时长加1分钟
-                                xdjclsc++;
-                            } else if (po.getPointValueInDouble() == 9) {
-                                if (lastState != po.getPointValueInDouble()) {
-
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //限电停机时长加1分钟
-                                xdtjsc++;
-                            } else if (po.getPointValueInDouble() == 10) {
-                                if (lastState != po.getPointValueInDouble()) {
-
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-
-                                //电网受累时长加1分钟
-                                dwslsc++;
-                            } else if (po.getPointValueInDouble() == 11) {
-                                if (lastState != po.getPointValueInDouble()) {
-
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-                                //环境受累时长加1分钟
-                                hjslsc++;
-                            } else if (po.getPointValueInDouble() == 12) {
-                                if (lastState != po.getPointValueInDouble()) {
-
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
-
-                                }
-                                //通讯中断时长加1分钟
-                                txzdsc++;
-                            } else if (po.getPointValueInDouble() == 13) {
-                                if (lastState != po.getPointValueInDouble()) {
-
-                                    //将当前状态保存到上一分钟状态
-                                    lastState = po.getPointValueInDouble();
+        if (pep2map.containsKey(id)) {
+            List<ProEconEquipmentInfoDay2> pep2ls = pep2map.get(id);
 
-                                }
-
-                                //设备离线时长加1分钟
-                                sblxsc++;
-                            }
-
-                        }
-
-                    }
+            if (!pep2ls.isEmpty()) {
+                DoubleSummaryStatistics summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRgzxsmx).summaryStatistics();
+                //日合计故障小时（明细）
+                pewp.setRhjgzxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计场内受累故障小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRcnslgzxsmx).summaryStatistics();
+                pewp.setRhjcnslgzxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计检修小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRjxxsmx).summaryStatistics();
+                pewp.setRhjjxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计场内受累检修小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRcnsljxxsmx).summaryStatistics();
+                pewp.setRhjcnsljxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计待机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRdjxsmx).summaryStatistics();
+                pewp.setRhjdjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计缺陷降出力小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRqxjclxsmx).summaryStatistics();
+                pewp.setRhjqxjclxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计手动停机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRsdtjxsmx).summaryStatistics();
+                pewp.setRhjsdtjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计性能小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRbwxsmx).summaryStatistics();
+                pewp.setRhjbwxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计限电停机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRxdtjxsmx).summaryStatistics();
+                pewp.setRhjxdtjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计限电降出力小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRxdjclxsmx).summaryStatistics();
+                pewp.setRhjxdjclxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计场外受累电网小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRcwsldwxsmx).summaryStatistics();
+                pewp.setRhjcwsldwxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计场外受累电网小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRcwsltqxsmx).summaryStatistics();
+                pewp.setRhjcwsltqxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计通讯中断小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRtxzdxsmx).summaryStatistics();
+                pewp.setRhjtxzdxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计离线小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRlxxsmx).summaryStatistics();
+                pewp.setRhjlxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
 
-                }
             }
         }
 
-        //日合计故障小时（明细）
-        pewp.setRhjgzxsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计场内受累故障小时（明细）
-        pewp.setRhjcnslgzxsmx(new BigDecimal(gzslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计检修小时（明细）
-        pewp.setRhjjxxsmx(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计场内受累检修小时（明细）
-        pewp.setRhjcnsljxxsmx(new BigDecimal(jxslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计待机小时（明细）
-        pewp.setRhjdjxsmx(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计缺陷降出力小时（明细）
-        pewp.setRhjqxjclxsmx(new BigDecimal(fdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计手动停机小时（明细）
-        pewp.setRhjsdtjxsmx(new BigDecimal(sdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计性能小时（明细）
-        pewp.setRhjbwxsmx(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计限电停机小时（明细）
-        pewp.setRhjxdtjxsmx(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计限电降出力小时（明细）
-        pewp.setRhjxdjclxsmx(new BigDecimal(xdjclsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计场外受累电网小时（明细）
-        pewp.setRhjcwsldwxsmx(new BigDecimal(dwslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计场外受累电网小时（明细）
-        pewp.setRhjcwsltqxsmx(new BigDecimal(hjslsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计通讯中断小时（明细）
-        pewp.setRhjtxzdxsmx(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计离线小时（明细）
-        pewp.setRhjlxxsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+
 
 
 //*******************************************日信息统计*********************************************************/
 
 //*******************************************月信息统计*********************************************************/
 
-        if (pepidls.isEmpty()) {
-            setLossHoursMonth(pewp);
-
-        } else {
-
-            ProEconPowerstationInfoDay2 pepid = pepidls.get(0);
-
-            //月合计故障小时（明细）
-            pewp.setYhjgzxsmx(StringUtils.round(pepid.getYhjgzxsmx() + pewp.getRhjgzxsmx(), 2));
-            //月合计场内受累故障小时（明细）
-            pewp.setYhjcnslgzxsmx(StringUtils.round(pepid.getYhjcnslgzxsmx() + pewp.getRhjcnslgzxsmx(), 2));
-            //月合计检修小时（明细）
-            pewp.setYhjjxxsmx(StringUtils.round(pepid.getYhjjxxsmx() + pewp.getRhjjxxsmx(), 2));
-            //月合计场内受累检修小时（明细）
-            pewp.setYhjcnsljxxsmx(StringUtils.round(pepid.getYhjcnsljxxsmx() + pewp.getRhjcnsljxxsmx(), 2));
-            //月合计待机小时（明细）
-            pewp.setYhjdjxsmx(StringUtils.round(pepid.getYhjdjxsmx() + pewp.getRhjdjxsmx(), 2));
-            //月合计缺陷降出力小时（明细）
-            pewp.setYhjqxjclxsmx(StringUtils.round(pepid.getYhjqxjclxsmx() + pewp.getRhjqxjclxsmx(), 2));
-            //月合计手动停机小时（明细）
-            pewp.setYhjsdtjxsmx(StringUtils.round(pepid.getYhjsdtjxsmx() + pewp.getRhjsdtjxsmx(), 2));
-            //月合计性能小时（明细）
-            pewp.setYhjbwxsmx(StringUtils.round(pepid.getYhjbwxsmx() + pewp.getRhjbwxsmx(), 2));
-            //月合计限电停机小时（明细）
-            pewp.setYhjxdtjxsmx(StringUtils.round(pepid.getYhjxdtjxsmx() + pewp.getRhjxdtjxsmx(), 2));
-            //月合计限电降出力小时（明细）
-            pewp.setYhjxdjclxsmx(StringUtils.round(pepid.getYhjxdjclxsmx() + pewp.getRhjxdjclxsmx(), 2));
-            //月合计场外受累电网小时（明细）
-            pewp.setYhjcwsldwxsmx(StringUtils.round(pepid.getYhjcwsldwxsmx() + pewp.getRhjcwsldwxsmx(), 2));
-            //月合计场外受累电网小时（明细）
-            pewp.setYhjcwsltqxsmx(StringUtils.round(pepid.getYhjcwsltqxsmx() + pewp.getRhjcwsltqxsmx(), 2));
-            //月合计通讯中断小时（明细）
-            pewp.setYhjtxzdxsmx(StringUtils.round(pepid.getYhjtxzdxsmx() + pewp.getRhjtxzdxsmx(), 2));
-            //月合计离线小时（明细）
-            pewp.setYhjlxxsmx(StringUtils.round(pepid.getYhjlxxsmx() + pewp.getRhjlxxsmx(), 2));
+        if (pep2map.containsKey(id)) {
+            List<ProEconEquipmentInfoDay2> pep2ls = pep2map.get(id);
 
+            if (!pep2ls.isEmpty()) {
+                DoubleSummaryStatistics summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYgzxsmx).summaryStatistics();
+                //月合计故障小时（明细）
+                pewp.setYhjgzxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计场内受累故障小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYcnslgzxsmx).summaryStatistics();
+                pewp.setYhjcnslgzxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计检修小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYjxxsmx).summaryStatistics();
+                pewp.setYhjjxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计场内受累检修小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYcnsljxxsmx).summaryStatistics();
+                pewp.setYhjcnsljxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计待机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYdjxsmx).summaryStatistics();
+                pewp.setYhjdjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计缺陷降出力小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYqxjclxsmx).summaryStatistics();
+                pewp.setYhjqxjclxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计手动停机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYsdtjxsmx).summaryStatistics();
+                pewp.setYhjsdtjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计性能小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYbwxsmx).summaryStatistics();
+                pewp.setYhjbwxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计限电停机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYxdtjxsmx).summaryStatistics();
+                pewp.setYhjxdtjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计限电降出力小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYxdjclxsmx).summaryStatistics();
+                pewp.setYhjxdjclxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计场外受累电网小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYcwsldwxsmx).summaryStatistics();
+                pewp.setYhjcwsldwxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计场外受累电网小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYcwsltqxsmx).summaryStatistics();
+                pewp.setYhjcwsltqxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计通讯中断小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYtxzdxsmx).summaryStatistics();
+                pewp.setYhjtxzdxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计离线小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYlxxsmx).summaryStatistics();
+                pewp.setYhjlxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+
+            }
         }
 
 
 //*******************************************月信息统计*********************************************************/
 
 //*******************************************年信息统计*********************************************************/
-        if (pepidls.isEmpty()) {
-            setLossHoursYear(pewp);
-        } else {
-
-            ProEconPowerstationInfoDay2 pepid = pepidls.get(0);
-
-            //年合计故障小时（明细）
-            pewp.setNhjgzxsmx(StringUtils.round(pepid.getNhjgzxsmx() + pewp.getRhjgzxsmx(), 2));
-            //年合计场内受累故障小时（明细）
-            pewp.setNhjcnslgzxsmx(StringUtils.round(pepid.getNhjcnslgzxsmx() + pewp.getRhjcnslgzxsmx(), 2));
-            //年合计检修小时（明细）
-            pewp.setNhjjxxsmx(StringUtils.round(pepid.getNhjjxxsmx() + pewp.getRhjjxxsmx(), 2));
-            //年合计场内受累检修小时（明细）
-            pewp.setNhjcnsljxxsmx(StringUtils.round(pepid.getNhjcnsljxxsmx() + pewp.getRhjcnsljxxsmx(), 2));
-            //年合计待机小时（明细）
-            pewp.setNhjdjxsmx(StringUtils.round(pepid.getNhjdjxsmx() + pewp.getRhjdjxsmx(), 2));
-            //年合计缺陷降出力小时（明细）
-            pewp.setNhjqxjclxsmx(StringUtils.round(pepid.getNhjqxjclxsmx() + pewp.getRhjqxjclxsmx(), 2));
-            //年合计手动停机小时（明细）
-            pewp.setNhjsdtjxsmx(StringUtils.round(pepid.getNhjsdtjxsmx() + pewp.getRhjsdtjxsmx(), 2));
-            //年合计性能小时（明细）
-            pewp.setNhjbwxsmx(StringUtils.round(pepid.getNhjbwxsmx() + pewp.getRhjbwxsmx(), 2));
-            //年合计限电停机小时（明细）
-            pewp.setNhjxdtjxsmx(StringUtils.round(pepid.getNhjxdtjxsmx() + pewp.getRhjxdtjxsmx(), 2));
-            //年合计限电降出力小时（明细）
-            pewp.setNhjxdjclxsmx(StringUtils.round(pepid.getNhjxdjclxsmx() + pewp.getRhjxdjclxsmx(), 2));
-            //年合计场外受累电网小时（明细）
-            pewp.setNhjcwsldwxsmx(StringUtils.round(pepid.getNhjcwsldwxsmx() + pewp.getRhjcwsldwxsmx(), 2));
-            //年合计场外受累电网小时（明细）
-            pewp.setNhjcwsltqxsmx(StringUtils.round(pepid.getNhjcwsltqxsmx() + pewp.getRhjcwsltqxsmx(), 2));
-            //年合计通讯中断小时（明细）
-            pewp.setNhjtxzdxsmx(StringUtils.round(pepid.getNhjtxzdxsmx() + pewp.getRhjtxzdxsmx(), 2));
-            //年合计离线小时（明细）
-            pewp.setNhjlxxsmx(StringUtils.round(pepid.getNhjlxxsmx() + pewp.getRhjlxxsmx(), 2));
+        if (pep2map.containsKey(id)) {
+            List<ProEconEquipmentInfoDay2> pep2ls = pep2map.get(id);
+
+            if (!pep2ls.isEmpty()) {
+                DoubleSummaryStatistics summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNgzxsmx).summaryStatistics();
+                //年合计故障小时（明细）
+                pewp.setNhjgzxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计场内受累故障小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNcnslgzxsmx).summaryStatistics();
+                pewp.setNhjcnslgzxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计检修小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNjxxsmx).summaryStatistics();
+                pewp.setNhjjxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计场内受累检修小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNcnsljxxsmx).summaryStatistics();
+                pewp.setNhjcnsljxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计待机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNdjxsmx).summaryStatistics();
+                pewp.setNhjdjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计缺陷降出力小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNqxjclxsmx).summaryStatistics();
+                pewp.setNhjqxjclxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计手动停机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNsdtjxsmx).summaryStatistics();
+                pewp.setNhjsdtjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计性能小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNbwxsmx).summaryStatistics();
+                pewp.setNhjbwxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计限电停机小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNxdtjxsmx).summaryStatistics();
+                pewp.setNhjxdtjxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计限电降出力小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNxdjclxsmx).summaryStatistics();
+                pewp.setNhjxdjclxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计场外受累电网小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNcwsldwxsmx).summaryStatistics();
+                pewp.setNhjcwsldwxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计场外受累电网小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNcwsltqxsmx).summaryStatistics();
+                pewp.setNhjcwsltqxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计通讯中断小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNtxzdxsmx).summaryStatistics();
+                pewp.setNhjtxzdxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计离线小时（明细）
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNlxxsmx).summaryStatistics();
+                pewp.setNhjlxxsmx(StringUtils.round(summaryStatistics.getSum(), 2));
 
+            }
         }
 
 
@@ -1090,7 +1054,7 @@ public class WindPowerInfo2Service {
         pewp.setNhjslxs(pewp.getRhjslxs());
     }
 
-    private void calSimple(ProEconPowerstationInfoDay2 pewp, Date end, Date begin, List<ProBasicEquipment> wtls, List<ProEconPowerstationInfoDay2> pepidls) throws Exception {
+    private void calSimple(ProEconPowerstationInfoDay2 pewp, String id,Map<String,List<ProEconEquipmentInfoDay2>> pep2map) throws Exception {
 //        0	待机
 //        1	运行
 //        2	故障
@@ -1100,175 +1064,94 @@ public class WindPowerInfo2Service {
 //        6	离线
 //*******************************************日信息统计*********************************************************/
 
-        double lastState = -1;//上一分钟状态
-
-
-        double djsc = 0;//待机时长
-        double zcfdsc = 0;//正常发电时长
-        double gzsc = 0;//故障时长
-        double jxsc = 0;//检修时长
-        double xdtjsc = 0;//限电停机时长
-        double slsc = 0;//受累时长
-        double txzdsc = 0;//通讯中断时长
-
-
-        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
-
-        for (ProBasicEquipment wt : wtls) {
-            Map<String, ProBasicEquipmentPoint> aimap = wtpAimap.get(wt.getId());
-            if (aimap.containsKey(ContantXk.SBZT)) {
-
-                ProBasicEquipmentPoint point = aimap.get(ContantXk.SBZT);
-                //按照分钟时间进行统计状态快照值
-                List<PointData> pointls = edosUtil.getHistoryDatasSnap(point.getNemCode(), begin.getTime() / 1000, end.getTime() / 1000);
-                if (!pointls.isEmpty()) {
-                    for (PointData po : pointls) {
-
-                        if (po.getPointValueInDouble() == 0) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //待机时长加1分钟
-                            djsc++;
-                        } else if (po.getPointValueInDouble() == 1) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //正常发电时长加1分钟
-                            zcfdsc++;
-                        } else if (po.getPointValueInDouble() == 2) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //故障时长加1分钟
-                            gzsc++;
-                        } else if (po.getPointValueInDouble() == 3) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //检修时长加1分钟
-                            jxsc++;
-
-                        } else if (po.getPointValueInDouble() == 4) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //限电停机时长加1分钟
-                            xdtjsc++;
-                        } else if (po.getPointValueInDouble() == 5) {
-                            if (lastState != po.getPointValueInDouble()) {
-
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-
-                            //受累时长加1分钟
-                            slsc++;
-
-                        } else if (po.getPointValueInDouble() == 6) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
-
-                            }
-                            //通讯中断时长加1分钟
-                            txzdsc++;
-                        }
-
-                    }
-
-                }
 
+        if (pep2map.containsKey(id)) {
+            List<ProEconEquipmentInfoDay2> pep2ls = pep2map.get(id);
+
+            if (!pep2ls.isEmpty()) {
+                DoubleSummaryStatistics summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRdjxs).summaryStatistics();
+                //日合计待机小时
+                pewp.setRhjdjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计维护停机小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRjxtjxs).summaryStatistics();
+                pewp.setRhjjxtjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                // 日合计待机小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRdjxs).summaryStatistics();
+                pewp.setRhjdjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计运行小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRyxxs).summaryStatistics();
+                pewp.setRhjyxxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计限电小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRxdxs).summaryStatistics();
+                pewp.setRhjxdxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计通讯中断小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRtxzdxs).summaryStatistics();
+                pewp.setRhjtxzdxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //日合计受累小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getRslxs).summaryStatistics();
+                pewp.setRhjslxs(StringUtils.round(summaryStatistics.getSum(), 2));
             }
         }
 
-        //日合计待机小时
-        pewp.setRhjdjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计维护停机小时
-        pewp.setRhjjxtjxs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        // 日合计待机小时
-        pewp.setRhjdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计运行小时
-        pewp.setRhjyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计限电小时
-        pewp.setRhjxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计通讯中断小时
-        pewp.setRhjtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-        //日合计受累小时
-        pewp.setRhjslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-
-
         //*******************************************日信息统计*********************************************************/
 
         //*******************************************月信息统计*********************************************************/
-        if (pepidls.isEmpty()) {
-            setLossHoursMonthSimple(pewp);
-
-        } else {
-
-            ProEconPowerstationInfoDay2 pepid = pepidls.get(0);
-
-
-            //月合计待机小时
-            pewp.setYhjdjxs(StringUtils.round(pepid.getYhjdjxs() + pewp.getRhjdjxs(), 2));
-            //月合计维护停机小时
-            pewp.setYhjjxtjxs(StringUtils.round(pepid.getYhjjxtjxs() + pewp.getRhjjxtjxs(), 2));
-            // 月合计故障小时
-            pewp.setYhjgztjxs(StringUtils.round(pepid.getYhjgztjxs() + pewp.getRhjgztjxs(), 2));
-            //月合计运行小时
-            pewp.setYhjyxxs(StringUtils.round(pepid.getYhjyxxs() + pewp.getRhjyxxs(), 2));
-            //月合计限电小时
-            pewp.setYhjxdxs(StringUtils.round(pepid.getYhjxdxs() + pewp.getRhjxdxs(), 2));
-            //月合计通讯中断小时
-            pewp.setYhjtxzdxs(StringUtils.round(pepid.getYhjtxzdxs() + pewp.getRhjtxzdxs(), 2));
-            //月合计受累小时
-            pewp.setYhjslxs(StringUtils.round(pepid.getYhjslxs() + pewp.getRhjslxs(), 2));
-
+        if (pep2map.containsKey(id)) {
+            List<ProEconEquipmentInfoDay2> pep2ls = pep2map.get(id);
+
+            if (!pep2ls.isEmpty()) {
+                DoubleSummaryStatistics summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYdjxs).summaryStatistics();
+                //月合计待机小时
+                pewp.setYhjdjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计维护停机小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYjxtjxs).summaryStatistics();
+                pewp.setYhjjxtjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                // 月合计待机小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYdjxs).summaryStatistics();
+                pewp.setYhjdjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计运行小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYyxxs).summaryStatistics();
+                pewp.setYhjyxxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计限电小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYxdxs).summaryStatistics();
+                pewp.setYhjxdxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计通讯中断小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYtxzdxs).summaryStatistics();
+                pewp.setYhjtxzdxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //月合计受累小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getYslxs).summaryStatistics();
+                pewp.setYhjslxs(StringUtils.round(summaryStatistics.getSum(), 2));
+            }
         }
         //*******************************************月信息统计*********************************************************/
 
         //*******************************************年信息统计*********************************************************/
-        if (pepidls.isEmpty()) {
-            setLossHoursYearSimple(pewp);
-
-        } else {
-
-            ProEconPowerstationInfoDay2 pepid = pepidls.get(0);
-
-
-            //年合计待机小时
-            pewp.setNhjdjxs(StringUtils.round(pepid.getNhjdjxs() + pewp.getRhjdjxs(), 2));
-            //年合计维护停机小时
-            pewp.setNhjjxtjxs(StringUtils.round(pepid.getNhjjxtjxs() + pewp.getRhjjxtjxs(), 2));
-            // 年合计故障小时
-            pewp.setNhjgztjxs(StringUtils.round(pepid.getNhjgztjxs() + pewp.getRhjgztjxs(), 2));
-            //年合计运行小时
-            pewp.setNhjyxxs(StringUtils.round(pepid.getNhjyxxs() + pewp.getRhjyxxs(), 2));
-            //年合计限电小时
-            pewp.setNhjxdxs(StringUtils.round(pepid.getNhjxdxs() + pewp.getRhjxdxs(), 2));
-            //年合计通讯中断小时
-            pewp.setNhjtxzdxs(StringUtils.round(pepid.getNhjtxzdxs() + pewp.getRhjtxzdxs(), 2));
-            //年合计受累小时
-            pewp.setNhjslxs(StringUtils.round(pepid.getNhjslxs() + pewp.getRhjslxs(), 2));
-
+        if (pep2map.containsKey(id)) {
+            List<ProEconEquipmentInfoDay2> pep2ls = pep2map.get(id);
+
+            if (!pep2ls.isEmpty()) {
+                DoubleSummaryStatistics summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNdjxs).summaryStatistics();
+                //年合计待机小时
+                pewp.setNhjdjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计维护停机小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNjxtjxs).summaryStatistics();
+                pewp.setNhjjxtjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                // 年合计待机小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNdjxs).summaryStatistics();
+                pewp.setNhjdjxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计运行小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNyxxs).summaryStatistics();
+                pewp.setNhjyxxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计限电小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNxdxs).summaryStatistics();
+                pewp.setNhjxdxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计通讯中断小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNtxzdxs).summaryStatistics();
+                pewp.setNhjtxzdxs(StringUtils.round(summaryStatistics.getSum(), 2));
+                //年合计受累小时
+                summaryStatistics = pep2ls.stream().mapToDouble(ProEconEquipmentInfoDay2::getNslxs).summaryStatistics();
+                pewp.setNhjslxs(StringUtils.round(summaryStatistics.getSum(), 2));
+            }
         }
         //*******************************************年信息统计*********************************************************/
     }

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

@@ -198,18 +198,35 @@ public class CycleCalculationService {
                     double date15agofdl = edosUtil.getSectionData(rssfdlPoint, date15age.getTime()).getPointValueInDouble() * rssfdlPoint.getCoefficient();
 
                     double rfdl = ssfdl - zerofdl;
-//                if(wt.getId().equals("SXJ_KGDL_TZ_G_IN_0001_EQ"))
-//                {
-//                    System.out.println("");
-//                }
+                if(wt.getId().equals("SXJ_KGDL_XWT_F_WT_0014_EQ"))
+                {
+                    System.out.println("");
+                }
+                    if(wt.getId().equals("SXJ_KGDL_XWT_F_WT_0024_EQ"))
+                    {
+                        System.out.println("");
+                    }
+                    if(wt.getId().equals("SXJ_KGDL_XWT_F_WT_0027_EQ"))
+                    {
+                        System.out.println("");
+                    }
                     if (rfdl <= 0 || rfdl > modelpower.get(wt.getModelId()) * 24 * 1.5) {
                         rfdl = 0;
                         List<PointData> ssglList = edosUtil.getHistoryDatasSnap(ssglPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 900l);
 
                         if (!ssglList.isEmpty()) {
                             Map<Integer, Double> map = new HashMap<>();
+                            int time=0;
                             for (int i = 0; i < ssglList.size(); i++) {
-                                map.put(i, ssglList.get(i).getPointValueInDouble());
+
+                                double modelvalue= modelpower.get(wt.getModelId())*1.5;
+
+                                if(ssglList.get(i).getPointValueInDouble() >0 && ssglList.get(i).getPointValueInDouble()<modelvalue)
+                                {
+                                    map.put(time, ssglList.get(i).getPointValueInDouble());
+                                    time++;
+                                }
+
                             }
                             PowerIntegration pi = new PowerIntegration();
 
@@ -362,8 +379,16 @@ public class CycleCalculationService {
                         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(wt.getId().equals("SXJ_KGDL_JR_G_IN_0304_EQ"))
+//                        {
+//                            System.out.println("");
+//                        }
                         if(CacheContext.modelMap.containsKey(wt.getModelId()))
                         {
+                            if(!rfdlPointDatas.isEmpty() &&rfdlPointDatas.size()>=2 )
+                            {
+                                rfdlPointDatas.get(0).setPointValueInDouble(rfdlPointDatas.get(1).getPointValueInDouble());
+                            }
                             ProEconEquipmentmodel model=CacheContext.modelMap.get(wt.getModelId());
                             PowerVo vo= lightToTheoreticalPower.calculateEnergy(rfdlPointDatas, gzdPointDatas, mxztPointDatas,gzdPoint.getNemCode(),model.getPowerProduction());
                             //故障
@@ -529,8 +554,9 @@ public class CycleCalculationService {
                             }
                         } else {
 
-                            Date tempdate=DateUtils.truncate(currentDate);
-                            List<PointData> pointls=edosUtil.getHistoryDatasSnap(ssfsPoint.getNemCode(), tempdate.getTime()/1000, currentDate.getTime()/1000);
+
+
+                            List<PointData> pointls = edosUtil.getHistoryDatasSnap(gzdPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
                             if(!pointls.isEmpty())
                             {
                                 List<PointData> filterls=new ArrayList<>();
@@ -551,6 +577,8 @@ public class CycleCalculationService {
                                     //累计光照度
                                     rpjfs = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
 
+
+                                    dataMap.put("pjfs",rpjfs);
                                 }
 
                             }
@@ -620,27 +648,29 @@ 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"));
-
-                            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 lsfs = edosUtil.getSectionData(ypjgzdPoint, currentDate.getTime()).getPointValueInDouble();
+                            ypjfs = DoubleUtils.sum(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();
@@ -717,24 +747,9 @@ 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"));
-
-                            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 lsfs = edosUtil.getSectionData(npjgzdPoint, currentDate.getTime()).getPointValueInDouble();
+                            npjfs=DoubleUtils.sum(lsfs, dataMap.get("pjfs"));
+
                         }
 
                         double lsgl = edosUtil.getSectionData(npjglPoint, currentDate.getTime()).getPointValueInDouble();
@@ -4376,7 +4391,8 @@ public class CycleCalculationService {
 
             }
 //            zsss = zsss / pointDataList.size() >= 0 ? zsss / pointDataList.size() : 0;
-            zsss= powerIntegration.calculateEnergy(powerData, 1/60);
+            double timeInterval=BigDecimal.valueOf(1).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue();
+            zsss= powerIntegration.calculateEnergy(powerData, timeInterval);
         }
 
         return zsss;

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

@@ -45,7 +45,7 @@ public class RealtimeService {
         Map<String, List<ProBasicLine>> prolinemap = CacheContext.prolinemap;
         Map<String, List<ProBasicProject>> wppromap = CacheContext.wppromap;
         Map<String, Map<Double, ProBasicModelPowerRd>> theoreticalPowerMap = CacheContext.theoreticalPowerMap; //理论保证功率
-        Map<String, Map<Double, ProEconWtPowerCurveFitting>> curveFittingPowerMap = CacheContext.curveFittingPowerMap; //最优自算功率
+        Map<String, Map<Double, ProEconWtCurveFittingMonth>> curveFittingPowerMap = CacheContext.curveFittingMonthMap; //最优自算功率
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
         Map<String, Map<String, ProBasicPowerstationPoint>> linepointmap = CacheContext.linepointmap;
         Map<String, Map<String, ProBasicPowerstationPoint>> propointmap = CacheContext.propointmap;
@@ -174,7 +174,7 @@ public class RealtimeService {
             }
             if (curveFittingPowerMap.containsKey(wt.getId())) {
                 if (curveFittingPowerMap.get(wt.getId()).containsKey(v)) {
-                    ProEconWtPowerCurveFitting wtPowerCurveFitting = curveFittingPowerMap.get(wt.getId()).get(v);
+                    ProEconWtCurveFittingMonth wtPowerCurveFitting = curveFittingPowerMap.get(wt.getId()).get(v);
                     Double actualPower = wtPowerCurveFitting.getActualPower();
                     double[] underissuanceArray = {0, 1, 2, 3, 8, 9, 11};
                     double qfzt = 0;

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

@@ -148,11 +148,13 @@ public class SaticScheduleCALTask {
             while(true)
             {
                 realtimeService.savaRealtimeTargetWp();
+
                 Thread.sleep(200);
             }
 
         } catch (Exception e) {
             e.printStackTrace();
+            System.out.println( e.getMessage());
         }
         XxlJobHelper.log("实时指标调度任务处理完成!........");
     }

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

@@ -15,8 +15,6 @@ 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;
@@ -170,46 +168,58 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 		}else
 		{
 			//*******************************************日信息统计*********************************************************/
-			if(pointmap.containsKey(ContantXk.CJ_SSFS))
+			if(pointmap.containsKey(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())
+				ProBasicEquipmentPoint point= pointmap.get(ContantXk.RPJGZD);
+				PointData pointValue=edosUtil.getHistMatrix(point.getNemCode(), end.getTime()/1000);
+				if(StringUtils.notEmp(pointValue))
 				{
-					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);
-
-
-					}
-
+					//日平均风速
+					pewp.setRpjfs(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 				}
+//				Map<String, Map<String, ProBasicPowerstationPoint>> wppointmap = CacheContext.wppointmap;
+//
+//				Map<String, ProBasicPowerstationPoint> wpPointMap = wppointmap.get(wt.getWindpowerstationId());
+//
+//				ProBasicPowerstationPoint gzdPoint=wpPointMap.get("GCGZQD");
+//				List<PointData> pointls = edosUtil.getHistoryDatasSnap(gzdPoint, begin.getTime() / 1000, end.getTime() / 1000, null, 60l);
+//				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=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);
+//
+//
+//					}
+//
+//
+//				}
 
 			}
 		}

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

@@ -82,21 +82,6 @@ public class EquipmentInfo2ThreadPool implements Callable<String>, Serializable
 				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()))
 				{

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

@@ -263,7 +263,6 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 						if (po.getPointValueInDouble() < 3) {
 							dayjfsc++;
 						}
-
 					}
 					//将分钟转化为小时
 					dayjfsc = new BigDecimal(dayjfsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue();
@@ -400,6 +399,7 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 		} else {
 			pewp.setRfwjsl(100.0);
 		}
+
 		QueryWrapper<ProEconFaultLiminatedefects> queryWrapper3 = new QueryWrapper<>();
 		queryWrapper3.ge("date_time",begin).le("date_time",end).eq("windturbine_id",wt.getId());
 		List<ProEconFaultLiminatedefects> peflls=proEconFaultLiminatedefectsService.list(queryWrapper3);
@@ -571,7 +571,7 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 				//月大风切出风速
 				pewp.setYdfqcfs(peiost.getMonthOutputBig());
 
-				if (StringUtils.notEmp(peiost)) {
+				if (StringUtils.notEmp(pepid)) {
 					//静风时长累计
 					pewp.setYjfsc(pewp.getRjfsc() + pepid.getYjfsc());
 
@@ -841,7 +841,7 @@ public class EquipmentInfo4ThreadPool implements Callable<String>, Serializable
 				//年大风切出风速
 				pewp.setNdfqcfs(peiost.getYearOutputBig());
 
-				if (StringUtils.notEmp(peiost)) {
+				if (StringUtils.notEmp(pepid)) {
 					//静风时长累计
 					pewp.setNjfsc(pepid.getNjfsc() + pewp.getRjfsc());
 

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

@@ -69,7 +69,7 @@ public class GoodnessOfFitThreadPool implements Callable<String>, Serializable {
 		try {
 
 			System.out.println("拟合优度当前风机数"+i);
-			ProBasicEquipment wt=CacheContext.wtls.get(i);
+			ProBasicEquipment wt=CacheContext.wtfdls.get(i);
 			Map<String, Map<String, Double>> coefficientMap=new HashMap<>();
 			Map<String, Map<String,Double>> fitMap=new HashMap<>();
 			try {

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

@@ -48,22 +48,33 @@ public class DeviationRateUtil {
 
         }
 
-        if (!actualPower.isEmpty() && !theoreticalPowerMap.isEmpty()) {
-            actualMean /= actualPower.size();
+        if (!actualPowerMap.isEmpty() && !theoreticalPowerMap.isEmpty()) {
+            actualMean /= actualPowerMap.size();
             theoreticalMean /= theoreticalPowerMap.size();
             //计算实际功率和理论功率的标准差
             double actualSD = 0.0;
             double theoreticalSD = 0.0;
-            for (int i = 0; i < actualPower.size(); i++) {
-                actualSD += Math.pow(actualPower.get(i).getY() - actualMean, 2);
-
-                if (theoreticalPowerMap.containsKey(actualPower.get(i).getX())) {
-                    PointVo vo = theoreticalPowerMap.get(actualPower.get(i).getX());
+//            for (int i = 0; i < actualPowerMap.size(); i++) {
+//                actualSD += Math.pow(actualPowerMap.get(i).getY() - actualMean, 2);
+//
+//                if (theoreticalPowerMap.containsKey(actualPowerMap.get(i).getX())) {
+//                    PointVo vo = theoreticalPowerMap.get(actualPowerMap.get(i).getX());
+//                    theoreticalSD += Math.pow(vo.getY() - theoreticalMean, 2);
+//                }
+//
+//            }
+
+            for(Map.Entry<Double,PointVo> entry : actualPowerMap.entrySet()){
+
+                actualSD += Math.pow(entry.getValue().getY() - actualMean, 2);
+
+                if (theoreticalPowerMap.containsKey(entry.getValue().getX())) {
+                    PointVo vo = theoreticalPowerMap.get(entry.getValue().getX());
                     theoreticalSD += Math.pow(vo.getY() - theoreticalMean, 2);
                 }
-
             }
-            actualSD = Math.sqrt(actualSD / actualPower.size());
+
+            actualSD = Math.sqrt(actualSD / actualPowerMap.size());
             theoreticalSD = Math.sqrt(theoreticalSD / theoreticalPowerMap.size());
             //计算功率曲线偏差率
             if (theoreticalMean != 0) {
@@ -119,22 +130,34 @@ public class DeviationRateUtil {
             }
         }
 
-        if (!actualPower.isEmpty() && !theoreticalPowerMap.isEmpty()) {
-            actualMean /= actualPower.size();
+        if (!actualPowerMap.isEmpty() && !theoreticalPowerMap.isEmpty()) {
+            actualMean /= actualPowerMap.size();
             theoreticalMean /= theoreticalPowerMap.size();
             //计算实际功率和理论功率的标准差
             double actualSD = 0.0;
             double theoreticalSD = 0.0;
-            for (int i = 0; i < actualPower.size(); i++) {
-                actualSD += Math.pow(actualPower.get(i).getY() - actualMean, 2);
-
-                if (theoreticalPowerMap.containsKey(actualPower.get(i).getX())) {
-                    PointVo vo = theoreticalPowerMap.get(actualPower.get(i).getX());
+//            for (int i = 0; i < actualPowerMap.size(); i++) {
+//                actualSD += Math.pow(actualPowerMap.get(i).getY() - actualMean, 2);
+//
+//                if (theoreticalPowerMap.containsKey(actualPowerMap.get(i).getX())) {
+//                    PointVo vo = theoreticalPowerMap.get(actualPowerMap.get(i).getX());
+//                    theoreticalSD += Math.pow(vo.getY() - theoreticalMean, 2);
+//                }
+//
+//            }
+
+            for(Map.Entry<Double,PointVo> entry : actualPowerMap.entrySet()){
+//                System.out.println(entry.getKey());
+//                System.out.println(entry.getValue());
+
+                actualSD += Math.pow(entry.getValue().getY() - actualMean, 2);
+
+                if (theoreticalPowerMap.containsKey(entry.getValue().getX())) {
+                    PointVo vo = theoreticalPowerMap.get(entry.getValue().getX());
                     theoreticalSD += Math.pow(vo.getY() - theoreticalMean, 2);
                 }
-
             }
-            actualSD = Math.sqrt(actualSD / actualPower.size());
+            actualSD = Math.sqrt(actualSD / actualPowerMap.size());
             theoreticalSD = Math.sqrt(theoreticalSD / theoreticalPowerMap.size());
             //计算功率曲线偏差率
             if (theoreticalMean != 0) {

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

@@ -276,33 +276,84 @@ public class LightToTheoreticalPower {
                         stateBegin = c.getTime();
                     }
 
+                } else if (po.getPointValueInDouble() == 12) {
+                    if (lastState != po.getPointValueInDouble()) {
+                        //将当前状态保存到上一分钟状态
+                        lastState = po.getPointValueInDouble();
+                        stateEnd = new Date(po.getPointTime());
+
+
+                        Date temp = new Date(po.getPointTime());
+                        Calendar c = Calendar.getInstance();
+                        c.setTime(temp);
+                        c.add(Calendar.MINUTE, 1);
+                        stateBegin = c.getTime();
+                    }
+
+                }else if (po.getPointValueInDouble() == 13) {
+                    if (lastState != po.getPointValueInDouble()) {
+                        //将当前状态保存到上一分钟状态
+                        lastState = po.getPointValueInDouble();
+                        stateEnd = new Date(po.getPointTime());
+
+
+                        Date temp = new Date(po.getPointTime());
+                        Calendar c = Calendar.getInstance();
+                        c.setTime(temp);
+                        c.add(Calendar.MINUTE, 1);
+                        stateBegin = c.getTime();
+                    }
+
                 }
 
             }
 
-            rdjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rdjssdl);
-            rsdtjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rsdtjssdl);
-            rqxjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rqxjclssdl);
-            double lldl = getLldl(pointid, stateBegin, stateEnd);
-            rgzssdl = rgzssdl + lldl;
-            rcnslgzssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnslgzssdl);
-            lldl = getLldl(pointid, stateBegin, stateEnd);
-            rjxssdl = rjxssdl + lldl;
-            lldl = getLldl(pointid, stateBegin, stateEnd);
-            rjxssdl = rjxssdl + lldl;
-            rcnsljxssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnsljxssdl);
-            rxdjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rxdjclssdl);
-            lldl = getLldl(pointid, stateBegin, stateEnd);
-            rxdtjssdl = rxdtjssdl + lldl;
-            lldl = getLldl(pointid, stateBegin, stateEnd);
-            rcwsldwssdl = rcwsldwssdl + lldl;
-            lldl = getLldl(pointid, stateBegin, stateEnd);
-            rcwsltqssdl = rcwsltqssdl + lldl;
+            if (lastState== 0) {
+                rdjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rdjssdl);
 
-        }
+            } else if (lastState == 1) {
+                rsdtjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rsdtjssdl);
+
+
+            } else if (lastState == 3) {
+                rqxjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rqxjclssdl);
+
+
+            } else if (lastState == 4) {
+                double lldl = getLldl(pointid, stateBegin, stateEnd);
+                rgzssdl = rgzssdl + lldl;
+
+            } else if (lastState == 5) {
+                rcnslgzssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnslgzssdl);
+
+            } else if (lastState == 6) {
+                double lldl = getLldl(pointid, stateBegin, stateEnd);
+                rjxssdl = rjxssdl + lldl;
+
+            } else if (lastState == 7) {
+
+                rcnsljxssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnsljxssdl);
+
+            } else if (lastState == 8) {
 
+                rxdjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rxdjclssdl);
 
+            } else if (lastState == 9) {
 
+                double lldl = getLldl(pointid, stateBegin, stateEnd);
+                rxdtjssdl = rxdtjssdl + lldl;
+            } else if (lastState == 10) {
+
+                double lldl = getLldl(pointid, stateBegin, stateEnd);
+                rcwsldwssdl = rcwsldwssdl + lldl;
+
+            } else if (lastState == 11) {
+                double lldl = getLldl(pointid, stateBegin, stateEnd);
+                rcwsltqssdl = rcwsltqssdl + lldl;
+
+            }
+
+        }
 
         vo.setLlfdl(llfdl);
         vo.setRfdl(rfdl);
@@ -319,6 +370,17 @@ public class LightToTheoreticalPower {
         vo.setRcwsldwssdl(rcwsldwssdl);
         vo.setRcwsltqssdl(rcwsltqssdl);
 
+        rxnssdl=llfdl-rfdl-rgzssdl-rcnslgzssdl-rjxssdl-rcnsljxssdl-rdjssdl-rqxjclssdl-rsdtjssdl-rxdtjssdl-rxdjclssdl-rcwsldwssdl-rcwsltqssdl;
+        if(rxnssdl>0)
+        {
+
+            vo.setRxnssdl(StringUtils.round(rxnssdl,2));
+        }else
+        {
+            vo.setRxnssdl(StringUtils.round(0,2));
+        }
+
+
 //        }catch (Exception e)
 //        {
 //            System.out.println("");
@@ -339,7 +401,11 @@ public class LightToTheoreticalPower {
 
         double lldl = getLldl(pointid, stateBegin, stateEnd);
 
-        ssdl = ssdl + lldl - (end - begin);
+        if(end >begin)
+        {
+            ssdl = ssdl + (lldl - (end - begin));
+        }
+
 
         if (ssdl < 0) {
             ssdl = 0;

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

@@ -22,7 +22,6 @@ public class PowerIntegration {
         double energy = 0.0;
         try {
 
-
             for (int time = 0; time < powerData.size() - 1; time++) {
                 double power1 = powerData.get(time);
                 double power2 = powerData.get(time + 1);

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

@@ -130,8 +130,8 @@ db:
 #  url2: http://127.0.0.1:8011/ts
 
 #参与计算的场站
-#runWindpowerstation: SXJ_KGDL_XWT_FDC_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_XWT_FDC_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

@@ -5,9 +5,6 @@ import com.gyee.generation.service.InputOrOutPutService;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
-import java.util.Calendar;
-import java.util.Date;
-
 public class HealthTest {
 
 
@@ -16,10 +13,10 @@ public class HealthTest {
         InputOrOutPutService inputOrOutPutService= SpringUtils.getBean("inputOrOutPutService");
         InitialRedisService initialRedisService= SpringUtils.getBean("initialRedisService");
 
-        inputOrOutPutService.initialInputOrOutputSpeed();
-        Calendar c = Calendar.getInstance();
-        Date begin=null;
-        Date end=null;
+//        inputOrOutPutService.initialInputOrOutputSpeed();
+//        Calendar c = Calendar.getInstance();
+//        Date begin=null;
+//        Date end=null;
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();
 //
@@ -118,14 +115,15 @@ public class HealthTest {
 //        begin=new Date();
 //        System.out.println("曲线拟合调度程序执行开始!。。。。。。");
 //        PowerCurveFittingByTimeService powerCurveFittingByTimeService= SpringUtils.getBean("powerCurveFittingByTimeService");
+////
+////        XxlJobHelper.log("日序执行开始!........");
+////        powerCurveFittingByTimeService.cureFittingDay(c.getTime(),"SXJ_KGDL_XWT_FDC_STA");
+////        XxlJobHelper.log("日处理完成!........");
 //
-//        XxlJobHelper.log("日序执行开始!........");
-//        powerCurveFittingByTimeService.cureFittingDay(c.getTime(),"SXJ_KGDL_YLZ_FDC_STA");
-//        XxlJobHelper.log("日处理完成!........");
 ////
-////        XxlJobHelper.log("月序执行开始!........");
-////        powerCurveFittingByTimeService.cureFittingMonth(c.getTime(),"1");
-////        XxlJobHelper.log("月处理完成!........");
+//        XxlJobHelper.log("月序执行开始!........");
+//        powerCurveFittingByTimeService.cureFittingMonth(c.getTime(), "0", "SXJ_KGDL_XWT_FDC_STA");
+//        XxlJobHelper.log("月处理完成!........");
 ////
 ////        XxlJobHelper.log("年序执行开始!........");
 ////        powerCurveFittingByTimeService.cureFittingYear(c.getTime());
@@ -197,16 +195,19 @@ public class HealthTest {
 //        c.set(Calendar.DAY_OF_MONTH,23);
 //
 //        c.setTime(DateUtils.truncate(c.getTime()));
-//
+//        EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
+//        EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
+//        EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
 //        begin=new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for(int i=0;i<2;i++)
+//        for(int i=0;i<1;i++)
 //        {
-//
+
 //            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
 //            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
 //
 //            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+//            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
 //
 //
 //

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

@@ -29,23 +29,23 @@ public class RealTest {
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();
 //
-        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.DAY_OF_MONTH,1);
+//
+//        c.set(Calendar.HOUR_OF_DAY, 23);
+//        c.set(Calendar.MINUTE, 59);
+//        c.set(Calendar.SECOND, 59);
+//
 //
-        c.setTime(DateUtils.truncate(c.getTime()));
+////
+//        c.setTime(DateUtils.truncate(c.getTime()));
 
         begin=new Date();
         System.out.println("设备指标记录调度程序执行开始!。。。。。。");
 
-        cycleCalculationRebuildService.saveCyle(c.getTime());
+//        cycleCalculationRebuildService.saveCyle(c.getTime());
 //        for(int i=0;i<19;i++)
 //        {
-
+        realtimeService.savaRealtimeTargetWp();
 //        statusService.middleStatusReal();
 //       statusService.startStatusReal();
 //        calculationService.calWp();
@@ -60,7 +60,7 @@ public class RealTest {
         System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
         System.out.println("设备指标记录调度程序执行结束!。。。。。。");
 
-//        realtimeService.savaRealtimeTarget();
+