修改计算服务

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

@@ -24,7 +24,8 @@ public class GenerationMain {
 //        Date begin = null;
 //        Date end = null;
 //        c.setTime(DateUtils.truncate(c.getTime()));
-//        c.set(Calendar.DAY_OF_MONTH, 3);
+////        c.set(Calendar. MONTH, 9);
+//        c.set(Calendar.DAY_OF_MONTH, 1);
 //        c.set(Calendar.HOUR_OF_DAY, 23);
 //        c.set(Calendar.MINUTE, 59);
 //        c.set(Calendar.SECOND, 59);
@@ -34,14 +35,16 @@ public class GenerationMain {
 ////////
 //        begin = new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 6; i++) {
-////           System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
+//        for (int i = 0; i < 15; i++) {
+//
+//            SimpleDateFormat  df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//           System.out.println(df.format(c.getTime()).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");
+//            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
 ////            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
 //            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
 //            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
@@ -70,26 +73,26 @@ public class GenerationMain {
 ////            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());
+////            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());
 ////////
@@ -98,10 +101,14 @@ public class GenerationMain {
 //////         shutdownnewService.execShutdown(c.getTime());
 //////
 //////
-//        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
-//        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
-////
-////            c.add(Calendar.DAY_OF_MONTH, 1);
+////        WindturbineGoodnessService windturbineGoodnessService= SpringUtils.getBean("windturbineGoodnessService");
+////        windturbineGoodnessService.calWindturbineGoodness(c.getTime());
+//
+////            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+////            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
+//
+//            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")
-//@PropertySource("classpath:xxl-job-executor2.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-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-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/service/EquipmentInfo1Service.java

@@ -43,6 +43,11 @@ public class EquipmentInfo1Service {
         Calendar c=Calendar.getInstance();
         c.setTime(recordDate);
 
+        if(c.get(Calendar.MINUTE)==0)
+        {
+            c.add(Calendar.DAY_OF_MONTH,-1);
+        }
+
         c.set(Calendar.HOUR_OF_DAY, 23);
         c.set(Calendar.MINUTE, 59);
         c.set(Calendar.SECOND, 59);
@@ -67,22 +72,37 @@ public class EquipmentInfo1Service {
             }
         }
         List<ProEconEquipmentInfoDay1> dayls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(CacheContext.wtls.size());
-
+//        final CountDownLatch latch = new CountDownLatch(CacheContext.wtls.size());
+//
         List<String> wpls=new ArrayList<>();
-        for(ProBasicEquipment wt:CacheContext.wtls)
-        {
-            if(!wpls.contains(wt.getWindpowerstationId()))
-            {
-                wpls.add(wt.getWindpowerstationId());
-            }
-            new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
-                    recordDate,  end,  begin,dayls,
-                    edosUtil,latch)).start();
-        }
-        latch.await();
+//        for(ProBasicEquipment wt:CacheContext.wtls)
+//        {
+//            if(!wpls.contains(wt.getWindpowerstationId()))
+//            {
+//                wpls.add(wt.getWindpowerstationId());
+//            }
+//            new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
+//                    recordDate,  end,  begin,dayls,
+//                    edosUtil,latch)).start();
+//        }
+//        latch.await();
 
+        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
 
+
+            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+            for (ProBasicEquipment wt : entry.getValue()) {
+                if (!wpls.contains(wt.getWindpowerstationId())) {
+                    wpls.add(wt.getWindpowerstationId());
+                }
+
+                new Thread(new EquipmentInfo1Thread(executor,  wt,  pep1map,
+                        recordDate,  end,  begin,dayls,
+                        edosUtil,latch)).start();
+
+            }
+            latch.await();
+        }
         c=Calendar.getInstance();
         c.setTime(recordDate);
 

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

@@ -25,7 +25,7 @@ import java.util.stream.Collectors;
 @Service
 public class EquipmentInfo2Service {
 
-//    private static final Logger logger = LoggerFactory.getLogger(EquipmentInfo2Service.class);
+    //    private static final Logger logger = LoggerFactory.getLogger(EquipmentInfo2Service.class);
     @Resource
     private IEdosUtil edosUtil;
 
@@ -39,12 +39,19 @@ public class EquipmentInfo2Service {
      * 计算设备日信息
      */
     public void calEquipmentInfoDay(Date recordDate) throws Exception {
-        Calendar c=Calendar.getInstance();
+        Calendar c = Calendar.getInstance();
         c.setTime(recordDate);
+        if(c.get(Calendar.MINUTE)==0)
+        {
+            c.add(Calendar.DAY_OF_MONTH,-1);
+        }
 
-        Date end=c.getTime();
+        c.set(Calendar.HOUR_OF_DAY, 23);
+        c.set(Calendar.MINUTE, 59);
+        c.set(Calendar.SECOND, 59);
+        Date end = c.getTime();
 
-        Date begin= DateUtils.truncate(c.getTime());
+        Date begin = DateUtils.truncate(c.getTime());
 
 //        //判断是否有重复记录，先删除重复记录
 //        QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper = new QueryWrapper<>();
@@ -69,91 +76,97 @@ public class EquipmentInfo2Service {
 //            proEconEquipmentInfoDay2Service.removeByIds(tempids);
 //        }
 
-        Map<String, ProEconEquipmentInfoDay2> pep2map=new HashMap<>();
-        Calendar cl=Calendar.getInstance();
+        Map<String, ProEconEquipmentInfoDay2> pep2map = new HashMap<>();
+        Calendar cl = Calendar.getInstance();
         cl.setTime(recordDate);
 //
-        if(cl.get(Calendar.DAY_OF_MONTH)!=1)
-        {
-            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());
+            queryWrapper2.eq("record_date", cl.getTime());
             List<ProEconEquipmentInfoDay2> pep2ls = proEconEquipmentInfoDay2Service.list(queryWrapper2);
-            if(!pep2ls.isEmpty())
-            {
-                for(ProEconEquipmentInfoDay2 pep:pep2ls)
-                {
-                    pep2map.put(pep.getWindturbineId(),pep);
+            if (!pep2ls.isEmpty()) {
+                for (ProEconEquipmentInfoDay2 pep : pep2ls) {
+                    pep2map.put(pep.getWindturbineId(), pep);
                 }
             }
 
         }
 
-        List<String> wpls=new ArrayList<>();
-        List<ProEconEquipmentInfoDay2> dayls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(CacheContext.wtls.size());
-        for(ProBasicEquipment wt:CacheContext.wtls)
-        {
-            if(!wpls.contains(wt.getWindpowerstationId()))
-            {
-                wpls.add(wt.getWindpowerstationId());
-            }
+        List<String> wpls = new ArrayList<>();
+        List<ProEconEquipmentInfoDay2> dayls = new ArrayList<>();
+//        final CountDownLatch latch = new CountDownLatch(CacheContext.wtls.size());
+//        for(ProBasicEquipment wt:CacheContext.wtls)
+//        {
+//            if(!wpls.contains(wt.getWindpowerstationId()))
+//            {
+//                wpls.add(wt.getWindpowerstationId());
+//            }
+//
+//
+//            new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
+//                    recordDate,  end,  begin,dayls,
+//                    edosUtil,latch)).start();
+//        }
+//        latch.await();
+
+        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
 
 
-            new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
+            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+            for (ProBasicEquipment wt : entry.getValue()) {
+                if (!wpls.contains(wt.getWindpowerstationId())) {
+                    wpls.add(wt.getWindpowerstationId());
+                }
+
+                new Thread(new EquipmentInfo2Thread(executor,  wt,  pep2map,
                     recordDate,  end,  begin,dayls,
                     edosUtil,latch)).start();
-        }
-        latch.await();
 
+            }
+            latch.await();
+        }
 
 
-        c=Calendar.getInstance();
+        c = Calendar.getInstance();
         c.setTime(recordDate);
 
 
         //判断是否有重复记录，先删除重复记录
         QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper = new QueryWrapper<>();
-        queryWrapper.eq("record_date",recordDate);
-        queryWrapper.in("windpowerstation_id",wpls);
+        queryWrapper.eq("record_date", recordDate);
+        queryWrapper.in("windpowerstation_id", wpls);
         List<String> idls = proEconEquipmentInfoDay2Service.list(queryWrapper).stream().map(ProEconEquipmentInfoDay2::getId)
                 .collect(Collectors.toList());
 
-        List<String> tempids=new ArrayList<>();
+        List<String> tempids = new ArrayList<>();
 
-        for(int i=0;i<idls.size();i++)
-        {
+        for (int i = 0; i < idls.size(); i++) {
             tempids.add(idls.get(i));
-            if(tempids.size()==1000)
-            {
+            if (tempids.size() == 1000) {
                 proEconEquipmentInfoDay2Service.removeByIds(tempids);
-                tempids=new ArrayList<>();
+                tempids = new ArrayList<>();
             }
         }
 
-        if(!tempids.isEmpty())
-        {
+        if (!tempids.isEmpty()) {
             proEconEquipmentInfoDay2Service.removeByIds(tempids);
         }
 
 
-        List<ProEconEquipmentInfoDay2> templs=new ArrayList<>();
-        for(ProEconEquipmentInfoDay2 vo:dayls)
-        {
-            if(StringUtils.notEmp(vo) && StringUtils.notEmp(vo.getWindturbineId()))
-            {
+        List<ProEconEquipmentInfoDay2> templs = new ArrayList<>();
+        for (ProEconEquipmentInfoDay2 vo : dayls) {
+            if (StringUtils.notEmp(vo) && StringUtils.notEmp(vo.getWindturbineId())) {
                 templs.add(vo);
-                if(templs.size()==1000)
-                {
+                if (templs.size() == 1000) {
                     proEconEquipmentInfoDay2Service.saveBatch(templs);
-                    templs=new ArrayList<>();
+                    templs = new ArrayList<>();
                 }
             }
 
         }
 
-        if(!templs.isEmpty())
-        {
+        if (!templs.isEmpty()) {
             proEconEquipmentInfoDay2Service.saveBatch(templs);
         }
 //        proEconEquipmentInfoDay2Service.saveBatch(dayls);
@@ -177,204 +190,172 @@ public class EquipmentInfo2Service {
 
         double lastState;//上一分钟状态
 
-        double djsc=0;//待机时长
-        double sdtjsc=0;//手动停机时长
-        double zcfdsc=0;//正常发电时长
-        double fdjclsc=0;//发电降出力时长
-        double gzsc=0;//故障时长
-        double gzslsc=0;//故障受累时长
-        double jxsc=0;//检修时长
-        double jxslsc=0;//检修受累时长
-        double xdjclsc=0;//限电降出力时长
-        double xdtjsc=0;//限电停机时长
-        double dwslsc=0;//电网受累时长
-        double hjslsc=0;//环境受累时长
-        double txzdsc=0;//通讯中断时长
-        double sblxsc=0;//设备离线时长
+        double djsc = 0;//待机时长
+        double sdtjsc = 0;//手动停机时长
+        double zcfdsc = 0;//正常发电时长
+        double fdjclsc = 0;//发电降出力时长
+        double gzsc = 0;//故障时长
+        double gzslsc = 0;//故障受累时长
+        double jxsc = 0;//检修时长
+        double jxslsc = 0;//检修受累时长
+        double xdjclsc = 0;//限电降出力时长
+        double xdtjsc = 0;//限电停机时长
+        double dwslsc = 0;//电网受累时长
+        double hjslsc = 0;//环境受累时长
+        double txzdsc = 0;//通讯中断时长
+        double sblxsc = 0;//设备离线时长
 
         Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
 
 
-            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();
-
-                            }
-
-                            //设备离线时长加1分钟
-                            sblxsc++;
+        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();
+
+                        }
+
+                        //设备离线时长加1分钟
+                        sblxsc++;
+                    }
 
                 }
 
+
             }
-   
+
+        }
+
         //日合计故障小时（明细）
         pewp.setRgzxsmx(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
         //日合计场内受累故障小时（明细）
@@ -405,93 +386,87 @@ public class EquipmentInfo2Service {
         pewp.setRlxxsmx(new BigDecimal(sblxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
 
 
-
 //*******************************************日信息统计*********************************************************/
 
 //*******************************************月信息统计*********************************************************/
 
-        if(pepidls.isEmpty())
-        {
+        if (pepidls.isEmpty()) {
             setLossHoursMonth(pewp);
 
-        }else
-        {
+        } else {
 
 
-            ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
+            ProEconEquipmentInfoDay2 pepid = pepidls.get(0);
 
             //月合计故障小时（明细）
-            pewp.setYgzxsmx(StringUtils.round(pepid.getYgzxsmx()+pewp.getRgzxsmx(),2));
+            pewp.setYgzxsmx(StringUtils.round(pepid.getYgzxsmx() + pewp.getRgzxsmx(), 2));
             //月合计场内受累故障小时（明细）
-            pewp.setYcnslgzxsmx(StringUtils.round(pepid.getYcnslgzxsmx()+pewp.getRcnslgzxsmx(),2));
+            pewp.setYcnslgzxsmx(StringUtils.round(pepid.getYcnslgzxsmx() + pewp.getRcnslgzxsmx(), 2));
             //月合计检修小时（明细）
-            pewp.setYjxxsmx(StringUtils.round(pepid.getYjxxsmx()+pewp.getRjxxsmx(),2));
+            pewp.setYjxxsmx(StringUtils.round(pepid.getYjxxsmx() + pewp.getRjxxsmx(), 2));
             //月合计场内受累检修小时（明细）
-            pewp.setYcnsljxxsmx(StringUtils.round( pepid.getYcnsljxxsmx()+pewp.getRcnsljxxsmx(),2));
+            pewp.setYcnsljxxsmx(StringUtils.round(pepid.getYcnsljxxsmx() + pewp.getRcnsljxxsmx(), 2));
             //月合计待机小时（明细）
-            pewp.setYdjxsmx(StringUtils.round(pepid.getYdjxsmx()+pewp.getRdjxsmx(),2));
+            pewp.setYdjxsmx(StringUtils.round(pepid.getYdjxsmx() + pewp.getRdjxsmx(), 2));
             //月合计缺陷降出力小时（明细）
-            pewp.setYqxjclxsmx(StringUtils.round(pepid.getYqxjclxsmx()+pewp.getRqxjclxsmx(),2));
+            pewp.setYqxjclxsmx(StringUtils.round(pepid.getYqxjclxsmx() + pewp.getRqxjclxsmx(), 2));
             //月合计手动停机小时（明细）
-            pewp.setYsdtjxsmx(StringUtils.round(pepid.getYsdtjxsmx()+pewp.getRsdtjxsmx(),2));
+            pewp.setYsdtjxsmx(StringUtils.round(pepid.getYsdtjxsmx() + pewp.getRsdtjxsmx(), 2));
             //月合计性能小时（明细）
-            pewp.setYbwxsmx(StringUtils.round(pepid.getYbwxsmx()+pewp.getRbwxsmx(),2));
+            pewp.setYbwxsmx(StringUtils.round(pepid.getYbwxsmx() + pewp.getRbwxsmx(), 2));
             //月合计限电停机小时（明细）
-            pewp.setYxdtjxsmx(StringUtils.round(pepid.getYxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+            pewp.setYxdtjxsmx(StringUtils.round(pepid.getYxdtjxsmx() + pewp.getRxdtjxsmx(), 2));
             //月合计限电降出力小时（明细）
-            pewp.setYxdjclxsmx(StringUtils.round(pepid.getYxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+            pewp.setYxdjclxsmx(StringUtils.round(pepid.getYxdjclxsmx() + pewp.getRxdjclxsmx(), 2));
             //月合计场外受累电网小时（明细）
-            pewp.setYcwsldwxsmx(StringUtils.round(pepid.getYcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+            pewp.setYcwsldwxsmx(StringUtils.round(pepid.getYcwsldwxsmx() + pewp.getRcwsldwxsmx(), 2));
             //月合计场外受累电网小时（明细）
-            pewp.setYcwsltqxsmx(StringUtils.round(pepid.getYcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+            pewp.setYcwsltqxsmx(StringUtils.round(pepid.getYcwsltqxsmx() + pewp.getRcwsltqxsmx(), 2));
             //月合计通讯中断小时（明细）
-            pewp.setYtxzdxsmx(StringUtils.round(pepid.getYtxzdxsmx()+pewp.getRtxzdxsmx(),2));
+            pewp.setYtxzdxsmx(StringUtils.round(pepid.getYtxzdxsmx() + pewp.getRtxzdxsmx(), 2));
             //月合计离线小时（明细）
-            pewp.setYlxxsmx(StringUtils.round(pepid.getYlxxsmx()+pewp.getRlxxsmx(),2));
+            pewp.setYlxxsmx(StringUtils.round(pepid.getYlxxsmx() + pewp.getRlxxsmx(), 2));
 
         }
 
 
-
 //*******************************************月信息统计*********************************************************/
 
 //*******************************************年信息统计*********************************************************/
-        if(pepidls.isEmpty())
-        {
+        if (pepidls.isEmpty()) {
             setLossHoursYear(pewp);
-        }else
-        {
+        } else {
 
-            ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
+            ProEconEquipmentInfoDay2 pepid = pepidls.get(0);
 
             //年合计故障小时（明细）
-            pewp.setNgzxsmx(StringUtils.round(pepid.getNgzxsmx()+pewp.getRgzxsmx(),2));
+            pewp.setNgzxsmx(StringUtils.round(pepid.getNgzxsmx() + pewp.getRgzxsmx(), 2));
             //年合计场内受累故障小时（明细）
-            pewp.setNcnslgzxsmx(StringUtils.round(pepid.getNcnslgzxsmx()+pewp.getRcnslgzxsmx(),2));
+            pewp.setNcnslgzxsmx(StringUtils.round(pepid.getNcnslgzxsmx() + pewp.getRcnslgzxsmx(), 2));
             //年合计检修小时（明细）
-            pewp.setNjxxsmx(StringUtils.round(pepid.getNjxxsmx()+pewp.getRjxxsmx(),2));
+            pewp.setNjxxsmx(StringUtils.round(pepid.getNjxxsmx() + pewp.getRjxxsmx(), 2));
             //年合计场内受累检修小时（明细）
-            pewp.setNcnsljxxsmx(StringUtils.round( pepid.getNcnsljxxsmx()+pewp.getRcnsljxxsmx(),2));
+            pewp.setNcnsljxxsmx(StringUtils.round(pepid.getNcnsljxxsmx() + pewp.getRcnsljxxsmx(), 2));
             //年合计待机小时（明细）
-            pewp.setNdjxsmx(StringUtils.round(pepid.getNdjxsmx()+pewp.getRdjxsmx(),2));
+            pewp.setNdjxsmx(StringUtils.round(pepid.getNdjxsmx() + pewp.getRdjxsmx(), 2));
             //年合计缺陷降出力小时（明细）
-            pewp.setNqxjclxsmx(StringUtils.round(pepid.getNqxjclxsmx()+pewp.getRqxjclxsmx(),2));
+            pewp.setNqxjclxsmx(StringUtils.round(pepid.getNqxjclxsmx() + pewp.getRqxjclxsmx(), 2));
             //年合计手动停机小时（明细）
-            pewp.setNsdtjxsmx(StringUtils.round(pepid.getNsdtjxsmx()+pewp.getRsdtjxsmx(),2));
+            pewp.setNsdtjxsmx(StringUtils.round(pepid.getNsdtjxsmx() + pewp.getRsdtjxsmx(), 2));
             //年合计性能小时（明细）
-            pewp.setNbwxsmx(StringUtils.round(pepid.getNbwxsmx()+pewp.getRbwxsmx(),2));
+            pewp.setNbwxsmx(StringUtils.round(pepid.getNbwxsmx() + pewp.getRbwxsmx(), 2));
             //年合计限电停机小时（明细）
-            pewp.setNxdtjxsmx(StringUtils.round(pepid.getNxdtjxsmx()+pewp.getRxdtjxsmx(),2));
+            pewp.setNxdtjxsmx(StringUtils.round(pepid.getNxdtjxsmx() + pewp.getRxdtjxsmx(), 2));
             //年合计限电降出力小时（明细）
-            pewp.setNxdjclxsmx(StringUtils.round(pepid.getNxdjclxsmx()+pewp.getRxdjclxsmx(),2));
+            pewp.setNxdjclxsmx(StringUtils.round(pepid.getNxdjclxsmx() + pewp.getRxdjclxsmx(), 2));
             //年合计场外受累电网小时（明细）
-            pewp.setNcwsldwxsmx(StringUtils.round(pepid.getNcwsldwxsmx()+pewp.getRcwsldwxsmx(),2));
+            pewp.setNcwsldwxsmx(StringUtils.round(pepid.getNcwsldwxsmx() + pewp.getRcwsldwxsmx(), 2));
             //年合计场外受累电网小时（明细）
-            pewp.setNcwsltqxsmx(StringUtils.round(pepid.getNcwsltqxsmx()+pewp.getRcwsltqxsmx(),2));
+            pewp.setNcwsltqxsmx(StringUtils.round(pepid.getNcwsltqxsmx() + pewp.getRcwsltqxsmx(), 2));
             //年合计通讯中断小时（明细）
-            pewp.setNtxzdxsmx(StringUtils.round(pepid.getNtxzdxsmx()+pewp.getRtxzdxsmx(),2));
+            pewp.setNtxzdxsmx(StringUtils.round(pepid.getNtxzdxsmx() + pewp.getRtxzdxsmx(), 2));
             //年合计离线小时（明细）
-            pewp.setNlxxsmx(StringUtils.round(pepid.getNlxxsmx()+pewp.getRlxxsmx(),2));
+            pewp.setNlxxsmx(StringUtils.round(pepid.getNlxxsmx() + pewp.getRlxxsmx(), 2));
 
         }
 
@@ -595,7 +570,7 @@ public class EquipmentInfo2Service {
         pewp.setNslxs(pewp.getRslxs());
     }
 
-        private void calSimple(ProEconEquipmentInfoDay2 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
+    private void calSimple(ProEconEquipmentInfoDay2 pewp, Date end, Date begin, ProBasicEquipment wt, List<ProEconEquipmentInfoDay2> pepidls) throws Exception {
 //        0	待机
 //        1	运行
 //        2	故障
@@ -605,183 +580,175 @@ public class EquipmentInfo2Service {
 //        6	离线
 //*******************************************日信息统计*********************************************************/
 
-        double lastState=-1;//上一分钟状态
+        double lastState = -1;//上一分钟状态
 
 
-        double djsc=0;//待机时长
-        double zcfdsc=0;//正常发电时长
-        double gzsc=0;//故障时长
-        double jxsc=0;//检修时长
-        double xdtjsc=0;//限电停机时长
-        double slsc=0;//受累时长
-        double txzdsc=0;//通讯中断时长
-
+        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;
 
 
-            Map<String, ProBasicEquipmentPoint> aimap=wtpAimap.get(wt.getId());
-            if(aimap.containsKey(ContantXk.SBZT))
-            {
+        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) {
+            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()) {
+                    if (po.getPointValueInDouble() == 0) {
+                        if (lastState != po.getPointValueInDouble()) {
 
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+                            //将当前状态保存到上一分钟状态
+                            lastState = po.getPointValueInDouble();
 
-                            }
-                            //待机时长加1分钟
-                            djsc++;
-                        } else if (po.getPointValueInDouble() == 1) {
-                            if (lastState != po.getPointValueInDouble()) {
+                        }
+                        //待机时长加1分钟
+                        djsc++;
+                    } else if (po.getPointValueInDouble() == 1) {
+                        if (lastState != po.getPointValueInDouble()) {
 
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+                            //将当前状态保存到上一分钟状态
+                            lastState = po.getPointValueInDouble();
 
-                            }
-                            //正常发电时长加1分钟
-                            zcfdsc++;
-                        } else if (po.getPointValueInDouble() == 2) {
-                            if (lastState != po.getPointValueInDouble()) {
+                        }
+                        //正常发电时长加1分钟
+                        zcfdsc++;
+                    } else if (po.getPointValueInDouble() == 2) {
+                        if (lastState != po.getPointValueInDouble()) {
 
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+                            //将当前状态保存到上一分钟状态
+                            lastState = po.getPointValueInDouble();
 
-                            }
-                            //故障时长加1分钟
-                            gzsc++;
-                        } else if (po.getPointValueInDouble() == 3) {
-                            if (lastState != po.getPointValueInDouble()) {
+                        }
+                        //故障时长加1分钟
+                        gzsc++;
+                    } else if (po.getPointValueInDouble() == 3) {
+                        if (lastState != po.getPointValueInDouble()) {
 
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+                            //将当前状态保存到上一分钟状态
+                            lastState = po.getPointValueInDouble();
 
-                            }
+                        }
 
-                            //检修时长加1分钟
-                            jxsc++;
+                        //检修时长加1分钟
+                        jxsc++;
 
-                        } else if (po.getPointValueInDouble() == 4) {
-                            if (lastState != po.getPointValueInDouble()) {
+                    } else if (po.getPointValueInDouble() == 4) {
+                        if (lastState != po.getPointValueInDouble()) {
 
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+                            //将当前状态保存到上一分钟状态
+                            lastState = po.getPointValueInDouble();
 
-                            }
+                        }
 
-                            //限电停机时长加1分钟
-                            xdtjsc++;
-                        } else if (po.getPointValueInDouble() == 5) {
-                            if (lastState != po.getPointValueInDouble()) {
+                        //限电停机时长加1分钟
+                        xdtjsc++;
+                    } else if (po.getPointValueInDouble() == 5) {
+                        if (lastState != po.getPointValueInDouble()) {
 
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+                            //将当前状态保存到上一分钟状态
+                            lastState = po.getPointValueInDouble();
 
-                            }
+                        }
 
-                            //受累时长加1分钟
-                            slsc++;
+                        //受累时长加1分钟
+                        slsc++;
 
-                        } else if (po.getPointValueInDouble() == 6) {
-                            if (lastState != po.getPointValueInDouble()) {
-                                //将当前状态保存到上一分钟状态
-                                lastState = po.getPointValueInDouble();
+                    } else if (po.getPointValueInDouble() == 6) {
+                        if (lastState != po.getPointValueInDouble()) {
+                            //将当前状态保存到上一分钟状态
+                            lastState = po.getPointValueInDouble();
 
-                            }
-                            //通讯中断时长加1分钟
-                            txzdsc++;
                         }
-
+                        //通讯中断时长加1分钟
+                        txzdsc++;
                     }
 
                 }
 
+            }
 
 
-            }
-        
-
-
-    //日合计待机小时
-                    pewp.setRdjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-    //日合计维护停机小时
-                    pewp.setRjxtjxs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-    // 日合计待机小时
-                    pewp.setRdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-    //日合计运行小时
-                    pewp.setRyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-    //日合计限电小时
-                    pewp.setRxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-    //日合计通讯中断小时
-                    pewp.setRtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-    //日合计受累小时
-                    pewp.setRslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
-
-
-            //*******************************************日信息统计*********************************************************/
-
-            //*******************************************月信息统计*********************************************************/
-            if(pepidls.isEmpty())
-            {
-                setLossHoursMonthSimple(pewp);
-
-            }else
-            {
-
-                ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
-
-                //月合计待机小时
-                pewp.setYdjxs(StringUtils.round(pepid.getYdjxs()+pewp.getRdjxs(),2));
-                //月合计维护停机小时
-                pewp.setYjxtjxs(StringUtils.round(pepid.getYjxtjxs()+pewp.getRjxtjxs(),2));
-                // 月合计故障小时
-                pewp.setYgztjxs(StringUtils.round(pepid.getYgztjxs()+pewp.getRgztjxs(),2));
-                //月合计运行小时
-                pewp.setYyxxs(StringUtils.round(pepid.getYyxxs()+pewp.getRyxxs(),2));
-                //月合计限电小时
-                pewp.setYxdxs(StringUtils.round(pepid.getYxdxs()+pewp.getRxdxs(),2));
-                //月合计通讯中断小时
-                pewp.setYtxzdxs(StringUtils.round(pepid.getYtxzdxs()+pewp.getRtxzdxs(),2));
-                //月合计受累小时
-                pewp.setYslxs(StringUtils.round(pepid.getYslxs()+pewp.getRslxs(),2));
+        }
 
-            }
-            //*******************************************月信息统计*********************************************************/
-
-            //*******************************************年信息统计*********************************************************/
-            if(pepidls.isEmpty())
-            {
-                setLossHoursYearSimple(pewp);
-
-            }else
-            {
-                ProEconEquipmentInfoDay2 pepid=pepidls.get(0);
-
-                //年合计待机小时
-                pewp.setNdjxs(StringUtils.round(pepid.getNdjxs()+pewp.getRdjxs(),2));
-                //年合计维护停机小时
-                pewp.setNjxtjxs(StringUtils.round(pepid.getNjxtjxs()+pewp.getRjxtjxs(),2));
-                // 年合计故障小时
-                pewp.setNgztjxs(StringUtils.round(pepid.getNgztjxs()+pewp.getRgztjxs(),2));
-                //年合计运行小时
-                pewp.setNyxxs(StringUtils.round(pepid.getNyxxs()+pewp.getRyxxs(),2));
-                //年合计限电小时
-                pewp.setNxdxs(StringUtils.round(pepid.getNxdxs()+pewp.getRxdxs(),2));
-                //年合计通讯中断小时
-                pewp.setNtxzdxs(StringUtils.round(pepid.getNtxzdxs()+pewp.getRtxzdxs(),2));
-                //年合计受累小时
-                pewp.setNslxs(StringUtils.round(pepid.getNslxs()+pewp.getRslxs(),2));
 
-            }
-            //*******************************************年信息统计*********************************************************/
+        //日合计待机小时
+        pewp.setRdjxs(new BigDecimal(gzsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计维护停机小时
+        pewp.setRjxtjxs(new BigDecimal(jxsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        // 日合计待机小时
+        pewp.setRdjxs(new BigDecimal(djsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计运行小时
+        pewp.setRyxxs(new BigDecimal(zcfdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计限电小时
+        pewp.setRxdxs(new BigDecimal(xdtjsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计通讯中断小时
+        pewp.setRtxzdxs(new BigDecimal(txzdsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //日合计受累小时
+        pewp.setRslxs(new BigDecimal(slsc).divide(new BigDecimal(60), 2, RoundingMode.HALF_EVEN).doubleValue());
+
+
+        //*******************************************日信息统计*********************************************************/
+
+        //*******************************************月信息统计*********************************************************/
+        if (pepidls.isEmpty()) {
+            setLossHoursMonthSimple(pewp);
+
+        } else {
+
+            ProEconEquipmentInfoDay2 pepid = pepidls.get(0);
+
+            //月合计待机小时
+            pewp.setYdjxs(StringUtils.round(pepid.getYdjxs() + pewp.getRdjxs(), 2));
+            //月合计维护停机小时
+            pewp.setYjxtjxs(StringUtils.round(pepid.getYjxtjxs() + pewp.getRjxtjxs(), 2));
+            // 月合计故障小时
+            pewp.setYgztjxs(StringUtils.round(pepid.getYgztjxs() + pewp.getRgztjxs(), 2));
+            //月合计运行小时
+            pewp.setYyxxs(StringUtils.round(pepid.getYyxxs() + pewp.getRyxxs(), 2));
+            //月合计限电小时
+            pewp.setYxdxs(StringUtils.round(pepid.getYxdxs() + pewp.getRxdxs(), 2));
+            //月合计通讯中断小时
+            pewp.setYtxzdxs(StringUtils.round(pepid.getYtxzdxs() + pewp.getRtxzdxs(), 2));
+            //月合计受累小时
+            pewp.setYslxs(StringUtils.round(pepid.getYslxs() + pewp.getRslxs(), 2));
+
+        }
+        //*******************************************月信息统计*********************************************************/
+
+        //*******************************************年信息统计*********************************************************/
+        if (pepidls.isEmpty()) {
+            setLossHoursYearSimple(pewp);
+
+        } else {
+            ProEconEquipmentInfoDay2 pepid = pepidls.get(0);
+
+            //年合计待机小时
+            pewp.setNdjxs(StringUtils.round(pepid.getNdjxs() + pewp.getRdjxs(), 2));
+            //年合计维护停机小时
+            pewp.setNjxtjxs(StringUtils.round(pepid.getNjxtjxs() + pewp.getRjxtjxs(), 2));
+            // 年合计故障小时
+            pewp.setNgztjxs(StringUtils.round(pepid.getNgztjxs() + pewp.getRgztjxs(), 2));
+            //年合计运行小时
+            pewp.setNyxxs(StringUtils.round(pepid.getNyxxs() + pewp.getRyxxs(), 2));
+            //年合计限电小时
+            pewp.setNxdxs(StringUtils.round(pepid.getNxdxs() + pewp.getRxdxs(), 2));
+            //年合计通讯中断小时
+            pewp.setNtxzdxs(StringUtils.round(pepid.getNtxzdxs() + pewp.getRtxzdxs(), 2));
+            //年合计受累小时
+            pewp.setNslxs(StringUtils.round(pepid.getNslxs() + pewp.getRslxs(), 2));
+
+        }
+        //*******************************************年信息统计*********************************************************/
     }
 
 

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

@@ -40,7 +40,14 @@ public class EquipmentInfo3Service {
     public void calEquipmentInfoDay(Date recordDate) throws Exception {
         Calendar c=Calendar.getInstance();
         c.setTime(recordDate);
+        if(c.get(Calendar.MINUTE)==0)
+        {
+            c.add(Calendar.DAY_OF_MONTH,-1);
+        }
 
+        c.set(Calendar.HOUR_OF_DAY, 23);
+        c.set(Calendar.MINUTE, 59);
+        c.set(Calendar.SECOND, 59);
         Date end=c.getTime();
 
         Date begin= DateUtils.truncate(c.getTime());
@@ -98,20 +105,38 @@ public class EquipmentInfo3Service {
 
         List<String> wpls=new ArrayList<>();
             List<ProEconEquipmentInfoDay3> dayls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
-        for(ProBasicEquipment wt:CacheContext.wtls)
-        {
+//        final CountDownLatch latch = new CountDownLatch(+CacheContext.wtls.size());
+//        for(ProBasicEquipment wt:CacheContext.wtls)
+//        {
+//
+//            if(!wpls.contains(wt.getWindpowerstationId()))
+//            {
+//                wpls.add(wt.getWindpowerstationId());
+//            }
+//
+//            new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
+//                    recordDate,  end,  begin,dayls,
+//                    edosUtil,latch)).start();
+//        }
+//        latch.await();
+
+
+        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
 
-            if(!wpls.contains(wt.getWindpowerstationId()))
-            {
-                wpls.add(wt.getWindpowerstationId());
-            }
 
-            new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
-                    recordDate,  end,  begin,dayls,
-                    edosUtil,latch)).start();
+            final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+            for (ProBasicEquipment wt : entry.getValue()) {
+                if (!wpls.contains(wt.getWindpowerstationId())) {
+                    wpls.add(wt.getWindpowerstationId());
+                }
+
+                new Thread(new EquipmentInfo3Thread(executor,  wt,  pep3map,
+                        recordDate,  end,  begin,dayls,
+                        edosUtil,latch)).start();
+
+            }
+            latch.await();
         }
-        latch.await();
 
 
         c=Calendar.getInstance();

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

@@ -72,7 +72,14 @@ public class EquipmentInfo4Service {
     public void calEquipmentInfoDay(Date recordDate) throws Exception {
         Calendar c = Calendar.getInstance();
         c.setTime(recordDate);
+        if(c.get(Calendar.MINUTE)==0)
+        {
+            c.add(Calendar.DAY_OF_MONTH,-1);
+        }
 
+        c.set(Calendar.HOUR_OF_DAY, 23);
+        c.set(Calendar.MINUTE, 59);
+        c.set(Calendar.SECOND, 59);
         Date end = c.getTime();
 
         Date begin = DateUtils.truncate(c.getTime());
@@ -194,111 +201,64 @@ public class EquipmentInfo4Service {
         List<ProEconEquipmentInfoDay4> dayls=new ArrayList<>();
 
         List<String> wpls=new ArrayList<>();
-        final CountDownLatch latch = new CountDownLatch(CacheContext.wt_fjls.size());
-        for (ProBasicEquipment wt : CacheContext.wt_fjls) {
-//            if (CacheContext.wtpAimap.containsKey(wt.getId())) {
-//
-//
-//                ProEconEquipmentInfoDay4 pewp = new ProEconEquipmentInfoDay4();
-//                Initial.initial(pewp);
-//                pewp.setCompanyId(wt.getCompanyId());
-//                pewp.setWindpowerstationId(wt.getWindpowerstationId());
-//                pewp.setLineId(wt.getLineId());
-//                pewp.setProjectId(wt.getProjectId());
-//                pewp.setRegionId(wt.getRegionId());
-//                pewp.setRecordDate(DateUtils.truncate(recordDate));
-//                pewp.setWindturbineId(wt.getId());
-//                //昨日的统计结果
-//                List<ProEconEquipmentInfoDay4> 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<ProEconEquipmentInfoDay4> queryWrapper4 = new QueryWrapper<>();
-////                    queryWrapper4.eq("record_date",DateUtils.truncate(cl.getTime()))
-////                            .eq("windturbine_id",wt.getId());
-////                    pepidls = proEconEquipmentInfoDay4Service.list(queryWrapper4);
-//////                            .stream()
-//////                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//////                                    && i.getWindturbineId().equals(wt.getId())
-//////                            )
-//////                            .collect(Collectors.toList());
-////                }
-////
-////                //获得当日设备统计2表数据
-////                ProEconEquipmentInfoDay2 pepid2 = null;
-////                List<ProEconEquipmentInfoDay2> pepid2ls;
-////                QueryWrapper<ProEconEquipmentInfoDay2> queryWrapper5 = new QueryWrapper<>();
-////                queryWrapper5.eq("record_date",DateUtils.truncate(cl.getTime())).eq("windturbine_id",wt.getId());
-////                pepid2ls = proEconEquipmentInfoDay2Service.list(queryWrapper5);
-//////                        .stream()
-//////                        .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//////                                && i.getWindturbineId().equals(wt.getId())
-//////                        ).collect(Collectors.toList());
-////
-////                if (!pepid2ls.isEmpty()) {
-////                    pepid2 = pepid2ls.get(0);
-////                }
-////                //获得当日设备统计3表数据
-////                ProEconEquipmentInfoDay3 pepid3 = null;
-////                List<ProEconEquipmentInfoDay3> pepid3ls;
-////                QueryWrapper<ProEconEquipmentInfoDay3> queryWrapper6 = new QueryWrapper<>();
-////                queryWrapper6.eq("record_date",DateUtils.truncate(cl.getTime())).eq("windturbine_id",wt.getId());
-////                pepid3ls = proEconEquipmentInfoDay3Service.list(queryWrapper6);
-//////                        .stream()
-//////                        .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//////                                && i.getWindturbineId().equals(wt.getId())
-//////                        ).collect(Collectors.toList());
-////
-////                if (!pepid3ls.isEmpty()) {
-////                    pepid3 = pepid3ls.get(0);
-////                }
-//
-//                ProEconEquipmentInfoDay2 pepid2 = null;
-//                ProEconEquipmentInfoDay3 pepid3 = null;
-//
-//                if(pep4map.containsKey(wt.getId()))
-//                {
-//                    pepidls.add(pep4map.get(wt.getId()));
-//                }
-//                if(pep2map.containsKey(wt.getId()))
-//                {
-//                    pepid2=pep2map.get(wt.getId());
-//                }
-//                if(pep3map.containsKey(wt.getId()))
-//                {
-//                    pepid3=pep3map.get(wt.getId());
-//                }
-//                calDetiall(peioomap, pewp, end, begin, wt, pepidls, pepid2, pepid3,  wgmap);
+//        final CountDownLatch latch = new CountDownLatch(CacheContext.wt_fjls.size());
+//        for (ProBasicEquipment wt : CacheContext.wt_fjls) {
+//            if(!wpls.contains(wt.getWindpowerstationId()))
+//            {
+//                wpls.add(wt.getWindpowerstationId());
+//            }
 //
-//                dayls.add(pewp);
-//                // proEconEquipmentInfoDay1Service.save(pewp);
+//            new Thread(new EquipmentInfo4Thread(executor,wt, pep2map,
+//                    pep3map,
+//                    pep4map,
+//                    recordDate,  end,  begin,  dayls,
+//                    edosUtil, peioomap,
+//                    wgmap,
+//                    proEconCurveFittingMainService,
+//                    proEconEquipmentInfoDay5Service,
+//                    proEconFaultLiminatedefectsService,
+//                    proEconCurveFittingSubService,
+//                    proEconCurveFittMonthMainService,
+//                    proEconCurveFittMonthSubService,
+//                    proEconCurveFittYearMainService,
+//                    proEconCurveFittYearSubService,latch)).start();
+//        }
 //
-//            }
-            if(!wpls.contains(wt.getWindpowerstationId()))
+//        latch.await();
+
+        for (Map.Entry<String, List<ProBasicEquipment>> entry : CacheContext.wpwtmap.entrySet()) {
+
+
+            if(entry.getKey().contains("FDC"))
             {
-                wpls.add(wt.getWindpowerstationId());
+                final CountDownLatch latch = new CountDownLatch(entry.getValue().size());
+                for (ProBasicEquipment wt : entry.getValue()) {
+
+                    if (!wpls.contains(wt.getWindpowerstationId())) {
+                        wpls.add(wt.getWindpowerstationId());
+                    }
+
+                    new Thread(new EquipmentInfo4Thread(executor,wt, pep2map,
+                            pep3map,
+                            pep4map,
+                            recordDate,  end,  begin,  dayls,
+                            edosUtil, peioomap,
+                            wgmap,
+                            proEconCurveFittingMainService,
+                            proEconEquipmentInfoDay5Service,
+                            proEconFaultLiminatedefectsService,
+                            proEconCurveFittingSubService,
+                            proEconCurveFittMonthMainService,
+                            proEconCurveFittMonthSubService,
+                            proEconCurveFittYearMainService,
+                            proEconCurveFittYearSubService,latch)).start();
+
+                }
+                latch.await();
             }
 
-            new Thread(new EquipmentInfo4Thread(executor,wt, pep2map,
-                    pep3map,
-                    pep4map,
-                    recordDate,  end,  begin,  dayls,
-                    edosUtil, peioomap,
-                    wgmap,
-                    proEconCurveFittingMainService,
-                    proEconEquipmentInfoDay5Service,
-                    proEconFaultLiminatedefectsService,
-                    proEconCurveFittingSubService,
-                    proEconCurveFittMonthMainService,
-                    proEconCurveFittMonthSubService,
-                    proEconCurveFittYearMainService,
-                    proEconCurveFittYearSubService,latch)).start();
         }
 
-        latch.await();
-
 
         c = Calendar.getInstance();
         c.setTime(recordDate);

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

@@ -407,14 +407,18 @@ public class EquipmentInfoDayTopService {
 
             //设备可利用率
             int dayhours = 24;
-            double temp = StringUtils.round((dayhours - peeidt.getDaygzsj()/dayhours*100), 2);
+
+
+//            double temp = StringUtils.round(((dayhours - peeidt.getDaygzsj()/dayhours)*100), 2);
+            double temp= new BigDecimal(dayhours - peeidt.getDaygzsj()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
             peeidt.setDaysbklyl(temp);
 
 
 
             //等效可用系数
             dayhours = 24;
-            temp = StringUtils.round((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours*100, 2);
+//            temp = StringUtils.round(((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours)*100, 2);
+            temp= new BigDecimal(dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
             peeidt.setDaydxkyxs(temp);
 
 
@@ -438,7 +442,7 @@ public class EquipmentInfoDayTopService {
             //静风频率
 
             int dayhours = 24;
-            double temp = BigDecimal.valueOf(pepid4.getRjfsc()).divide(new BigDecimal(dayhours), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+            double temp = BigDecimal.valueOf(pepid4.getRjfsc()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
             peeidt.setDayjfpl(temp);
 
 
@@ -529,14 +533,19 @@ public class EquipmentInfoDayTopService {
 
             //设备可利用率
             int dayhours = 24*days;
-            double temp = StringUtils.round((dayhours - peeidt.getDaygzsj())/dayhours*100, 2);
+//            double temp = StringUtils.round(((dayhours - peeidt.getDaygzsj())/dayhours)*100, 2);
+            double temp=dayhours - peeidt.getDaygzsj();
+            temp= new BigDecimal(temp).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
             peeidt.setDaysbklyl(temp);
 
 
 
             //等效可用系数
             dayhours = 24*days;
-            temp = StringUtils.round((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours*100, 2);
+//            temp = StringUtils.round(((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours)*100, 2);
+            temp= new BigDecimal(dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
             peeidt.setDaydxkyxs(temp);
 
 
@@ -559,7 +568,7 @@ public class EquipmentInfoDayTopService {
             //静风频率
 
             int dayhours = 24*days;
-            double temp = BigDecimal.valueOf(pepid4.getYjfsc()).divide(new BigDecimal(dayhours), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+            double temp = BigDecimal.valueOf(pepid4.getYjfsc()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
             peeidt.setDayjfpl(temp);
 
 
@@ -649,16 +658,32 @@ public class EquipmentInfoDayTopService {
             peeidt.setDaylyxs(BigDecimal.valueOf(peeidt.getDayfdl()).divide(new BigDecimal(defaultpower), 2, RoundingMode.HALF_EVEN).doubleValue());
 
 
+//            //设备可利用率
+//            int dayhours = 24*days;
+//            double temp = StringUtils.round(((dayhours - peeidt.getDaygzsj())/dayhours)*100, 2);
+//            peeidt.setDaysbklyl(temp);
+//
+//
+//
+//            //等效可用系数
+//            dayhours = 24*days;
+//            temp = StringUtils.round(((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours)*100, 2);
+//            peeidt.setDaydxkyxs(temp);
+
             //设备可利用率
             int dayhours = 24*days;
-            double temp = StringUtils.round((dayhours - peeidt.getDaygzsj())/dayhours*100, 2);
+//            double temp = StringUtils.round(((dayhours - peeidt.getDaygzsj())/dayhours)*100, 2);
+            double temp= new BigDecimal(dayhours - peeidt.getDaygzsj()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
             peeidt.setDaysbklyl(temp);
 
 
 
             //等效可用系数
             dayhours = 24*days;
-            temp = StringUtils.round((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours*100, 2);
+//            temp = StringUtils.round(((dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj())/dayhours)*100, 2);
+            temp= new BigDecimal(dayhours - peeidt.getDaygzsj() - peeidt.getDaywhsj()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+
             peeidt.setDaydxkyxs(temp);
 
 
@@ -681,7 +706,7 @@ public class EquipmentInfoDayTopService {
 
             //静风频率
             int dayhours = 24*days;
-            double temp = BigDecimal.valueOf(pepid4.getNjfsc()).divide(new BigDecimal(dayhours), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
+            double temp = BigDecimal.valueOf(pepid4.getNjfsc()).divide(new BigDecimal(dayhours), 4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue();
             peeidt.setDayjfpl(temp);
 
 
@@ -873,9 +898,9 @@ public class EquipmentInfoDayTopService {
         value = 0.0;
         value = top.getDaynhyd();
         //拟合优度
-        if (value >= 0.5) {
+        if (value <=15) {
             nhydValue = 0;
-        } else if (value <= 0.15) {
+        } else if (value>=80) {
             nhydValue = m;
         } else {
             temp = d * (size - top.getMonthnhyd());
@@ -889,9 +914,9 @@ public class EquipmentInfoDayTopService {
         value = 0.0;
         value = top.getDayglyzxxs();
 
-        if (value >= 50) {
+        if (value <=15) {
             glyzxxsValue = 0;
-        } else if (value <= 15) {
+        } else if (value>=80) {
             glyzxxsValue = m;
         } else {
             temp = d * (size - top.getMonthglyzxxs());

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

@@ -1328,41 +1328,41 @@ public class InputOrOutPutService {
         total1.setDayOutputBigMin(summaryStatistics.getMin());
 
 
-        total2.setDaya1((double) B1List.size());
-        total2.setDaya2((double) B2List.size());
-        total2.setDaya3((double) B3List.size());
-        total2.setDaya4((double) B4List.size());
-        total2.setDaya5((double) B5List.size());
-        total2.setDaya6((double) B6List.size());
-        total2.setDaya7((double) B7List.size());
+        total2.setDayb1((double) B1List.size());
+        total2.setDayb2((double) B2List.size());
+        total2.setDayb3((double) B3List.size());
+        total2.setDayb4((double) B4List.size());
+        total2.setDayb5((double) B5List.size());
+        total2.setDayb6((double) B6List.size());
+        total2.setDayb7((double) B7List.size());
 
         count = B1List.size() + B2List.size() + B3List.size() + B4List.size() + B5List.size() + B6List.size() + B7List.size();
 
         if (count > 0) {
-            total2.setDaya8(new BigDecimal(B1List.size()).divide(new BigDecimal(count),
+            total2.setDayb8(new BigDecimal(B1List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setDaya9(new BigDecimal(B2List.size()).divide(new BigDecimal(count),
+            total2.setDayb9(new BigDecimal(B2List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setDaya10(new BigDecimal(B3List.size()).divide(new BigDecimal(count),
+            total2.setDayb10(new BigDecimal(B3List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setDaya11(new BigDecimal(B4List.size()).divide(new BigDecimal(count),
+            total2.setDayb11(new BigDecimal(B4List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setDaya12(new BigDecimal(B5List.size()).divide(new BigDecimal(count),
+            total2.setDayb12(new BigDecimal(B5List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setDaya13(new BigDecimal(B6List.size()).divide(new BigDecimal(count),
+            total2.setDayb13(new BigDecimal(B6List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setDaya14(new BigDecimal(B7List.size()).divide(new BigDecimal(count),
+            total2.setDayb14(new BigDecimal(B7List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
 
         } else {
-            total2.setDaya8(0.0);
-            total2.setDaya9(0.0);
-            total2.setDaya10(0.0);
-            total2.setDaya11(0.0);
-            total2.setDaya12(0.0);
-            total2.setDaya13(0.0);
-            total2.setDaya14(0.0);
+            total2.setDayb8(0.0);
+            total2.setDayb9(0.0);
+            total2.setDayb10(0.0);
+            total2.setDayb11(0.0);
+            total2.setDayb12(0.0);
+            total2.setDayb13(0.0);
+            total2.setDayb14(0.0);
         }
     }
 
@@ -1539,41 +1539,41 @@ public class InputOrOutPutService {
         total1.setMonthOutputBigMin(summaryStatistics.getMin());
 
 
-        total2.setMontha1((double) B1List.size());
-        total2.setMontha2((double) B2List.size());
-        total2.setMontha3((double) B3List.size());
-        total2.setMontha4((double) B4List.size());
-        total2.setMontha5((double) B5List.size());
-        total2.setMontha6((double) B6List.size());
-        total2.setMontha7((double) B7List.size());
+        total2.setMonthb1((double) B1List.size());
+        total2.setMonthb2((double) B2List.size());
+        total2.setMonthb3((double) B3List.size());
+        total2.setMonthb4((double) B4List.size());
+        total2.setMonthb5((double) B5List.size());
+        total2.setMonthb6((double) B6List.size());
+        total2.setMonthb7((double) B7List.size());
 
         count = B1List.size() + B2List.size() + B3List.size() + B4List.size() + B5List.size() + B6List.size() + B7List.size();
 
         if (count > 0) {
-            total2.setMontha8(new BigDecimal(B1List.size()).divide(new BigDecimal(count),
+            total2.setMonthb8(new BigDecimal(B1List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setMontha9(new BigDecimal(B2List.size()).divide(new BigDecimal(count),
+            total2.setMonthb9(new BigDecimal(B2List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setMontha10(new BigDecimal(B3List.size()).divide(new BigDecimal(count),
+            total2.setMonthb10(new BigDecimal(B3List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setMontha11(new BigDecimal(B4List.size()).divide(new BigDecimal(count),
+            total2.setMonthb11(new BigDecimal(B4List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setMontha12(new BigDecimal(B5List.size()).divide(new BigDecimal(count),
+            total2.setMonthb12(new BigDecimal(B5List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setMontha13(new BigDecimal(B6List.size()).divide(new BigDecimal(count),
+            total2.setMonthb13(new BigDecimal(B6List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setMontha14(new BigDecimal(B7List.size()).divide(new BigDecimal(count),
+            total2.setMonthb14(new BigDecimal(B7List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
 
         } else {
-            total2.setMontha8(0.0);
-            total2.setMontha9(0.0);
-            total2.setMontha10(0.0);
-            total2.setMontha11(0.0);
-            total2.setMontha12(0.0);
-            total2.setMontha13(0.0);
-            total2.setMontha14(0.0);
+            total2.setMonthb8(0.0);
+            total2.setMonthb9(0.0);
+            total2.setMonthb10(0.0);
+            total2.setMonthb11(0.0);
+            total2.setMonthb12(0.0);
+            total2.setMonthb13(0.0);
+            total2.setMonthb14(0.0);
         }
     }
 
@@ -1750,41 +1750,41 @@ public class InputOrOutPutService {
         total1.setYearOutputBigMin(summaryStatistics.getMin());
 
 
-        total2.setYeara1((double) B1List.size());
-        total2.setYeara2((double) B2List.size());
-        total2.setYeara3((double) B3List.size());
-        total2.setYeara4((double) B4List.size());
-        total2.setYeara5((double) B5List.size());
-        total2.setYeara6((double) B6List.size());
-        total2.setYeara7((double) B7List.size());
+        total2.setYearb1((double) B1List.size());
+        total2.setYearb2((double) B2List.size());
+        total2.setYearb3((double) B3List.size());
+        total2.setYearb4((double) B4List.size());
+        total2.setYearb5((double) B5List.size());
+        total2.setYearb6((double) B6List.size());
+        total2.setYearb7((double) B7List.size());
 
         count = B1List.size() + B2List.size() + B3List.size() + B4List.size() + B5List.size() + B6List.size() + B7List.size();
 
         if (count > 0) {
-            total2.setYeara8(new BigDecimal(B1List.size()).divide(new BigDecimal(count),
+            total2.setYearb8(new BigDecimal(B1List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setYeara9(new BigDecimal(B2List.size()).divide(new BigDecimal(count),
+            total2.setYearb9(new BigDecimal(B2List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setYeara10(new BigDecimal(B3List.size()).divide(new BigDecimal(count),
+            total2.setYearb10(new BigDecimal(B3List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setYeara11(new BigDecimal(B4List.size()).divide(new BigDecimal(count),
+            total2.setYearb11(new BigDecimal(B4List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setYeara12(new BigDecimal(B5List.size()).divide(new BigDecimal(count),
+            total2.setYearb12(new BigDecimal(B5List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setYeara13(new BigDecimal(B6List.size()).divide(new BigDecimal(count),
+            total2.setYearb13(new BigDecimal(B6List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            total2.setYeara14(new BigDecimal(B7List.size()).divide(new BigDecimal(count),
+            total2.setYearb14(new BigDecimal(B7List.size()).divide(new BigDecimal(count),
                     4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
 
         } else {
-            total2.setYeara8(0.0);
-            total2.setYeara9(0.0);
-            total2.setYeara10(0.0);
-            total2.setYeara11(0.0);
-            total2.setYeara12(0.0);
-            total2.setYeara13(0.0);
-            total2.setYeara14(0.0);
+            total2.setYearb8(0.0);
+            total2.setYearb9(0.0);
+            total2.setYearb10(0.0);
+            total2.setYearb11(0.0);
+            total2.setYearb12(0.0);
+            total2.setYearb13(0.0);
+            total2.setYearb14(0.0);
         }
     }
 

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

@@ -52,7 +52,7 @@ public class CycleCalculationService {
         Date date = DateUtils.addMinutes(currentDate, -5);
         Date date15age = DateUtils.addMinutes(currentDate, -15);
 
-        Date samedayZero = DateUtils.getSamedayZero();
+        Date samedayZero = DateUtils.truncate(currentDate);
         Date samedayZeroAdd15 = DateUtils.addMinutes(samedayZero, 15);
 
         Date monthFirstZero = DateUtils.getMonthFirstZero();
@@ -198,18 +198,18 @@ public class CycleCalculationService {
                     double date15agofdl = edosUtil.getSectionData(rssfdlPoint, date15age.getTime()).getPointValueInDouble() * rssfdlPoint.getCoefficient();
 
                     double rfdl = ssfdl - zerofdl;
-                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(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);
@@ -235,10 +235,7 @@ public class CycleCalculationService {
 
                     }
 
-//                        if(wt.getWindpowerstationId().equals("SXJ_KGDL_TZ_GDC_STA"))
-//                        {
-//                            System.out.println("");
-//                        }
+
 
                     double yfdl = ssfdl - monthfirstfdl;
                     if (yfdl <= 0 || yfdl < rfdl || yfdl > modelpower.get(wt.getModelId()) * 24 * 31 * 1.5) {
@@ -554,8 +551,6 @@ public class CycleCalculationService {
                             }
                         } else {
 
-
-
                             List<PointData> pointls = edosUtil.getHistoryDatasSnap(gzdPoint, samedayZero.getTime() / 1000, currentDate.getTime() / 1000, null, 60l);
                             if(!pointls.isEmpty())
                             {

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

@@ -19,6 +19,8 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
 import java.util.*;
 import java.util.concurrent.atomic.AtomicReference;
 
@@ -346,17 +348,35 @@ public class ElectricityMeteringService {
 
 
                 //线路上网电量
-                double xlswdl = (real - sameday) * magnification / xs * percentageMap.get("percentage");
+//                double xlswdl = (real - sameday) * magnification / xs * percentageMap.get("percentage");
+
+                double  xlswdl=0.0;
+                if(StringUtils.notEmp(xs) && xs!=0)
+                {
+                    xlswdl=new BigDecimal(real - sameday).multiply(new BigDecimal(magnification)).divide(new BigDecimal(xs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(percentageMap.get("percentage"))).doubleValue();
+                }
                 ProBasicPowerstationPoint rpoint = proBasicWppointMap.get(ContantXk.RSWDL);
                 PointData rpointData = PointUtil.createPointData(date, xlswdl, rpoint.getNemCode(), rpoint.getName());
                 lineResultList.add(rpointData);
                 //线路月上网发电量
-                double xlyswdl = (real - month) * magnification / xs * percentageMap.get("ypercentage");
+//                double xlyswdl = (real - month) * magnification / xs * percentageMap.get("ypercentage");
+
+                double  xlyswdl=0.0;
+                if(StringUtils.notEmp(xs) && xs!=0)
+                {
+                    xlyswdl=new BigDecimal(real - month).multiply(new BigDecimal(magnification)).divide(new BigDecimal(xs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(percentageMap.get("ypercentage"))).doubleValue();
+                }
                 ProBasicPowerstationPoint ypoint = proBasicWppointMap.get(ContantXk.YSWDL);
                 PointData ypointData = PointUtil.createPointData(date, xlyswdl, ypoint.getNemCode(), ypoint.getName());
                 lineResultList.add(ypointData);
                 //线路年上网发电量
-                double xlnswfdl = (real - year) * magnification / xs * percentageMap.get("npercentage");
+//                double xlnswfdl = (real - year) * magnification / xs * percentageMap.get("npercentage");
+
+                double  xlnswfdl=0.0;
+                if(StringUtils.notEmp(xs) && xs!=0)
+                {
+                    xlnswfdl=new BigDecimal(real - year).multiply(new BigDecimal(magnification)).divide(new BigDecimal(xs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(percentageMap.get("npercentage"))).doubleValue();
+                }
                 ProBasicPowerstationPoint npoint = proBasicWppointMap.get(ContantXk.NSWDL);
                 PointData npointData = PointUtil.createPointData(date, xlnswfdl, npoint.getNemCode(), npoint.getName());
                 lineResultList.add(npointData);
@@ -387,17 +407,35 @@ public class ElectricityMeteringService {
                 Map<String, ProBasicPowerstationPoint> powerstationPointMap = CacheContext.linepointmap.get(line);
 
                 //线路日发电量
-                double xlrfdl = (real - sameday) * magnification / xs;
+//                double xlrfdl = (real - sameday) * magnification / xs;
+                double  xlrfdl=0.0;
+                if(StringUtils.notEmp(xs) && xs!=0)
+                {
+                     xlrfdl=new BigDecimal(real - sameday).multiply(new BigDecimal(magnification)).divide(new BigDecimal(xs), 2, RoundingMode.HALF_EVEN).doubleValue();
+                }
+
                 ProBasicPowerstationPoint rpoint = powerstationPointMap.get(ContantXk.RFDLSYZ);
                 PointData r = PointUtil.createPointData(date, xlrfdl, rpoint.getNemCode(),rpoint.getName());
                 lineResultList.add(r);
                 //线路月发电量
-                double xlyfdl = (real - month) * magnification / xs;
+//                double xlyfdl = (real - month) * magnification / xs;
+
+                double  xlyfdl=0.0;
+                if(StringUtils.notEmp(xs) && xs!=0)
+                {
+                    xlyfdl=new BigDecimal(real - month).multiply(new BigDecimal(magnification)).divide(new BigDecimal(xs), 2, RoundingMode.HALF_EVEN).doubleValue();
+                }
                 ProBasicPowerstationPoint ypoint = powerstationPointMap.get(ContantXk.YFDLSYZ);
                 PointData y = PointUtil.createPointData(date, xlyfdl,ypoint.getNemCode(),ypoint.getName());
                 lineResultList.add(y);
                 //线路年发电量
-                double xlnfdl = (real - year) * magnification / xs;
+//                double xlnfdl = (real - year) * magnification / xs;
+
+                double  xlnfdl=0.0;
+                if(StringUtils.notEmp(xs) && xs!=0)
+                {
+                    xlnfdl=new BigDecimal(real - year).multiply(new BigDecimal(magnification)).divide(new BigDecimal(xs), 2, RoundingMode.HALF_EVEN).doubleValue();
+                }
                 ProBasicPowerstationPoint npoint = powerstationPointMap.get(ContantXk.NFDLSYZ);
                 PointData n = PointUtil.createPointData(date, xlnfdl,npoint.getNemCode(),npoint.getName());
                 lineResultList.add(n);

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

@@ -308,51 +308,55 @@ public class LightToTheoreticalPower {
 
             }
 
-            if (lastState== 0) {
-                rdjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rdjssdl);
+            if(stateBegin.getTime()!=stateEnd.getTime() && DateUtils.minutesDiff(stateBegin,stateEnd)>=1)
+            {
+                if (lastState== 0) {
+                    rdjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rdjssdl);
 
-            } else if (lastState == 1) {
-                rsdtjssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rsdtjssdl);
+                } 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 == 3) {
+                    rqxjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rqxjclssdl);
 
 
-            } else if (lastState == 4) {
-                double lldl = getLldl(pointid, stateBegin, stateEnd);
-                rgzssdl = rgzssdl + lldl;
+                } 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 == 5) {
+                    rcnslgzssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnslgzssdl);
 
-            } else if (lastState == 6) {
-                double lldl = getLldl(pointid, stateBegin, stateEnd);
-                rjxssdl = rjxssdl + lldl;
+                } else if (lastState == 6) {
+                    double lldl = getLldl(pointid, stateBegin, stateEnd);
+                    rjxssdl = rjxssdl + lldl;
 
-            } else if (lastState == 7) {
+                } else if (lastState == 7) {
 
-                rcnsljxssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnsljxssdl);
+                    rcnsljxssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rcnsljxssdl);
 
-            } else if (lastState == 8) {
+                } else if (lastState == 8) {
 
-                rxdjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rxdjclssdl);
+                    rxdjclssdl = getSsdl(pointid, stateBegin, stateEnd, pmap, rxdjclssdl);
 
-            } else if (lastState == 9) {
+                } else if (lastState == 9) {
 
-                double lldl = getLldl(pointid, stateBegin, stateEnd);
-                rxdtjssdl = rxdtjssdl + lldl;
-            } else if (lastState == 10) {
+                    double lldl = getLldl(pointid, stateBegin, stateEnd);
+                    rxdtjssdl = rxdtjssdl + lldl;
+                } else if (lastState == 10) {
 
-                double lldl = getLldl(pointid, stateBegin, stateEnd);
-                rcwsldwssdl = rcwsldwssdl + lldl;
+                    double lldl = getLldl(pointid, stateBegin, stateEnd);
+                    rcwsldwssdl = rcwsldwssdl + lldl;
 
-            } else if (lastState == 11) {
-                double lldl = getLldl(pointid, stateBegin, stateEnd);
-                rcwsltqssdl = rcwsltqssdl + lldl;
+                } else if (lastState == 11) {
+                    double lldl = getLldl(pointid, stateBegin, stateEnd);
+                    rcwsltqssdl = rcwsltqssdl + lldl;
 
+                }
             }
 
+
         }
 
         vo.setLlfdl(llfdl);
@@ -416,31 +420,36 @@ public class LightToTheoreticalPower {
     private double getLldl(String pointid, Date stateBegin, Date stateEnd) throws Exception {
 
         double result = 0.0;
-        List<PointData> pointls = edosUtil.getHistoryDatasSnap(pointid, stateBegin.getTime() / 1000, stateEnd.getTime() / 1000);
-        if (!pointls.isEmpty()) {
-            List<PointData> filterls = new ArrayList<>();
-            for (PointData p : pointls) {
-                if (p.getPointValueInDouble() > 10) {
-                    filterls.add(p);
+        if(stateBegin.getTime()!=stateEnd.getTime() && DateUtils.secondsDiff(stateBegin,stateEnd)>=60)
+        {
+
+            List<PointData> pointls = edosUtil.getHistoryDatasSnap(pointid, stateBegin.getTime() / 1000, stateEnd.getTime() / 1000);
+            if (!pointls.isEmpty()) {
+                List<PointData> filterls = new ArrayList<>();
+                for (PointData p : pointls) {
+                    if (p.getPointValueInDouble() > 10) {
+                        filterls.add(p);
+                    }
                 }
-            }
 
 
-            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);
+                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();
-                double avg = StringUtils.round(summaryStatistics.getAverage(), 2);
+                    DoubleSummaryStatistics summaryStatistics = filterls.stream().mapToDouble(PointData::getPointValueInDouble).summaryStatistics();
+                    double avg = StringUtils.round(summaryStatistics.getAverage(), 2);
 
-                result = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    result = new BigDecimal(avg * hours).divide(new BigDecimal(1000), 2, RoundingMode.HALF_EVEN).doubleValue();
 
 
-            }
+                }
 
 
+            }
         }
+
         return result;
     }
 }