计算服务修改

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

@@ -20,7 +20,7 @@ public class GenerationMain {
 //        Calendar c = Calendar.getInstance();
 //        Date begin = null;
 //        Date end = null;
-//        c.set(Calendar.MONTH,5);
+//        c.set(Calendar.MONTH, 7);
 //        c.set(Calendar.DAY_OF_MONTH, 1);
 //
 //
@@ -30,7 +30,7 @@ public class GenerationMain {
 //
 //        begin = new Date();
 //        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for (int i = 0; i < 122; i++) {
+//        for (int i = 0; i < 30; i++) {
 //
 //
 //            System.out.println(DateUtils.format(c.getTime(), "yyyy-MM-dd HH:mm:ss").toString());
@@ -71,8 +71,8 @@ public class GenerationMain {
 //        end=new Date();
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println(end);
-
-
+//
+//
 
         System.out.println("完成");
     }

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

@@ -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")
-//@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")
+//package com.gyee.generation.config;
 //
-//@PropertySource("classpath:xxl-job-accuracy.properties")
-//@PropertySource("classpath:xxl-job-7001.properties")
-//@PropertySource("classpath:xxl-job-7002.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-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-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

@@ -214,7 +214,7 @@ public class EquipmentInfo1Service {
                 //日最小功率
                 pewp.setRzxgl(summaryStatistics.getMin());
                 //日平均功率
-                pewp.setRpjgl(summaryStatistics.getAverage());
+                pewp.setRpjgl(summaryStatistics.getSum());
             }
         }
 
@@ -476,7 +476,7 @@ public class EquipmentInfo1Service {
                     //月最小功率
                     pewp.setYzxgl(summaryStatistics.getMin());
                     //月平均功率
-                    pewp.setYpjgl(summaryStatistics.getAverage());
+                    pewp.setYpjgl(summaryStatistics.getSum());
                 }
             }
 
@@ -719,7 +719,7 @@ public class EquipmentInfo1Service {
                     //年最小风速
                     pewp.setNzxfs(summaryStatistics.getMin());
                     //年平均风速
-                    pewp.setNpjfs(summaryStatistics.getAverage());
+                    pewp.setNpjfs(summaryStatistics.getSum());
                 }
 
             }

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

@@ -92,5 +92,83 @@ public class PowerCurveFittingModelService {
 
     }
 
+    public void cureFittingModel(List<String> modells) {
+
+        if(!modells.isEmpty())
+        {
+            Map<String,String> keymap= new HashMap<>();
+            Map<String, List<ProBasicModelPower>> modelpmap = new TreeMap<>();
+
+            for (String key : modells) {
+                keymap.put(key,key);
+            }
+
+            for (ProBasicModelPower mp : CacheContext.mpls) {
+
+                if(keymap.containsKey(mp.getModelId()))
+                {
+                    if (modelpmap.containsKey(mp.getModelId())) {
+                        List<ProBasicModelPower> ls = modelpmap.get(mp.getModelId());
+                        ls.add(mp);
+
+                    } else {
+                        List<ProBasicModelPower> ls = new ArrayList<>();
+                        ls.add(mp);
+                        modelpmap.put(mp.getModelId(), ls);
+                    }
+                }
+
+            }
+
+
+
+
+            for (String key : modelpmap.keySet()) {
+                List<ProBasicModelPower> ls = modelpmap.get(key);
+                if (!ls.isEmpty()) {
+                    ls = ls.stream().sorted(Comparator.comparing(ProBasicModelPower::getSpeed)).collect(Collectors.toList());
+                    //理论功率拟合
+                    List<PointVo> llls = LineUtil.buildLine(ls.stream().mapToDouble(ProBasicModelPower::getSpeed).toArray(), ls.stream().mapToDouble(ProBasicModelPower::getTheoryPower).toArray(), ls.size(), dimension, scale);
+                    //保证功率拟合
+                    List<PointVo> bzls = LineUtil.buildLine(ls.stream().mapToDouble(ProBasicModelPower::getSpeed).toArray(), ls.stream().mapToDouble(ProBasicModelPower::getEnsurePower).toArray(), ls.size(), dimension, scale);
+
+
+                    if (!llls.isEmpty() && !bzls.isEmpty() && llls.size() == bzls.size()) {
+
+                        double value=0.00;
+                        for (int i = 0; i < 100; i++) {
+
+                            ProBasicModelPowerRd rd = new ProBasicModelPowerRd();
+                            rd.setModelId(ls.get(0).getModelId());
+                            rd.setWindpowerstationId(ls.get(0).getWindpowerstationId());
+                            rd.setEnsurePower(0.0);
+                            rd.setTheoryPower(0.0);
+                            rd.setSpeed(value);
+                            proBasicModelPowerRdService.save(rd);
+                            value=value+0.01;
+
+                        }
+                        for (int i = 0; i < llls.size(); i++) {
+                            ProBasicModelPowerRd rd = new ProBasicModelPowerRd();
+                            rd.setModelId(ls.get(0).getModelId());
+                            rd.setWindpowerstationId(ls.get(0).getWindpowerstationId());
+                            rd.setEnsurePower(StringUtils.round(bzls.get(i).getY(),2));
+                            rd.setTheoryPower(StringUtils.round(llls.get(i).getY(),2));
+                            rd.setSpeed(StringUtils.round(llls.get(i).getX(),2));
+                            proBasicModelPowerRdService.save(rd);
+                        }
+
+                    }
+
+
+                }
+
+            }
+
+        }
+
+
+
+    }
 
 }

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

@@ -598,27 +598,15 @@ public class WindPowerInfo1Service {
                 pewp.setWindpowerstationId(wp.getId());
                 pewp.setLocation(Location.wp.getValue());
 
-//                //昨日的统计结果
-//                List<ProEconPowerstationInfoDay1> pepid1ls = new ArrayList<>();
-//                Calendar cl = Calendar.getInstance();
-//                cl.setTime(recordDate);
-//                //昨日的统计结果
-//                cl.add(Calendar.DAY_OF_MONTH, -1);
-//                if (cl.get(Calendar.DAY_OF_MONTH) != 1) {
-//                    QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper2 = new QueryWrapper<>();
-//                    queryWrapper2.eq("record_date",DateUtils.truncate(cl.getTime()))
-//                            .eq("windpowerstation_id",wp.getId())
-//                            .eq("location",Location.wp.getValue());
-//                    pepid1ls = proEconPowerstationInfoDay1Service.list(queryWrapper2);
-////                    .stream()
-////                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-////
-////                                    && i.getLocation().equals(Location.wp.getValue())
-////                                    && i.getWindpowerstationId().equals(wp.getId())
-////                            )
-////                            .collect(Collectors.toList());
-//                }
-                extracted(wp.getId(), pewp, pep1map);
+                String type=null;
+                if(wp.getId().contains("FDC"))
+                {
+                    type="FDC";
+                }else
+                {
+                    type="GDC";
+                }
+                extracted(wp.getId(),type, pewp, pep1map);
 //*******************************************年信息统计*********************************************************/
 
                 dayls.add(pewp);
@@ -705,12 +693,20 @@ public class WindPowerInfo1Service {
             if (CacheContext.propointmap.containsKey(pj.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.propointmap.get(pj.getId());
 
+                String type=null;
                 ProEconPowerstationInfoDay1 pewp = new ProEconPowerstationInfoDay1();
                 Initial.initial(pewp);
                 if (CacheContext.wpmap.containsKey(pj.getWindpowerstationId())) {
                     ProBasicPowerstation wp = CacheContext.wpmap.get(pj.getWindpowerstationId());
                     pewp.setRegionId(wp.getRegionId());
                     pewp.setCompanyId(wp.getCompanyId());
+                    if(wp.getId().contains("FDC"))
+                    {
+                        type="FDC";
+                    }else
+                    {
+                        type="GDC";
+                    }
                 }
                 pewp.setForeignKeyId(pj.getId());
 
@@ -719,27 +715,8 @@ public class WindPowerInfo1Service {
                 pewp.setLocation(Location.pj.getValue());
                 pewp.setRecordDate(DateUtils.truncate(recordDate));
 
-//                //昨日的统计结果
-//                List<ProEconPowerstationInfoDay1> pepid1ls = new ArrayList<>();
-//                Calendar cl = Calendar.getInstance();
-//                cl.setTime(recordDate);
-//                //昨日的统计结果
-//                cl.add(Calendar.DAY_OF_MONTH, -1);
-//                if (cl.get(Calendar.DAY_OF_MONTH) != 1) {
-//                    QueryWrapper<ProEconPowerstationInfoDay1> queryWrapper2 = new QueryWrapper<>();
-//                    queryWrapper2.eq("record_date",DateUtils.truncate(cl.getTime()))
-//                            .eq("location",Location.pj.getValue())
-//                            .eq("project_id",pj.getId());
-//                    pepid1ls = proEconPowerstationInfoDay1Service.list(queryWrapper2);
-////                            .stream()
-////                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncate(cl.getTime())) == 0
-////                                    && i.getLocation().equals(Location.pj.getValue())
-////                                    && i.getProjectId().equals(pj.getId())
-////                            .collect(Collectors.toList());
-////
-////                            )
-//                }
-                extracted(pj.getId(), pewp, pep1map);
+
+                extracted(pj.getId(),type, pewp, pep1map);
 
                 dayls.add(pewp);
                // proEconPowerstationInfoDay1Service.save(pewp);
@@ -823,6 +800,7 @@ public class WindPowerInfo1Service {
             if (CacheContext.linepointmap.containsKey(ln.getId())) {
                 Map<String, ProBasicPowerstationPoint> pointmap = CacheContext.linepointmap.get(ln.getId());
 
+                String type=null;
                 ProEconPowerstationInfoDay1 pewp = new ProEconPowerstationInfoDay1();
                 if (CacheContext.pjmap.containsKey(ln.getProjectId())) {
                     ProBasicProject pj = CacheContext.pjmap.get(ln.getProjectId());
@@ -831,6 +809,13 @@ public class WindPowerInfo1Service {
                         pewp.setRegionId(wp.getRegionId());
                         pewp.setCompanyId(wp.getCompanyId());
                         pewp.setWindpowerstationId(wp.getId());
+                        if(wp.getId().contains("FDC"))
+                        {
+                            type="FDC";
+                        }else
+                        {
+                            type="GDC";
+                        }
                     }
 
                 }
@@ -843,7 +828,7 @@ public class WindPowerInfo1Service {
 
 
 
-                extracted(ln.getId(), pewp, pep1map);
+                extracted(ln.getId(), type,pewp, pep1map);
 
                 dayls.add(pewp);
 //                proEconPowerstationInfoDay1Service.save(pewp);
@@ -889,12 +874,12 @@ public class WindPowerInfo1Service {
 //        proEconPowerstationInfoDay1Service.saveBatch(dayls);
     }
 
-    private void extracted(String id, ProEconPowerstationInfoDay1 pewp, Map<String,List<ProEconEquipmentInfoDay1>> pep1map) throws Exception {
+    private void extracted(String id,String type, ProEconPowerstationInfoDay1 pewp, Map<String,List<ProEconEquipmentInfoDay1>> pep1map) throws Exception {
 
 
         //*******************************************日信息统计*********************************************************/
 
-        if(pep1map.containsKey(id))
+        if(pep1map.containsKey(id) && type!=null)
         {
             List<ProEconEquipmentInfoDay1> pep1ls=pep1map.get(id);
 
@@ -907,7 +892,14 @@ public class WindPowerInfo1Service {
                 pewp.setRzxfs(summaryStatistics.getMin());
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getRpjfs).summaryStatistics();
                 //日平均风速
-                pewp.setRpjfs(summaryStatistics.getAverage());
+                if(type.equals("FDC"))
+                {
+                    pewp.setRpjfs(summaryStatistics.getAverage());
+                }else
+                {
+                    pewp.setRpjfs(summaryStatistics.getSum());
+                }
+
 
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getRzdgl).summaryStatistics();
                 //日最大功率
@@ -1011,9 +1003,17 @@ public class WindPowerInfo1Service {
                 //月最小风速
                 pewp.setYzxfs(summaryStatistics.getMin());
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getYpjfs).summaryStatistics();
-                //月平均风速
-                pewp.setYpjfs(summaryStatistics.getAverage());
 
+                //日平均风速
+                if(type.equals("FDC"))
+                {
+                    //月平均风速
+                    pewp.setYpjfs(summaryStatistics.getAverage());
+                }else
+                {
+                    //月平均风速
+                    pewp.setYpjfs(summaryStatistics.getSum());
+                }
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getYzdgl).summaryStatistics();
                 //月最大功率
                 pewp.setYzdgl(summaryStatistics.getMax());
@@ -1114,9 +1114,17 @@ public class WindPowerInfo1Service {
                 //年最小风速
                 pewp.setNzxfs(summaryStatistics.getMin());
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getNpjfs).summaryStatistics();
-                //年平均风速
-                pewp.setNpjfs(summaryStatistics.getAverage());
 
+
+                if(type.equals("FDC"))
+                {
+                    //年平均风速
+                    pewp.setNpjfs(summaryStatistics.getAverage());
+                }else
+                {
+                    //年平均风速
+                    pewp.setNpjfs(summaryStatistics.getSum());
+                }
                 summaryStatistics = pep1ls.stream().mapToDouble(ProEconEquipmentInfoDay1::getNzdgl).summaryStatistics();
                 //年最大功率
                 pewp.setNzdgl(summaryStatistics.getMax());

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

@@ -355,7 +355,18 @@ public class RealtimeService {
                 });
                 zssgl.updateAndGet(v -> {
                     try {
-                        return new Double((double) (v + edosUtil.getRealData(ssglPoint).getPointValueInDouble()));
+                        double  ssgl= edosUtil.getRealData(ssglPoint).getPointValueInDouble();
+                        if(CacheContext.modelMap.containsKey(wt.getModelId()))
+                        {
+                            ProEconEquipmentmodel model=CacheContext.modelMap.get(wt.getModelId());
+                            double value=model.getPowerProduction()*24*1.5;
+                            if(ssgl>value)
+                            {
+                                ssgl=value;
+                            }
+                        }
+
+                        return new Double((double) (v + ssgl));
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
@@ -363,6 +374,7 @@ public class RealtimeService {
                 });
                 zllgl.updateAndGet(v -> {
                     try {
+
                         return new Double((double) (v + edosUtil.getRealData(llglPoint).getPointValueInDouble()));
                     } catch (Exception e) {
                         e.printStackTrace();

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

@@ -457,16 +457,151 @@ public class StatusService {
         Map<String, ProEconEquipmentmodel> modelMap = CacheContext.modelMap;
         Map<String, Map<Integer, Integer>> aistateMap = CacheContext.aistateMap;
         Date currentDate = DateUtils.getCurrentDate();
-
+        List<ProBasicEquipment> wtls = CacheContext.wtls;
+        /********************************************************************************************************************/
         List<PointData> resultList = new ArrayList<>();
 
 
+
+        List<String> dipointls=new ArrayList<>();
+
+        List<PointData> dipointDatals = new ArrayList<>();
+
+        Map<String, PointData> divalueMap = new HashMap<>();
+
+        Map<String, Map<String, PointData>> diresultMaps = new HashMap<>();
+
+        for(ProBasicEquipment wt:wtls) {
+
+            //每个状态一个状态点
+
+            if(statusMap.containsKey(wt.getId()))
+            {
+                List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream()
+                        .filter(w -> w.getUniformCode().equals(ContantXk.MX000) || w.getUniformCode().equals(ContantXk.MX001) ||
+                                w.getUniformCode().equals(ContantXk.MX002) || w.getUniformCode().equals(ContantXk.MX003) ||
+                                w.getUniformCode().equals(ContantXk.MX004) || w.getUniformCode().equals(ContantXk.MX005) ||
+                                w.getUniformCode().equals(ContantXk.MX006) || w.getUniformCode().equals(ContantXk.MX007) ||
+                                w.getUniformCode().equals(ContantXk.MX008) || w.getUniformCode().equals(ContantXk.MX009) ||
+                                w.getUniformCode().equals(ContantXk.MX010) || w.getUniformCode().equals(ContantXk.MX011) ||
+                                w.getUniformCode().equals(ContantXk.MX012) || w.getUniformCode().equals(ContantXk.MX013)
+
+                        ).collect(Collectors.toList());
+
+                for (ProBasicStatusPoint w : windturbinestatusdis) {
+                    dipointls.add(w.getNemCode());
+                }
+
+
+                if(dipointls.size()>=3000)
+                {
+                    List<PointData> templs=edosUtil.getRealData(dipointls);
+                    dipointDatals.addAll(templs);
+                    dipointls=new ArrayList<>();
+                }
+            }
+
+        }
+        if(!dipointls.isEmpty())
+        {
+            List<PointData> templs=edosUtil.getRealData(dipointls);
+            dipointDatals.addAll(templs);
+        }
+
+        if(!dipointDatals.isEmpty())
+        {
+            for(PointData po:dipointDatals)
+            {
+                divalueMap.put(po.getEdnaId(),po);
+            }
+
+        }
+        for(ProBasicEquipment wt:wtls) {
+
+            if(statusMap.containsKey(wt.getId()))
+            {
+                //每个状态一个状态点
+                List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream()
+                        .filter(w -> w.getUniformCode().equals(ContantXk.MX000) || w.getUniformCode().equals(ContantXk.MX001) ||
+                                w.getUniformCode().equals(ContantXk.MX002) || w.getUniformCode().equals(ContantXk.MX003) ||
+                                w.getUniformCode().equals(ContantXk.MX004) || w.getUniformCode().equals(ContantXk.MX005) ||
+                                w.getUniformCode().equals(ContantXk.MX006) || w.getUniformCode().equals(ContantXk.MX007) ||
+                                w.getUniformCode().equals(ContantXk.MX008) || w.getUniformCode().equals(ContantXk.MX009) ||
+                                w.getUniformCode().equals(ContantXk.MX010) || w.getUniformCode().equals(ContantXk.MX011) ||
+                                w.getUniformCode().equals(ContantXk.MX012) || w.getUniformCode().equals(ContantXk.MX013)
+
+                        ).collect(Collectors.toList());
+
+                for (ProBasicStatusPoint w : windturbinestatusdis) {
+
+                    if(divalueMap.containsKey(w.getNemCode()))
+                    {
+                        if(diresultMaps.containsKey(w.getWindturbineId()))
+                        {
+                            Map<String,PointData> map=diresultMaps.get(w.getWindturbineId());
+
+                            map.put(w.getUniformCode(),divalueMap.get(w.getNemCode()));
+                        }else
+                        {
+                            Map<String,PointData> map=new HashMap<>();
+                            map.put(w.getUniformCode(),divalueMap.get(w.getNemCode()));
+                            diresultMaps.put(w.getWindturbineId(),map);
+                        }
+                    }
+                }
+            }
+
+
+        }
+        /********************************************************************************************************************/
+
+
+        List<String> aipointls=new ArrayList<>();
+        List<String> aiwtls=new ArrayList<>();
+        List<PointData> aipointDatals = new ArrayList<>();
+
+        Map<String, PointData> aivalueMap = new HashMap<>();
+
+        for(ProBasicEquipment wt:wtls) {
+
+            String aiordi = modelMap.get(wt.getModelId()).getDescription();
+            if (aiordi.equals("AI")){
+
+                Optional<ProBasicStatusPoint> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.AI422)).findFirst();
+                if (first.isPresent()){
+                    ProBasicStatusPoint windturbinestatusdi = first.get();
+                    aipointls.add(windturbinestatusdi.getNemCode());
+                }
+
+                aiwtls.add(wt.getId());
+                if(aipointls.size()>=3000)
+                {
+                    List<PointData> templs=edosUtil.getRealData(aipointls);
+                    aipointDatals.addAll(templs);
+                    aipointls=new ArrayList<>();
+                }
+            }
+        }
+        if(!aipointls.isEmpty())
+        {
+            List<PointData> templs=edosUtil.getRealData(aipointls);
+            aipointDatals.addAll(templs);
+        }
+
+        if(aipointDatals.size() == aiwtls.size())
+        {
+            for(int i=0;i<aipointDatals.size();i++)
+            {
+                PointData po=aipointDatals.get(i);
+                aivalueMap.put(aiwtls.get(i),po);
+            }
+        }
+   /**************************************************************************************************************************************/
+
         List<String> pointls=new ArrayList<>();
 
         List<PointData> pointDatals = new ArrayList<>();
 
-        List<ProBasicEquipment> wtls = CacheContext.wtls;
-
         for(ProBasicEquipment wt:wtls) {
             Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
             //中间状态点
@@ -475,19 +610,19 @@ public class StatusService {
             ProBasicEquipmentPoint gpztPoint = equipmentPointMap.get(ContantXk.GPZT);
             //明细状态点
             ProBasicEquipmentPoint mxztPoint = equipmentPointMap.get(ContantXk.MXZT);
-
             //状态持续时间，以秒计算
             ProBasicEquipmentPoint ztcxsjPoint = equipmentPointMap.get(ContantXk.ZTCXSJ);
+            //实时功率点
+            ProBasicEquipmentPoint ssglPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
 
             pointls.add(zjztPoint.getNemCode());
             pointls.add(gpztPoint.getNemCode());
-
             pointls.add(mxztPoint.getNemCode());
-
             pointls.add(ztcxsjPoint.getNemCode());
+            pointls.add(ssglPoint.getNemCode());
 
 
-            if(pointls.size()>=1000)
+            if(pointls.size()>=3000)
             {
                 List<PointData> templs=edosUtil.getRealData(pointls);
                 pointDatals.addAll(templs);
@@ -501,8 +636,6 @@ public class StatusService {
         }
 
 
-
-
         for(int x=0;x<wtls.size();x++) {
             ProBasicEquipment wt=wtls.get(x);
             Map<String, ProBasicEquipmentPoint> equipmentPointMap = wtpAimap.get(wt.getId());
@@ -513,69 +646,34 @@ public class StatusService {
             ProBasicEquipmentPoint mxztPoint = equipmentPointMap.get(ContantXk.MXZT);
             //状态持续时间，以秒计算
             ProBasicEquipmentPoint ztcxsjPoint = equipmentPointMap.get(ContantXk.ZTCXSJ);
+            //实时功率点
+            ProBasicEquipmentPoint ssglPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
 
-            String[] interruption = null;
-            if (wt.getEquipmentCategory() == -1) {
-                interruption = ContantXk.INTERRUPTION.split(",");
-            } else if (wt.getEquipmentCategory() == -2) {
-
-                interruption = ContantXk.INTERRUPTIONGF.split(",");
-            }
 
-            List<String> interruptionList = new ArrayList<>();
-            Arrays.stream(interruption).forEach(i -> {
-                ProBasicEquipmentPoint equipmentPoint = equipmentPointMap.get(i);
-                if (!equipmentPoint.getNemCode().equals("INITIAL")) {
-                    interruptionList.add(equipmentPoint.getNemCode());
-                }
-            });
-            double mxzt = 0;
-            double ztcxsj = 0;
-            try {
-                mxzt = pointDatals.get(x*4+2).getPointValueInDouble();
-                ztcxsj =pointDatals.get(x*4+3).getPointValueInDouble();
+            double zjzt = pointDatals.get(x*5).getPointValueInDouble();
+            double gpzt = pointDatals.get(x*5+1).getPointValueInDouble();
+            double mxzt = pointDatals.get(x*5+2).getPointValueInDouble();
+            double ztcxsj =pointDatals.get(x*5+3).getPointValueInDouble();
+            double ssgl = pointDatals.get(x*5+4).getPointValueInDouble();;
 
-//                mxzt = edosUtil.getSectionData(mxztPoint, currentDate.getTime()).getPointValueInDouble();
-//                ztcxsj = edosUtil.getSectionData(ztcxsjPoint, currentDate.getTime()).getPointValueInDouble();
-            } catch (Exception e) {
-                e.printStackTrace();
-            }
+//                    if (wt.getId().equals("SXJ_KGDL_YF_F_WT_0021_EQ")) {
+//                        System.out.println("");
+//                    }
 
-            Double status = 0.0;
-            Double mxstatus = 2.0;
+            double status = 0.0;
+            double mxstatus = 2.0;
             try {
-                if (StringUtils.isEmpty(interruptionList)) {
+                if (zjzt == 1) {
                     mxstatus = 12.0;
                     status = 6.0;
+                }else  if (zjzt == 3) {
+                    mxstatus = getGpzt(gpzt, ssgl);
                 } else {
 
-
                     Calendar c = Calendar.getInstance();
                     c.setTime(currentDate);
 
-
-//                    if (wt.getId().equals("SXJ_KGDL_YF_F_WT_0021_EQ")) {
-//                        System.out.println("");
-//                    }
-
-                    //实时功率点
-                    ProBasicEquipmentPoint ssglPoint = equipmentPointMap.get(ContantXk.CJ_SSGL);
-                    PointData ssgldata= edosUtil.getRealData(ssglPoint);
-
-                    double ssgl = ssgldata.getPointValueInDouble();
-                    double gpzt = pointDatals.get(x*4+1).getPointValueInDouble();
-                    double zjzt = pointDatals.get(x*4).getPointValueInDouble();
-//                    double ssgl = edosUtil.getSectionData(ssglPoint, currentDate.getTime()).getPointValueInDouble();
-//                    double gpzt = edosUtil.getSectionData(gpztPoint, currentDate.getTime()).getPointValueInDouble();
-//                    double xdzt = edosUtil.getSectionData(xdztPoint, currentDate.getTime()).getPointValueInDouble();
-
-                    if (zjzt == 1) {
-                        mxstatus = 12.0;
-                    }else  if (zjzt == 3) {
-                        mxstatus = getGpzt(gpzt, ssgl);
-                    } else {
-                        mxstatus = getMxzt(zjzt,modelMap, aistateMap, statusMap, wt,ssgl);
-                    }
+                    mxstatus = getMxzt(zjzt,modelMap, aistateMap, statusMap, wt,ssgl,aivalueMap, diresultMaps);
 
                     if (mxstatus == 0 || mxstatus == 1) {
                         status = 0.0;
@@ -1082,26 +1180,27 @@ public class StatusService {
         edosUtil.sendMultiPoint(resultList);
     }
 
-    private double getMxzt(double zjzt,Map<String, ProEconEquipmentmodel> modelMap,Map<String, Map<Integer, Integer>> aistateMap,Map<String, List<ProBasicStatusPoint>> statusMap,ProBasicEquipment wt,double ssgl) throws Exception {
+    private double getMxzt(double zjzt,Map<String, ProEconEquipmentmodel> modelMap,Map<String, Map<Integer, Integer>> aistateMap,
+                           Map<String, List<ProBasicStatusPoint>> statusMap,ProBasicEquipment wt,double ssgl,
+                           Map<String, PointData> aivalueMap,Map<String, Map<String, PointData>> diresultMaps) throws Exception {
 
         double mxstatus = 2;
 
         String aiordi = modelMap.get(wt.getModelId()).getDescription();
         if (aiordi.equals("AI")){
             Map<Integer, Integer> stateMap = aistateMap.get(wt.getModelId());
-            Optional<ProBasicStatusPoint> first = statusMap.get(wt.getId()).stream().filter(w -> w.getUniformCode().equals(Contant.AI422)).findFirst();
-            if (first.isPresent()){
-                ProBasicStatusPoint windturbinestatusdi = first.get();
-                int pointValueInDouble = (int) edosUtil.getRealData(windturbinestatusdi.getNemCode()).getPointValueInDouble();
+            if(aivalueMap.containsKey(wt.getId()))
+            {
+                PointData po=aivalueMap.get(wt.getId());
+                int pointValueInDouble = (int) po.getPointValueInDouble();
 
                 if(stateMap.containsKey(pointValueInDouble))
                 {
                     mxstatus = (double)stateMap.get(pointValueInDouble);
                 }
-
             }
 
-            if(wt.getId().contains("_F_"))
+             if(wt.getId().contains("_F_"))
             {
                 if (mxstatus==2 || (mxstatus==3)){
                     if(ssgl<=10 )
@@ -1114,10 +1213,10 @@ public class StatusService {
                         mxstatus=2;
                     }
                 }
-            }else
+            }else   if(wt.getId().contains("_G_"))
             {
                 if (mxstatus==2 || (mxstatus==3)){
-                    if(ssgl<=1 )
+                    if(ssgl<1 )
                     {
                         mxstatus=0;
                     }
@@ -1128,96 +1227,66 @@ public class StatusService {
                     }
                 }
             }
-
-
         }else {
-            //每个状态一个状态点
-            Map<String,String> stateMap = new HashMap<>();
-            List<ProBasicStatusPoint> windturbinestatusdis = statusMap.get(wt.getId()).stream()
-                    .filter(w -> w.getUniformCode().equals(ContantXk.MX000) || w.getUniformCode().equals(ContantXk.MX001) ||
-                            w.getUniformCode().equals(ContantXk.MX002) || w.getUniformCode().equals(ContantXk.MX003) ||
-                            w.getUniformCode().equals(ContantXk.MX004) || w.getUniformCode().equals(ContantXk.MX005) ||
-                                    w.getUniformCode().equals(ContantXk.MX006) || w.getUniformCode().equals(ContantXk.MX007) ||
-                                    w.getUniformCode().equals(ContantXk.MX008) || w.getUniformCode().equals(ContantXk.MX009) ||
-                                    w.getUniformCode().equals(ContantXk.MX010) || w.getUniformCode().equals(ContantXk.MX011) ||
-                                    w.getUniformCode().equals(ContantXk.MX012) || w.getUniformCode().equals(ContantXk.MX013)
-
-                            ).collect(Collectors.toList());
-
-
-            List<String> pointls=new ArrayList<>();
-            for (ProBasicStatusPoint w : windturbinestatusdis) {
-                pointls.add(w.getNemCode());
-            }
-
-            List<PointData> values= edosUtil.getRealData(pointls);
-
 
-            if(values.size()==windturbinestatusdis.size())
-            {
-                for (int i=0;i< windturbinestatusdis.size();i++) {
-                    ProBasicStatusPoint w=windturbinestatusdis.get(i);
-                    if (values.get(i).getPointValueInDouble() == 1) {
-                        stateMap.put(w.getUniformCode(), w.getTypeId());
-                        mxstatus = Double.parseDouble(w.getTypeId());
-                    }
-                }
-            }else
+            if(diresultMaps.containsKey(wt.getId()))
             {
-                for (ProBasicStatusPoint w : windturbinestatusdis) {
-                    PointData realData = edosUtil.getRealData(w.getNemCode());
-                    if (realData.getPointValueInDouble() == 1) {
-                        stateMap.put(w.getUniformCode(), w.getTypeId());
-                        mxstatus = Double.parseDouble(w.getTypeId());
-                    }
-                }
-            }
-
-            if (stateMap.containsKey("MX004") && stateMap.containsKey("MX006")){
-                mxstatus = Double.parseDouble(stateMap.get("MX006"));
-            }
+                Map<String, PointData> stateMap = diresultMaps.get(wt.getId());
 
-            if (stateMap.containsKey("MX002") && stateMap.containsKey("MX003")){
-                mxstatus = Double.parseDouble(stateMap.get("MX003"));
-            }
+                for (Map.Entry<String, PointData> entry : stateMap.entrySet()) {
+                        if (entry.getValue().getPointValueInDouble() == 1) {
+                        mxstatus = entry.getValue().getPointValueInDouble();
+                    }
 
+                    if (stateMap.containsKey("MX004") && stateMap.containsKey("MX006")){
+                        mxstatus = stateMap.get("MX006").getPointValueInDouble();
+                    }
 
-            if(wt.getId().contains("_F_"))
-            {
-                if (mxstatus==2 || (mxstatus==3)){
-                    if(ssgl<=10 )
-                    {
-                        mxstatus=0;
+                    if (stateMap.containsKey("MX002") && stateMap.containsKey("MX003")){
+                        mxstatus = stateMap.get("MX003").getPointValueInDouble();
                     }
-                }else if (mxstatus==0 || (mxstatus==1)){
-                    if(ssgl>10 )
+
+                    if(wt.getId().contains("_F_"))
                     {
-                        mxstatus=2;
-                    }
-                }
-            }else
-            {
-                if (mxstatus==2 || (mxstatus==3)){
-                    if(ssgl<=1 )
+                        if (mxstatus==2 || (mxstatus==3)){
+                            if(ssgl<=10 )
+                            {
+                                mxstatus=0;
+                            }
+                        }else if (mxstatus==0 || (mxstatus==1)){
+                            if(ssgl>10 )
+                            {
+                                mxstatus=2;
+                            }
+                        }
+                    }else   if(wt.getId().contains("_G_"))
                     {
-                        mxstatus=0;
+                        if (mxstatus==2 || (mxstatus==3)){
+                            if(ssgl<1 )
+                            {
+                                mxstatus=0;
+                            }
+                        }else if (mxstatus==0 ){
+                            if(ssgl>1 )
+                            {
+                                mxstatus=2;
+                            }
+                        }
                     }
-                }else if (mxstatus==0 ){
-                    if(ssgl>1 )
-                    {
-                        mxstatus=2;
+
+                    if (zjzt==3){
+                        if ( stateMap.containsKey("MX009")){
+                            mxstatus = 9;
+                        }else
+                        {
+                            mxstatus = 8;
+                        }
                     }
                 }
-            }
 
-            if (zjzt==3){
-                if ( stateMap.containsKey("MX009")){
-                    mxstatus = 9;
-                }else
-                {
-                    mxstatus = 8;
-                }
             }
+
+
         }
 
 
@@ -1587,7 +1656,7 @@ public class StatusService {
 //            System.out.println("完成!。。。。。。");
 
             Date end=new Date();
-            System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+            System.out.println("执行用时"+ DateUtils.millisecondDiff(begin,end) +"秒");
             System.out.println("设状态判定调度程序执行结束!。。。。。。");
 
             Thread.sleep(200);
@@ -1595,7 +1664,7 @@ public class StatusService {
     }
     public void startMiddleStatusReal() throws Exception {
 
-        System.out.println("中间状态判定调度程序执行开始!。。。。。。");
+//        System.out.println("中间状态判定调度程序执行开始!。。。。。。");
         while (true)
         {
 //            Calendar c = Calendar.getInstance();

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

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

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

@@ -1,7 +1,7 @@
 package com.gyee.generation;
 
-import com.gyee.common.util.DateUtils;
-import com.gyee.generation.service.*;
+import com.gyee.generation.service.InitialRedisService;
+import com.gyee.generation.service.InputOrOutPutService;
 import com.gyee.generation.util.SpringUtils;
 import org.springframework.boot.SpringApplication;
 
@@ -16,7 +16,6 @@ public class HealthTest {
         InputOrOutPutService inputOrOutPutService= SpringUtils.getBean("inputOrOutPutService");
         InitialRedisService initialRedisService= SpringUtils.getBean("initialRedisService");
 
-
         inputOrOutPutService.initialInputOrOutputSpeed();
         Calendar c = Calendar.getInstance();
         Date begin=null;
@@ -195,27 +194,16 @@ public class HealthTest {
 //
 //
 //
-        c.set(Calendar.DAY_OF_MONTH,19);
-
-        c.setTime(DateUtils.truncate(c.getTime()));
-
-        begin=new Date();
-        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-////        for(int i=0;i<2;i++)
-////        {
-//
+//        c.set(Calendar.DAY_OF_MONTH,23);
 //
+//        c.setTime(DateUtils.truncate(c.getTime()));
 //
-            System.out.println(DateUtils.format(c.getTime(),"yyyy-MM-dd HH:mm:ss").toString());
-            EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-//            EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-//            EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-//            EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-//            EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
-//            EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
-//            WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
+//        begin=new Date();
+//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
+//        for(int i=0;i<2;i++)
+//        {
 //
-            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
+//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
 //            equipmentInfo2Service.calEquipmentInfoDay(c.getTime());
 //
 //            equipmentInfo3Service.calEquipmentInfoDay(c.getTime());
@@ -225,7 +213,7 @@ public class HealthTest {
 //            equipmentInfo5Service.calEquipmentInfoDay(c.getTime());
 //
 //            equipmentInfo4Service.calEquipmentInfoDay(c.getTime());
-////
+//
 //            equipmentInfoDayTopService.calEquipmentInfoDayTop(c.getTime());
 //            equipmentInfoDayTopService.calEquipmentInfoMonthTop(c.getTime());
 //            equipmentInfoDayTopService.calEquipmentInfoYearTop(c.getTime());
@@ -233,15 +221,15 @@ public class HealthTest {
 //            wtAlysisDayService.calEquipmentInfoDay(c.getTime());
 //
 //            c.add(Calendar.DAY_OF_MONTH,1);
-
+//
 //            System.out.println("完成一次!。。。。。。");
 //        }
-
-
-
-        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("设备指标记录调度程序执行结束!。。。。。。");
 //
 //
 //
@@ -292,6 +280,41 @@ public class HealthTest {
 //        end=new Date();
 //        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
 //        System.out.println("设备数据和场站数据风资源调度程序执行结束!。。。。。。");
+//
+//
+//
+//        PowerCurveFittingModelService powerCurveFittingModelService= SpringUtils.getBean("powerCurveFittingModelService");
+//
+//        begin=new Date();
+//        System.out.println("保证功率拟合程序执行开始!。。。。。。");
+//
+//        List<String> keyls=new ArrayList<>();
+//
+//        keyls.add("AE-500-50-PV-X-HV");
+//        keyls.add("EA500KM-M");
+//        keyls.add("PVS-800-57-100KW-A");
+//        keyls.add("SG1250UD");
+//        keyls.add("SG136TX");
+//        keyls.add("SG500KTL");
+//        keyls.add("SG500MX");
+//        keyls.add("SG50KTL");
+//        keyls.add("SG50KTL-M");
+//        keyls.add("SG60KTL-M");
+//        keyls.add("SG630KTL");
+//        keyls.add("SG630MX");
+//        keyls.add("SG630-MX");
+//        keyls.add("SGI-500KTL");
+//        keyls.add("SSL500");
+//        keyls.add("SUN2000-125KTL-MO");
+//        keyls.add("SUN2000-28KTL");
+//        keyls.add("Sunny Central 500HE");
+//        keyls.add("TS80KTL-PLUS");
+//
+//
+//        powerCurveFittingModelService.cureFittingModel(keyls);
+//        end=new Date();
+//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
+//        System.out.println("保证功率拟合程序执行结束!。。。。。。");
     }
 
 }

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

@@ -14,7 +14,7 @@ public class RealTest {
     public static void main(String[] args) throws Exception {
         SpringApplication.run(GenerationMain.class, args);
         StatusService statusService= SpringUtils.getBean("statusService");
-        CycleCalculationRebuildService cycleCalculationRebuildService= SpringUtils.getBean("cycleCalculationRebuildService");
+        CycleCalculationService cycleCalculationService= SpringUtils.getBean("cycleCalculationService");
 
         CalculationService calculationService= SpringUtils.getBean("calculationService");
         RealtimeService realtimeService= SpringUtils.getBean("realtimeService");
@@ -43,9 +43,9 @@ public class RealTest {
 //        {
 
 //        statusService.middleStatusReal();
-        statusService.startStatusReal();
+//        statusService.startStatusReal();
 //        calculationService.calWp();
-//            cycleCalculationRebuildService.saveCyle();
+        cycleCalculationService.saveCyle();
 
         c.add(Calendar.DAY_OF_MONTH,1);