修改计算服务

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

@@ -16,30 +16,101 @@ public class GenerationMain {
     public static void main(String[] args) throws Exception {
         SpringApplication.run(GenerationMain.class, args);
 
-//
+
 //        Calendar c = Calendar.getInstance();
 //        Date begin = null;
 //        Date end = null;
-//        c.set(Calendar.DAY_OF_MONTH, 27);
+//        c.set(Calendar.DAY_OF_MONTH, 1);
 //
 //        c.setTime(DateUtils.truncate(c.getTime()));
 //
 //        begin = new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 3; i++) {
+//        for (int i = 0; i < 11; i++) {
 //
 //
 //            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
 //
-//            WindturbineGoodnessService windturbineGoodnessService = SpringUtils.getBean("windturbineGoodnessService");
-//            WpwindDayInfoService wpwindDayInfoService = SpringUtils.getBean("wpwindDayInfoService");
-//            WtwindDayInfoService wtwindDayInfoService = SpringUtils.getBean("wtwindDayInfoService");
-//            InputOrOutPutService inputOrOutPutService = SpringUtils.getBean("inputOrOutPutService");
+//            EquipmentInfo1Service equipmentInfo1Service = SpringUtils.getBean("equipmentInfo1Service");
+//            EquipmentInfo2Service equipmentInfo2Service = SpringUtils.getBean("equipmentInfo2Service");
+//            EquipmentInfo3Service equipmentInfo3Service = SpringUtils.getBean("equipmentInfo3Service");
+//            EquipmentInfo4Service equipmentInfo4Service = SpringUtils.getBean("equipmentInfo4Service");
+//            EquipmentInfo5Service equipmentInfo5Service = SpringUtils.getBean("equipmentInfo5Service");
+//            EquipmentInfoDayTopService equipmentInfoDayTopService = SpringUtils.getBean("equipmentInfoDayTopService");
+//            WtAlysisDayService wtAlysisDayService = SpringUtils.getBean("wtAlysisDayService");
+//
+//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+//            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
+//
+//            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
+//            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
 //
-//            windturbineGoodnessService.calWindturbineGoodness(c.getTime());
-//            wpwindDayInfoService.calWpwindDayInfo(c.getTime());
-//            wtwindDayInfoService.calWtwindDayInfo(c.getTime());
-//            inputOrOutPutService.inputOrOutput(c.getTime());
+//            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
+//
+//            c.add(Calendar.DAY_OF_MONTH, 1);
+//
+//            System.out.println("完成一次!。。。。。。");
+//        }
+//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+//
+//
+//        c.set(Calendar.DAY_OF_MONTH, 1);
+//        c.setTime(DateUtils.truncate(c.getTime()));
+//        System.out.println("场站指标记录调度程序执行开始!。。。。。。");
+//        for (int i = 0; i < 10; i++) {
+//
+//
+//            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
+//
+//            WindPowerInfo1Service windPowerInfo1Service = SpringUtils.getBean("windPowerInfo1Service");
+//            WindPowerInfo2Service windPowerInfo2Service = SpringUtils.getBean("windPowerInfo2Service");
+//            WindPowerInfo3Service windPowerInfo3Service = SpringUtils.getBean("windPowerInfo3Service");
+//            WindPowerInfo4Service windPowerInfo4Service = SpringUtils.getBean("windPowerInfo4Service");
+//            WindPowerInfo5Service windPowerInfo5Service = SpringUtils.getBean("windPowerInfo5Service");
+//            WindPowerInfo6Service windPowerInfo6Service = SpringUtils.getBean("windPowerInfo6Service");
+//
+//            windPowerInfo1Service.calLineInfoDay(c.getTime());
+//            windPowerInfo1Service.calProjectInfoDay(c.getTime());
+//            windPowerInfo1Service.calWindpowerInfoDay(c.getTime());
+//            windPowerInfo1Service.calCompanyInfoDay(c.getTime());
+//            windPowerInfo1Service.calRegionInfoDay(c.getTime());
+//
+//            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());
+//
+//            windPowerInfo4Service.calLineInfoDay(c.getTime());
+//            windPowerInfo4Service.calProjectInfoDay(c.getTime());
+//            windPowerInfo4Service.calWindpowerInfoDay(c.getTime());
+//            windPowerInfo4Service.calCompanyInfoDay(c.getTime());
+//            windPowerInfo4Service.calRegionInfoDay(c.getTime());
+//
+//            windPowerInfo5Service.calLineInfoDay(c.getTime());
+//            windPowerInfo5Service.calProjectInfoDay(c.getTime());
+//            windPowerInfo5Service.calWindpowerInfoDay(c.getTime());
+//            windPowerInfo5Service.calCompanyInfoDay(c.getTime());
+//            windPowerInfo5Service.calRegionInfoDay(c.getTime());
+//
+//            windPowerInfo6Service.calLineInfoDay(c.getTime());
+//            windPowerInfo6Service.calProjectInfoDay(c.getTime());
+//            windPowerInfo6Service.calWindpowerInfoDay(c.getTime());
+//            windPowerInfo6Service.calCompanyInfoDay(c.getTime());
+//            windPowerInfo6Service.calRegionInfoDay(c.getTime());
 //
 //            c.add(Calendar.DAY_OF_MONTH, 1);
 //
@@ -48,7 +119,7 @@ public class GenerationMain {
 //
 //        end = new Date();
 //        System.out.println("执行用时" + DateUtils.secondsDiff(begin, end) + "秒");
-//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
+//        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 
 
         System.out.println("完成");

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

@@ -1,86 +1,86 @@
-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-executorWPLY.properties")
-//@PropertySource("classpath:xxl-job-executorRG.properties")
-//@PropertySource("classpath:xxl-job-executorJN.properties")
+//package com.gyee.generation.config;
 //
-//@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-executorGF001.properties")
-//@PropertySource("classpath:xxl-job-executorGF002.properties")
-//@PropertySource("classpath:xxl-job-executorGF003.properties")
-//@PropertySource("classpath:xxl-job-executorGF004.properties")
+//
+//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-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-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-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/model/auto/ProEconWtAlysisDay.java

@@ -25,7 +25,7 @@ public class ProEconWtAlysisDay extends Model {
     /**
      * 编号
      */
-    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    @TableId(value = "ID",type = IdType.INPUT)
     private Long id;
 
     /**

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

@@ -130,14 +130,14 @@ public class EquipmentInfoDayTopService {
                 templs.add(vo);
                 if(templs.size()==100)
                 {
-                    proEconEquipmentInfoDayTopService.saveOrUpdateBatch(templs);
+                    proEconEquipmentInfoDayTopService.saveBatch(templs);
                     templs=new ArrayList<>();
                 }
             }
 
             if(!templs.isEmpty())
             {
-                proEconEquipmentInfoDayTopService.saveOrUpdateBatch(templs);
+                proEconEquipmentInfoDayTopService.saveBatch(templs);
             }
 //            proEconEquipmentInfoDayTopService.saveBatch(topls);
         }
@@ -221,14 +221,14 @@ public class EquipmentInfoDayTopService {
                 templs.add(vo);
                 if(templs.size()==100)
                 {
-                    proEconEquipmentInfoDayTopService.saveOrUpdateBatch(templs);
+                    proEconEquipmentInfoDayTopService.saveBatch(templs);
                     templs=new ArrayList<>();
                 }
             }
 
             if(!templs.isEmpty())
             {
-                proEconEquipmentInfoDayTopService.saveOrUpdateBatch(templs);
+                proEconEquipmentInfoDayTopService.saveBatch(templs);
             }
 //            proEconEquipmentInfoDayTopService.saveBatch(topls);
         }
@@ -308,14 +308,14 @@ public class EquipmentInfoDayTopService {
                 templs.add(vo);
                 if(templs.size()==100)
                 {
-                    proEconEquipmentInfoDayTopService.saveOrUpdateBatch(templs);
+                    proEconEquipmentInfoDayTopService.saveBatch(templs);
                     templs=new ArrayList<>();
                 }
             }
 
             if(!templs.isEmpty())
             {
-                proEconEquipmentInfoDayTopService.saveOrUpdateBatch(templs);
+                proEconEquipmentInfoDayTopService.saveBatch(templs);
             }
 //            proEconEquipmentInfoDayTopService.saveBatch(topls);
         }

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

@@ -55,32 +55,32 @@ public class TimelinessRateService {
         c.add(Calendar.DAY_OF_MONTH, -1);
         Date end = c.getTime();
 
-        QueryWrapper<ProEconFaultLiminatedefects> queryWrapper = new QueryWrapper<>();
-        queryWrapper.ge("date_time",recordDate).le("date_time",recordDate);
-        List<Long> deleteitems = proEconFaultLiminatedefectsService.list(queryWrapper)
-                .stream()
-//                .filter(i ->
-//                (i.getDateTime().compareTo(begin) == 0 || i.getDateTime().after(begin))
-//                        && (i.getDateTime().compareTo(end) == 0 || i.getDateTime().before(end))
-//                 )
-                .map(ProEconFaultLiminatedefects::getId).collect(Collectors.toList());
-
-        List<Long> tempids=new ArrayList<>();
-
-        for(int i=0;i<deleteitems.size();i++)
-        {
-            tempids.add(deleteitems.get(i));
-            if(tempids.size()==100)
-            {
-                proEconFaultLiminatedefectsService.removeByIds(tempids);
-                tempids=new ArrayList<>();
-            }
-        }
-
-        if(!tempids.isEmpty())
-        {
-            proEconFaultLiminatedefectsService.removeByIds(tempids);
-        }
+//        QueryWrapper<ProEconFaultLiminatedefects> queryWrapper = new QueryWrapper<>();
+//        queryWrapper.ge("date_time",recordDate).le("date_time",recordDate);
+//        List<Long> deleteitems = proEconFaultLiminatedefectsService.list(queryWrapper)
+//                .stream()
+////                .filter(i ->
+////                (i.getDateTime().compareTo(begin) == 0 || i.getDateTime().after(begin))
+////                        && (i.getDateTime().compareTo(end) == 0 || i.getDateTime().before(end))
+////                 )
+//                .map(ProEconFaultLiminatedefects::getId).collect(Collectors.toList());
+//
+//        List<Long> tempids=new ArrayList<>();
+//
+//        for(int i=0;i<deleteitems.size();i++)
+//        {
+//            tempids.add(deleteitems.get(i));
+//            if(tempids.size()==100)
+//            {
+//                proEconFaultLiminatedefectsService.removeByIds(tempids);
+//                tempids=new ArrayList<>();
+//            }
+//        }
+//
+//        if(!tempids.isEmpty())
+//        {
+//            proEconFaultLiminatedefectsService.removeByIds(tempids);
+//        }
 //        if (!deleteitems.isEmpty()) {
 //            proEconFaultLiminatedefectsService.removeByIds(deleteitems);
 //        }
@@ -149,14 +149,71 @@ public class TimelinessRateService {
 
             }
         }
+
+         c = Calendar.getInstance();
+        c.setTime(DateUtils.truncate(recordDate));//本月
+
+        c.set(Calendar.DAY_OF_MONTH, 1);
+         begin = c.getTime();
+
+        c.add(Calendar.MONTH, 1);
+        c.add(Calendar.DAY_OF_MONTH, -1);
+         end = c.getTime();
+
+        QueryWrapper<ProEconFaultLiminatedefects> queryWrapper = new QueryWrapper<>();
+        queryWrapper.ge("date_time",begin).le("date_time",end);
+        List<Long> deleteitems = proEconFaultLiminatedefectsService.list(queryWrapper)
+                .stream()
+//                .filter(i ->
+//                (i.getDateTime().compareTo(begin) == 0 || i.getDateTime().after(begin))
+//                        && (i.getDateTime().compareTo(end) == 0 || i.getDateTime().before(end))
+//                 )
+                .map(ProEconFaultLiminatedefects::getId).collect(Collectors.toList());
+
+        List<Long> tempids=new ArrayList<>();
+
+        for(int i=0;i<deleteitems.size();i++)
+        {
+            tempids.add(deleteitems.get(i));
+            if(tempids.size()==100)
+            {
+                proEconFaultLiminatedefectsService.removeByIds(tempids);
+                tempids=new ArrayList<>();
+            }
+        }
+
+        if(!tempids.isEmpty())
+        {
+            proEconFaultLiminatedefectsService.removeByIds(tempids);
+        }
+
+
+        List<ProEconFaultLiminatedefects> dayls=new ArrayList<>();
         for (Map<String, ProEconFaultLiminatedefects> items : dtDictionary.values()) {
             for (ProEconFaultLiminatedefects item : items.values()) {
+                dayls.add(item);
 
-                proEconFaultLiminatedefectsService.save(item);
             }
         }
 
 
+        List<ProEconFaultLiminatedefects> templs=new ArrayList<>();
+        for(ProEconFaultLiminatedefects vo:dayls)
+        {
+
+            templs.add(vo);
+            if(templs.size()==100)
+            {
+                proEconFaultLiminatedefectsService.saveBatch(templs);
+                templs=new ArrayList<>();
+            }
+        }
+
+        if(!templs.isEmpty())
+        {
+            proEconFaultLiminatedefectsService.saveBatch(templs);
+        }
+
     }
 
 }

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

@@ -629,14 +629,14 @@ public class WindPowerInfo1Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay1Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay1Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay1Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay1Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay1Service.saveBatch(dayls);
     }
@@ -723,14 +723,14 @@ public class WindPowerInfo1Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay1Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay1Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay1Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay1Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay1Service.saveBatch(dayls);
     }
@@ -821,14 +821,14 @@ public class WindPowerInfo1Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay1Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay1Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay1Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay1Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay1Service.saveBatch(dayls);
     }

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

@@ -470,14 +470,14 @@ public class WindPowerInfo2Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay2Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay2Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay2Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay2Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay2Service.saveBatch(dayls);
     }
@@ -565,14 +565,14 @@ public class WindPowerInfo2Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay2Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay2Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay2Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay2Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay2Service.saveBatch(dayls);
     }
@@ -665,14 +665,14 @@ public class WindPowerInfo2Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay2Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay2Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay2Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay2Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay2Service.saveBatch(dayls);
     }

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

@@ -469,14 +469,14 @@ public class WindPowerInfo3Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay3Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay3Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay3Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay3Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay3Service.saveBatch(dayls);
     }
@@ -564,14 +564,14 @@ public class WindPowerInfo3Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay3Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay3Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay3Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay3Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay3Service.saveBatch(dayls);
     }
@@ -663,14 +663,14 @@ public class WindPowerInfo3Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay3Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay3Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay3Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay3Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay3Service.saveBatch(dayls);
     }

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

@@ -532,15 +532,15 @@ public class WindPowerInfo4Service {
         for (ProEconPowerstationInfoDay4 vo : dayls) {
             templs.add(vo);
             if (templs.size() == 100) {
-                proEconPowerstationInfoDay4Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay4Service.saveBatch(templs);
                 templs = new ArrayList<>();
             }
         }
 
         if (!templs.isEmpty()) {
-            proEconPowerstationInfoDay4Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay4Service.saveBatch(templs);
         }
-//        proEconPowerstationInfoDay4Service.saveBatch(dayls);
+//        proEconPowerstationInfoDay4Service.(dayls);
     }
 
     /**
@@ -663,15 +663,15 @@ public class WindPowerInfo4Service {
         for (ProEconPowerstationInfoDay4 vo : dayls) {
             templs.add(vo);
             if (templs.size() == 100) {
-                proEconPowerstationInfoDay4Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay4Service.saveBatch(templs);
                 templs = new ArrayList<>();
             }
         }
 
         if (!templs.isEmpty()) {
-            proEconPowerstationInfoDay4Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay4Service.saveBatch(templs);
         }
-//        proEconPowerstationInfoDay4Service.saveBatch(dayls);
+//        proEconPowerstationInfoDay4Service.(dayls);
     }
 
     /**
@@ -690,9 +690,7 @@ public class WindPowerInfo4Service {
         queryWrapper.eq("record_date", DateUtils.truncate(recordDate))
                 .eq("location", Location.ln.getValue());
         List<String> idls = proEconPowerstationInfoDay4Service.list(queryWrapper).stream()
-//                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(recordDate)) == 0
-//                        && CacheContext.lnmap.containsKey(i.getLineId())
-//                        && i.getLocation().equals(Location.ln.getValue()))
+
                 .map(ProEconPowerstationInfoDay4::getId)
                 .collect(Collectors.toList());
 
@@ -703,8 +701,7 @@ public class WindPowerInfo4Service {
         }
         List<ProEconPowerstationInfoDay4> dayls = new ArrayList<>();
         for (ProBasicLine ln : CacheContext.lnls) {
-//            if (CacheContext.linepointmap.containsKey(ln.getId())) {
-//                Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.wppointmap.get(ln.getId());
+
 
             ProEconPowerstationInfoDay4 pewp = new ProEconPowerstationInfoDay4();
             if (CacheContext.pjmap.containsKey(ln.getProjectId())) {
@@ -737,12 +734,7 @@ public class WindPowerInfo4Service {
                     .eq("location", Location.ln.getValue())
                     .eq("line_id", ln.getId());
             pepid2ls = proEconPowerstationInfoDay2Service.list(queryWrapper2);
-//            .stream()
-//                    .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//                            && i.getLocation().equals(Location.ln.getValue())
-//                            && i.getLineId().equals(ln.getId())
-//
-//                    ).collect(Collectors.toList());
+
 
             if (!pepid2ls.isEmpty()) {
                 pepid2 = pepid2ls.get(0);
@@ -755,12 +747,7 @@ public class WindPowerInfo4Service {
                     .eq("location", Location.ln.getValue())
                     .eq("line_id", ln.getId());
             pepid3ls = proEconPowerstationInfoDay3Service.list(queryWrapper3);
-//                    .stream()
-//                    .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//                            && i.getLocation().equals(Location.ln.getValue())
-//                            && i.getLineId().equals(ln.getId())
-//
-//                    ).collect(Collectors.toList());
+
 
             if (!pepid3ls.isEmpty()) {
                 pepid3 = pepid3ls.get(0);
@@ -773,13 +760,7 @@ public class WindPowerInfo4Service {
                         .eq("location", Location.ln.getValue())
                         .eq("line_id", ln.getId());
                 pepidls = proEconPowerstationInfoDay4Service.list(queryWrapper4);
-//                .stream()
-//                        .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-//                                && i.getLocation().equals(Location.ln.getValue())
-//                                && i.getLineId().equals(ln.getId())
-//
-//                        )
-//                        .collect(Collectors.toList());
+
             }
 
 
@@ -797,15 +778,15 @@ public class WindPowerInfo4Service {
         for (ProEconPowerstationInfoDay4 vo : dayls) {
             templs.add(vo);
             if (templs.size() == 100) {
-                proEconPowerstationInfoDay4Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay4Service.saveBatch(templs);
                 templs = new ArrayList<>();
             }
         }
 
         if (!templs.isEmpty()) {
-            proEconPowerstationInfoDay4Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay4Service.saveBatch(templs);
         }
-//        proEconPowerstationInfoDay4Service.saveBatch(dayls);
+//        proEconPowerstationInfoDay4Service.(dayls);
     }
 
     private void calDetiall(ProEconPowerstationInfoDay4 pewp, Date end, Date begin, List<ProBasicEquipment> wtls,

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

@@ -414,14 +414,14 @@ public class WindPowerInfo5Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay5Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay5Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay5Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay5Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay5Service.saveBatch(dayls);
     }
@@ -503,14 +503,14 @@ public class WindPowerInfo5Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay5Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay5Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay5Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay5Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay5Service.saveBatch(dayls);
     }
@@ -597,14 +597,14 @@ public class WindPowerInfo5Service {
             templs.add(vo);
             if(templs.size()==100)
             {
-                proEconPowerstationInfoDay5Service.saveOrUpdateBatch(templs);
+                proEconPowerstationInfoDay5Service.saveBatch(templs);
                 templs=new ArrayList<>();
             }
         }
 
         if(!templs.isEmpty())
         {
-            proEconPowerstationInfoDay5Service.saveOrUpdateBatch(templs);
+            proEconPowerstationInfoDay5Service.saveBatch(templs);
         }
 //        proEconPowerstationInfoDay5Service.saveBatch(dayls);
     }

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

@@ -9,6 +9,7 @@ import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.task.thread.EconWtAlysisDayThread;
 import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.SnowflakeGenerator;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import org.springframework.stereotype.Service;
 
@@ -327,12 +328,17 @@ public class WtAlysisDayService {
         List<ProEconWtAlysisDay> templs=new ArrayList<>();
         for(ProEconWtAlysisDay vo:dayls)
         {
-            templs.add(vo);
-            if(templs.size()==100)
+            if(StringUtils.notEmp(vo))
             {
-                proEconWtAlysisDayService.saveBatch(templs);
-                templs=new ArrayList<>();
+                vo.setId(SnowflakeGenerator.generateId());
+                templs.add(vo);
+                if(templs.size()==100)
+                {
+                    proEconWtAlysisDayService.saveBatch(templs);
+                    templs=new ArrayList<>();
+                }
             }
+
         }
 
         if(!templs.isEmpty())

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

@@ -285,6 +285,7 @@ public class CycleCalculationService {
                     }
                     else
                     {
+
                         double ssfdl = edosUtil.getSectionData(rssfdlPoint, currentDate.getTime()).getPointValueInDouble() * rssfdlPoint.getCoefficient();
                         double zerofdl = edosUtil.getSectionData(rssfdlPoint, samedayZero.getTime()).getPointValueInDouble() * rssfdlPoint.getCoefficient();
                         double monthfirstfdl = edosUtil.getSectionData(rssfdlPoint, monthFirstZero.getTime()).getPointValueInDouble() * rssfdlPoint.getCoefficient();
@@ -309,6 +310,10 @@ public class CycleCalculationService {
                             }
                         }
 
+//                        if(wt.getWindpowerstationId().equals("SXJ_KGDL_PDL_FDC_STA"))
+//                        {
+//                            System.out.println("");
+//                        }
 
                         double yfdl = ssfdl - monthfirstfdl;
                         if (yfdl < 0 || yfdl < rfdl || yfdl > modelpower.get(wt.getModelId()) * 24 * 31 * 1.5) {

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

@@ -8,6 +8,7 @@ import com.gyee.generation.init.CacheContext;
 import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.IProEconWtAlysisDayService;
 import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.SnowflakeGenerator;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import com.gyee.generation.util.statisticcs.Initial;
 import org.slf4j.Logger;
@@ -80,6 +81,7 @@ public class EconWtAlysisDayThreadPool implements Callable<String>, Serializable
 		try {
 			ProEconWtAlysisDay pewp=new ProEconWtAlysisDay();
 			Initial.initial(pewp);
+			pewp.setId(SnowflakeGenerator.generateId());
 			pewp.setRecordDate(DateUtils.truncate(recordDate));
 			pewp.setWindturbineId(wt.getId());
 

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

@@ -0,0 +1,161 @@
+package com.gyee.generation.util;
+
+/**
+ * Twitter_Snowflake<br>
+ * SnowFlake的结构如下(每部分用-分开):<br>
+ * 0 - 0000000000 0000000000 0000000000 0000000000 0 - 00000 - 00000 - 000000000000 <br>
+ * 1位标识，由于long基本类型在Java中是带符号的，最高位是符号位，正数是0，负数是1，所以id一般是正数，最高位是0<br>
+ * 41位时间截(毫秒级)，注意，41位时间截不是存储当前时间的时间截，而是存储时间截的差值（当前时间截 - 开始时间截)
+ * 得到的值），这里的的开始时间截，一般是我们的id生成器开始使用的时间，由我们程序来指定的（如下下面程序IdWorker类的startTime属性）。41位的时间截，可以使用69年，年T = (1L << 41) / (1000L * 60 * 60 * 24 * 365) = 69<br>
+ * 10位的数据机器位，可以部署在1024个节点，包括5位datacenterId和5位workerId<br>
+ * 12位序列，毫秒内的计数，12位的计数顺序号支持每个节点每毫秒(同一机器，同一时间截)产生4096个ID序号<br>
+ * 加起来刚好64位，为一个Long型。<br>
+ * SnowFlake的优点是，整体上按照时间自增排序，并且整个分布式系统内不会产生ID碰撞(由数据中心ID和机器ID作区分)，并且效率较高，经测试，SnowFlake每秒能够产生26万ID左右。
+ */
+public class SnowflakeGenerator {
+
+    // ==============================Fields===========================================
+    /** 开始时间截 (2015-01-01) */
+    private final long twepoch = 1420041600000L;
+
+    /** 机器id所占的位数 */
+    private final long workerIdBits = 5L;
+
+    /** 数据标识id所占的位数 */
+    private final long datacenterIdBits = 5L;
+
+    /** 支持的最大机器id，结果是31 (这个移位算法可以很快的计算出几位二进制数所能表示的最大十进制数) */
+    private final long maxWorkerId = -1L ^ (-1L << workerIdBits);
+
+    /** 支持的最大数据标识id，结果是31 */
+    private final long maxDatacenterId = -1L ^ (-1L << datacenterIdBits);
+
+    /** 序列在id中占的位数 */
+    private final long sequenceBits = 12L;
+
+    /** 机器ID向左移12位 */
+    private final long workerIdShift = sequenceBits;
+
+    /** 数据标识id向左移17位(12+5) */
+    private final long datacenterIdShift = sequenceBits + workerIdBits;
+
+    /** 时间截向左移22位(5+5+12) */
+    private final long timestampLeftShift = sequenceBits + workerIdBits + datacenterIdBits;
+
+    /** 生成序列的掩码，这里为4095 (0b111111111111=0xfff=4095) */
+    private final long sequenceMask = -1L ^ (-1L << sequenceBits);
+
+    /** 工作机器ID(0~31) */
+    private long workerId;
+
+    /** 数据中心ID(0~31) */
+    private long datacenterId;
+
+    /** 毫秒内序列(0~4095) */
+    private long sequence = 0L;
+
+    /** 上次生成ID的时间截 */
+    private long lastTimestamp = -1L;
+
+    //==============================Constructors=====================================
+    /**
+     * 构造函数
+     * @param workerId 工作ID (0~31)
+     * @param datacenterId 数据中心ID (0~31)
+     */
+    public SnowflakeGenerator(long workerId, long datacenterId) {
+        if (workerId > maxWorkerId || workerId < 0) {
+            throw new IllegalArgumentException(String.format("worker Id can't be greater than %d or less than 0", maxWorkerId));
+        }
+        if (datacenterId > maxDatacenterId || datacenterId < 0) {
+            throw new IllegalArgumentException(String.format("datacenter Id can't be greater than %d or less than 0", maxDatacenterId));
+        }
+        this.workerId = workerId;
+        this.datacenterId = datacenterId;
+    }
+
+    // ==============================Methods==========================================
+    /**
+     * 获得下一个ID (该方法是线程安全的)
+     * @return SnowflakeId
+     */
+    public synchronized long nextId() {
+        long timestamp = timeGen();
+
+        //如果当前时间小于上一次ID生成的时间戳，说明系统时钟回退过这个时候应当抛出异常
+        if (timestamp < lastTimestamp) {
+            throw new RuntimeException(
+                    String.format("Clock moved backwards.  Refusing to generate id for %d milliseconds", lastTimestamp - timestamp));
+        }
+
+        //如果是同一时间生成的，则进行毫秒内序列
+        if (lastTimestamp == timestamp) {
+            sequence = (sequence + 1) & sequenceMask;
+            //毫秒内序列溢出
+            if (sequence == 0) {
+                //阻塞到下一个毫秒,获得新的时间戳
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        }
+        //时间戳改变，毫秒内序列重置
+        else {
+            sequence = 0L;
+        }
+
+        //上次生成ID的时间截
+        lastTimestamp = timestamp;
+
+        //移位并通过或运算拼到一起组成64位的ID
+        return ((timestamp - twepoch) << timestampLeftShift) //
+                | (datacenterId << datacenterIdShift) //
+                | (workerId << workerIdShift) //
+                | sequence;
+    }
+
+    /**
+     * 阻塞到下一个毫秒，直到获得新的时间戳
+     * @param lastTimestamp 上次生成ID的时间截
+     * @return 当前时间戳
+     */
+    protected long tilNextMillis(long lastTimestamp) {
+        long timestamp = timeGen();
+        while (timestamp <= lastTimestamp) {
+            timestamp = timeGen();
+        }
+        return timestamp;
+    }
+
+    /**
+     * 返回以毫秒为单位的当前时间
+     * @return 当前时间(毫秒)
+     */
+    protected long timeGen() {
+        return System.currentTimeMillis();
+    }
+
+
+    private static SnowflakeGenerator idWorker = null;
+
+    public synchronized static SnowflakeGenerator getIdWorker() {
+
+        if (idWorker == null)
+            idWorker = new SnowflakeGenerator(2, 3);
+
+        return idWorker;
+    }
+
+    public static long generateId() {
+        //if (idWorker == null)
+            //idWorker = new SnowflakeGenerator(0, 0);
+
+        //return idWorker.nextId();
+        SnowflakeGenerator snowflakeGenerator = getIdWorker();
+
+        return snowflakeGenerator.nextId();
+//        for (int i = 0; i < 1000; i++) {
+//            long id = idWorker.nextId();
+//            System.out.println(Long.toBinaryString(id));
+//            System.out.println(id);
+//        }
+    }
+}

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

@@ -101,61 +101,76 @@ public class EdosUtil implements IEdosUtil {
     public PointData getSectionData(String point, Long date) throws Exception {
 
 
-        if(StringUtils.notEmp(point) && StringUtils.notEmp(point) && !initialcode.equals(point))
-        {
-            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point + "&ts=" + date;
-            if(point.startsWith("GF-")){
-                rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + point + "&ts=" + date;
+        if (StringUtils.notEmp(point)) {
+
+
+            Optional<String> tagName = Optional.ofNullable(point);
+
+            String url = baseURL + "/history/section?tagNames=" + tagName.get() + "&ts=" + date;
+            if (point.startsWith("GF-")) {
+                url = baseURL2 + "/history/section?tagNames=" + tagName.get() + "&ts=" + date;
             }
+            try {
+                ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
+                JSONObject jsonObject = resp.getBody();
+                if (StringUtils.isNotEmpty(jsonObject) && !jsonObject.isEmpty()) {
 
-            ResponseEntity<JSONObject> resp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-            JSONObject jsonArray = resp.getBody();
-            if (StringUtils.isNotEmpty(jsonArray)){
-                List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
-                if (list.size() > 0)
-                    return list.get(0);
-                else
-                    return ErrorRequest.RequestError(point);
-            } else {
-                return ErrorRequest.RequestError(point);
+                    return JsonObjectHelper.phrasePointData(jsonObject, point);
+                } else {
+
+                    return new PointData();
+                }
+            } catch (Exception e) {
+
+                return new PointData();
             }
-        }else
-        {
-            PointData po=new PointData();
-            po.setEdnaId(point);
-            po.setPointValueInDouble(0.0);
-            po.setPointTime(0l);
-            return po;
+        } else {
+
+            PointData data = new PointData();
+            data.setEdnaId(point);
+            data.setPointTime(date);
+            data.setPointValue("0");
+            data.setPointName("1");
+            data.setPointValueInDouble(0.0);
+            return data;
         }
     }
 
     @Override
     public PointData getSectionData(ProBasicPowerstationPoint point, Long date) throws Exception {
 
-        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getNemCode()) && !initialcode.equals(point.getNemCode()))
-        {
-            String rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
-            if (point.getNemCode().startsWith("GF-")){
-                rawUrl =  baseURL2 + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
+        if (StringUtils.notEmp(point) && StringUtils.notEmp(point.getNemCode()) && !initialcode.equals(point.getNemCode())) {
+
+
+            Optional<String> tagName = Optional.ofNullable(point.getNemCode());
+
+            String url = baseURL + "/history/section?tagNames=" + tagName.get() + "&ts=" + date;
+            if (point.getNemCode().startsWith("GF-")) {
+                url = baseURL2 + "/history/section?tagNames=" + tagName.get() + "&ts=" + date;
             }
-            ResponseEntity<JSONObject> resp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-            JSONObject jsonArray = resp.getBody();
-            if (StringUtils.isNotEmpty(jsonArray)){
-                List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
-                if (list.size() > 0)
-                    return list.get(0);
-                else
-                    return ErrorRequest.RequestError(point.getNemCode());
-            } else {
-                return ErrorRequest.RequestError(point.getNemCode());
+            try {
+                ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
+                JSONObject jsonObject = resp.getBody();
+                if (StringUtils.isNotEmpty(jsonObject) && !jsonObject.isEmpty()) {
+
+                    return JsonObjectHelper.phrasePointData(jsonObject, point.getNemCode());
+                } else {
+
+                    return new PointData();
+                }
+            } catch (Exception e) {
+
+                return new PointData();
             }
-        }else
-        {
-            PointData po=new PointData();
-            po.setEdnaId(point.getNemCode());
-            po.setPointValueInDouble(0.0);
-            po.setPointTime(0l);
-            return po;
+        } else {
+
+            PointData data = new PointData();
+            data.setEdnaId(point.getNemCode());
+            data.setPointTime(date);
+            data.setPointValue("0");
+            data.setPointName("1");
+            data.setPointValueInDouble(0.0);
+            return data;
         }
 
     }
@@ -164,34 +179,40 @@ public class EdosUtil implements IEdosUtil {
     public PointData getSectionData(ProBasicEquipmentPoint point, Long date) throws Exception {
 
 
-        if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getNemCode()) && !initialcode.equals(point.getNemCode()))
-        {
-            String rawUrl = "";
-            if (point.getNemCode().startsWith("GF-")){
-                rawUrl = baseURL2 + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
-            }else {
-                rawUrl = baseURL + "/history/section?null=0&tagNames=" + point.getNemCode() + "&ts=" + date;
+        if (StringUtils.notEmp(point) && StringUtils.notEmp(point.getNemCode()) && !initialcode.equals(point.getNemCode())) {
+
+
+            Optional<String> tagName = Optional.ofNullable(point.getNemCode());
+
+            String url = baseURL + "/history/section?tagNames=" + tagName.get() + "&ts=" + date;
+            if (point.getNemCode().startsWith("GF-")) {
+                url = baseURL2 + "/history/section?tagNames=" + tagName.get() + "&ts=" + date;
             }
+            try {
+                ResponseEntity<JSONObject> resp = restTemplate.getForEntity(url, JSONObject.class);
+                JSONObject jsonObject = resp.getBody();
+                if (StringUtils.isNotEmpty(jsonObject) && !jsonObject.isEmpty()) {
 
-            ResponseEntity<JSONObject> resp = restTemplate.getForEntity(rawUrl, JSONObject.class);
-            JSONObject jsonArray = resp.getBody();
-            if (StringUtils.isNotEmpty(jsonArray)){
-                List<PointData> list = JsonObjectHelper.phrasePointData(jsonArray);
-                if (list.size() > 0)
-                    return list.get(0);
-                else
-                    return ErrorRequest.RequestError(point.getNemCode());
-            } else {
-                return ErrorRequest.RequestError(point.getNemCode());
+                    return JsonObjectHelper.phrasePointData(jsonObject, point.getNemCode());
+                } else {
+
+                    return new PointData();
+                }
+            } catch (Exception e) {
+
+                return new PointData();
             }
-        }else
-        {
-            PointData po=new PointData();
-            po.setEdnaId(point.getNemCode());
-            po.setPointValueInDouble(0.0);
-            po.setPointTime(0l);
-            return po;
+        } else {
+
+            PointData data = new PointData();
+            data.setEdnaId(point.getNemCode());
+            data.setPointTime(date);
+            data.setPointValue("0");
+            data.setPointName("1");
+            data.setPointValueInDouble(0.0);
+            return data;
         }
+
     }
 
 
@@ -650,6 +671,9 @@ public class EdosUtil implements IEdosUtil {
     }
 
 
+
+
+
     @Override
     public List<PointData> getHistoryDatasRaw(ProBasicEquipmentPoint point, Long beginDate, Long endDate) throws Exception {
         if(StringUtils.notEmp(point) && StringUtils.notEmp(point.getNemCode()) && !initialcode.equals(point.getNemCode()))

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

@@ -1,8 +1,7 @@
 package com.gyee.generation;
 
-import com.gyee.generation.service.InitialRedisService;
-import com.gyee.generation.service.InputOrOutPutService;
-import com.gyee.generation.service.initalcache.CacheService;
+import com.gyee.generation.service.*;
+import com.gyee.generation.util.DateUtils;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -22,10 +21,10 @@ public class HealthTest {
         Calendar c = Calendar.getInstance();
         Date begin=null;
         Date end=null;
-        CacheService cacheService= SpringUtils.getBean("cacheService");
-        cacheService.initRedisCache();
-
-        System.out.println("完成!。。。。。。");
+//        CacheService cacheService= SpringUtils.getBean("cacheService");
+//        cacheService.initRedisCache();
+//
+//        System.out.println("完成!。。。。。。");
 //
 //
 //
@@ -138,14 +137,14 @@ public class HealthTest {
 //        System.out.println("曲线拟合调度程序执行结束!。。。。。。");
 //
 //
-//        begin=new Date();
-//        System.out.println("场站指标记录调度程序执行开始!。。。。。。");
-//        WindPowerInfo1Service windPowerInfo1Service= SpringUtils.getBean("windPowerInfo1Service");
-//        WindPowerInfo2Service windPowerInfo2Service= SpringUtils.getBean("windPowerInfo2Service");
-//        WindPowerInfo3Service windPowerInfo3Service= SpringUtils.getBean("windPowerInfo3Service");
-//        WindPowerInfo4Service windPowerInfo4Service= SpringUtils.getBean("windPowerInfo4Service");
-//        WindPowerInfo5Service windPowerInfo5Service= SpringUtils.getBean("windPowerInfo5Service");
-//        WindPowerInfo6Service windPowerInfo6Service= SpringUtils.getBean("windPowerInfo6Service");
+        begin=new Date();
+        System.out.println("场站指标记录调度程序执行开始!。。。。。。");
+        WindPowerInfo1Service windPowerInfo1Service= SpringUtils.getBean("windPowerInfo1Service");
+        WindPowerInfo2Service windPowerInfo2Service= SpringUtils.getBean("windPowerInfo2Service");
+        WindPowerInfo3Service windPowerInfo3Service= SpringUtils.getBean("windPowerInfo3Service");
+        WindPowerInfo4Service windPowerInfo4Service= SpringUtils.getBean("windPowerInfo4Service");
+        WindPowerInfo5Service windPowerInfo5Service= SpringUtils.getBean("windPowerInfo5Service");
+        WindPowerInfo6Service windPowerInfo6Service= SpringUtils.getBean("windPowerInfo6Service");
 //
 //        windPowerInfo1Service.calLineInfoDay(c.getTime());
 //        windPowerInfo1Service.calProjectInfoDay(c.getTime());
@@ -165,11 +164,11 @@ public class HealthTest {
 //        windPowerInfo3Service.calCompanyInfoDay(c.getTime());
 //        windPowerInfo3Service.calRegionInfoDay(c.getTime());
 //
-//        windPowerInfo4Service.calLineInfoDay(c.getTime());
-//        windPowerInfo4Service.calProjectInfoDay(c.getTime());
-//        windPowerInfo4Service.calWindpowerInfoDay(c.getTime());
-//        windPowerInfo4Service.calCompanyInfoDay(c.getTime());
-//        windPowerInfo4Service.calRegionInfoDay(c.getTime());
+        windPowerInfo4Service.calLineInfoDay(c.getTime());
+        windPowerInfo4Service.calProjectInfoDay(c.getTime());
+        windPowerInfo4Service.calWindpowerInfoDay(c.getTime());
+        windPowerInfo4Service.calCompanyInfoDay(c.getTime());
+        windPowerInfo4Service.calRegionInfoDay(c.getTime());
 //
 //        windPowerInfo5Service.calLineInfoDay(c.getTime());
 //        windPowerInfo5Service.calProjectInfoDay(c.getTime());
@@ -183,9 +182,9 @@ public class HealthTest {
 //        windPowerInfo6Service.calCompanyInfoDay(c.getTime());
 //        windPowerInfo6Service.calRegionInfoDay(c.getTime());
 //
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
+        end=new Date();
+        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+        System.out.println("场站指标记录调度程序执行结束!。。。。。。");
 //
 //
 //
@@ -284,4 +283,5 @@ public class HealthTest {
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println("设备数据和场站数据风资源调度程序执行结束!。。。。。。");
     }
+
 }

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

@@ -35,9 +35,9 @@ public class RealTest {
 //        statusService.middleStatusReal();
 //        statusService.startStatusReal();
 //        calculationService.calWp();
-//        cycleCalculationService.saveCyle();
+        cycleCalculationService.saveCyle();
 
-        realtimeService.savaRealtimeTarget();
+//        realtimeService.savaRealtimeTarget();