修改功率曲线拟合功能

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

@@ -16,52 +16,6 @@ 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,1);
-//
-//        c.setTime(DateUtils.truncate(c.getTime()));
-//
-//        begin=new Date();
-//        System.out.println("设备指标记录调度程序执行开始!。。。。。。");
-//        for(int i=0;i<23;i++)
-//        {
-//
-//
-//
-//            System.out.println(DateUtils.format(c.getTime(),"yyyy-MM-dd HH:mm:ss").toString());
-//            EquipmentInfo1Service equipmentInfo1Service= SpringUtils.getBean("equipmentInfo1Service");
-//            EquipmentInfo2Service equipmentInfo2Service= SpringUtils.getBean("equipmentInfo2Service");
-//            EquipmentInfo3Service equipmentInfo3Service= SpringUtils.getBean("equipmentInfo3Service");
-//            EquipmentInfo4Service equipmentInfo4Service= SpringUtils.getBean("equipmentInfo4Service");
-//            EquipmentInfo5Service equipmentInfo5Service= SpringUtils.getBean("equipmentInfo5Service");
-//            EquipmentInfoDayTopService equipmentInfoDayTopService= SpringUtils.getBean("equipmentInfoDayTopService");
-//            WtAlysisDayService wtAlysisDayService= SpringUtils.getBean("wtAlysisDayService");
-//
-//            equipmentInfo1Service.calEquipmentInfoDay(c.getTime());
-////            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());
-//
-//
-//            c.add(Calendar.DAY_OF_MONTH,1);
-//
-//            System.out.println("完成一次!。。。。。。");
-//        }
-//
-//        end=new Date();
-//        System.out.println("执行用时"+ DateUtils.secondsDiff(begin,end) +"秒");
-//        System.out.println("设备指标记录调度程序执行结束!。。。。。。");
-
 
         System.out.println("完成");
     }

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

@@ -1,85 +1,86 @@
-//package com.gyee.generation.config;
+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")
 //
-//
-//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.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-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();
+     */
+
+
+}

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

@@ -159,31 +159,52 @@ public class GoodnessOfFitService {
         buildList(theMapD, theList, wt.getWindpowerstationId(), fitsD, powerList);
 
 
+
+        for(FitClassVo item: theList)
+        {
+            double  rnew = 0;
+            double speed = 0;
+
+            if (item.getEpower() != 0)
+            {
+                rnew = (double)Math.sqrt((double)(item.getPower() / item.getEpower()));
+            }
+            if (item.getNumber() != 0)
+            {
+                speed = item.getSpeed() / item.getNumber();
+            }
+            item.setSpeed(speed);
+            item.setPower(rnew);
+        }
+
+
+
         theMapD.forEach((key,value)->{
             if(resultmap.containsKey(key))
             {
                 Map<String,Double> tempmap=resultmap.get(key);
-                tempmap.put("day",value.getPower() > 1 ? 1 : value.getPower());
+                tempmap.put("day",value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(),2));
                 resultmap.put(key,tempmap);
             }else
             {
                 Map<String,Double> tempmap=new HashMap<>();
-                tempmap.put("day",value.getPower() > 1 ? 1 : value.getPower());
+                tempmap.put("day",value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(),2));
                 resultmap.put(key,tempmap);
             }
 
         });
 
         theMapM.forEach((key,value)->{
+
             if(resultmap.containsKey(key))
             {
                 Map<String,Double> tempmap=resultmap.get(key);
-                tempmap.put("month",value.getPower() > 1 ? 1 : value.getPower());
+                tempmap.put("month",value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(),2));
                 resultmap.put(key,tempmap);
             }else
             {
                 Map<String,Double> tempmap=new HashMap<>();
-                tempmap.put("month",value.getPower() > 1 ? 1 : value.getPower());
+                tempmap.put("month",value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(),2));
                 resultmap.put(key,tempmap);
             }
 
@@ -193,12 +214,12 @@ public class GoodnessOfFitService {
             if(resultmap.containsKey(key))
             {
                 Map<String,Double> tempmap=resultmap.get(key);
-                tempmap.put("year",value.getPower() > 1 ? 1 : value.getPower());
+                tempmap.put("year",value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(),2));
                 resultmap.put(key,tempmap);
             }else
             {
                 Map<String,Double> tempmap=new HashMap<>();
-                tempmap.put("year",value.getPower() > 1 ? 1 : value.getPower());
+                tempmap.put("year",value.getPower() > 1 ? 1 : StringUtils.round(value.getPower(),2));
                 resultmap.put(key,tempmap);
             }
 

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

@@ -83,7 +83,7 @@ public class PowerCurveFittingByTimeService {
             wtls=CacheContext.wtls;
         }
 
-       StringBuilder sb=new StringBuilder();
+        StringBuilder sb=new StringBuilder();
         for(ProBasicEquipment wt:wtls)
         {
             sb.append("'").append(wt.getId()).append("',");
@@ -1663,49 +1663,6 @@ public class PowerCurveFittingByTimeService {
         }
 
 
-
-
-
-
-
-
-//        List<PointVo> bzPointls=new ArrayList<>();
-//        List<PointVo> sjPointls=new ArrayList<>();
-//
-//        double modelpower=0.0;
-//        if (CacheContext.wtmap.containsKey(windturbineId)) {
-//            String modelid = CacheContext.wtmap.get(windturbineId).getModelId();
-//            if (StringUtils.notEmp(modelid)) {
-//                //获取保证功率曲线中的风速和功率
-//                if (CacheContext.theoreticalPowerMap.containsKey(modelid)) {
-//                    Map<Double,ProBasicModelPowerRd> theoreticalMap= CacheContext.theoreticalPowerMap.get(modelid);
-//
-//                    PointVo point = new PointVo();
-//                    double speed=StringUtils.round(fs.getPointValueInDouble(),2);
-//                    point.setX(speed);
-//                    point.setY(theoreticalMap.get(speed).getEnsurePower());
-//
-//                    modelpower=point.getY();
-//                    bzPointls.add(point);
-//                }
-//            }
-//        }
-//
-//        PointVo point = new PointVo();
-//        double speed=StringUtils.round(fs.getPointValueInDouble(),2);
-//        double power=StringUtils.round(gl.getPointValueInDouble(),2);
-//        point.setX(speed);
-//        point.setY(power);
-//        sjPointls.add(point);
-
-        //与保证功率进行对比，偏差大于25%的进行过滤
-//        double value= pcl2( sjPointls, bzPointls, modelpower, speed);
-//
-//        if (0.25 > Math.abs(value)) {
-//            return false;
-//        }
-
-        double modelpower=0.0;
         if (CacheContext.wtmap.containsKey(windturbineId)) {
             String modelid = CacheContext.wtmap.get(windturbineId).getModelId();
             if (StringUtils.notEmp(modelid)) {
@@ -1716,42 +1673,40 @@ public class PowerCurveFittingByTimeService {
 
                     double speed=StringUtils.round(fs.getPointValueInDouble(),2);
 
-                    if(theoreticalMap.containsKey(speed))
-                    {
-                        modelpower=theoreticalMap.get(speed).getEnsurePower();
-                    }else
-                    {
-                        modelpower=0;
-                    }
-
+                    double power = theoreticalMap.get(speed).getEnsurePower();  //不同风速对应的保证功率
+                    double k = gl.getPointValueInDouble() / power;  //保证功率/实际功率   k:偏差百分比
+                    if (gl.getPointValueInDouble() > 0) {
+                        if (k < 0.95 && maxPower <= power) {
+                            return false;
+                        }
+                        if (k < 0.9 && maxPower > power) {
+                            return false;
+                        }
+                        if (k < 0.85 && speed < 6 && speed > 4) {
+                            return false;
+                        }
 
+                        if (k < 0.9 && speed <= 4 && speed > 3.5) {
+                            return false;
+                        }
+//                        if (k < 0.85 && item.getSpeed() <= 3.5 && item.getSpeed() > 3) {
+//                            item.setFilter(1);
+//                        }
+//                        if (k < 0.4 && item.getSpeed() <= 3 && item.getSpeed() > 0) {
+//                            item.setFilter(1);
+//                        }
+                    }
 
                 }
             }
         }
-        if(gl.getPointValueInDouble()>(modelpower*1.25) || gl.getPointValueInDouble()<(modelpower*0.75))
-        {
-            return false;
-        }
-
-//        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
-//        Map<String, ProBasicEquipmentPoint> wtpointmap = wtpAimap.get(windturbineId);
-//        List<String> pointid = new ArrayList<>();
-//        //欠发状态大于2过滤掉
-//        pointid.add(wtpointmap.get(ContantXk.LSQFZT).getNemCode());
-//        List<PointData> values = edosUtil.getHistMatrix(pointid, gl.getPointTime() / 1000);
-//        if (null != values && values.size() > 0) {
-//            double qfzt = qfztls.get(i).getPointValueInDouble();
-//
-//            return !(qfzt > 2);
-//        }
-
 
         //欠发状态大于2过滤掉
         if (qfztls.get(i).getPointValueInDouble() > 2) {
 
             return false;
         }
+
         return true;
     }
 
@@ -1768,10 +1723,10 @@ public class PowerCurveFittingByTimeService {
 
         if (end.after(begin)) {
             if (StringUtils.notEmp(pointIdGL) && StringUtils.notEmp(pointIdFS)) {
-                List<PointData> glpointstemp = edosUtil.getHistoryDatasSnap(pointIdGL, begin.getTime() / 1000, end.getTime() / 1000);
-                List<PointData> fspointstemp = edosUtil.getHistoryDatasSnap(pointIdFS, begin.getTime() / 1000, end.getTime() / 1000);
-                List<PointData> ztpointstemp = edosUtil.getHistoryDatasSnap(pointIdZT, begin.getTime() / 1000, end.getTime() / 1000);
-                List<PointData> qfzttemp = edosUtil.getHistoryDatasSnap(qfzt, begin.getTime() / 1000, end.getTime() / 1000);
+                List<PointData> glpointstemp = edosUtil.getHistoryDatasSnap(pointIdGL, begin.getTime() / 1000, end.getTime() / 1000,null,60*10L);
+                List<PointData> fspointstemp = edosUtil.getHistoryDatasSnap(pointIdFS, begin.getTime() / 1000, end.getTime() / 1000,null,60*10L);
+                List<PointData> ztpointstemp = edosUtil.getHistoryDatasSnap(pointIdZT, begin.getTime() / 1000, end.getTime() / 1000,null,60*10L);
+                List<PointData> qfzttemp = edosUtil.getHistoryDatasSnap(qfzt, begin.getTime() / 1000, end.getTime() / 1000,null,60*10L);
 
 
                 List<PointData> glpoints = new ArrayList<>();
@@ -1779,11 +1734,11 @@ public class PowerCurveFittingByTimeService {
                 List<PointData> ztpoints = new ArrayList<>();
                 if (!glpointstemp.isEmpty() && !fspointstemp.isEmpty() && !ztpointstemp.isEmpty() && glpointstemp.size() == fspointstemp.size() && fspointstemp.size() == ztpointstemp.size()) {
                     for (int i = 0; i < glpointstemp.size(); i++) {
-//                        if (filterData(glpointstemp.get(i), fspointstemp.get(i), ztpointstemp,qfzttemp,i, maxPower,maxSpeed, windturbineId)) {
+                        if (filterData(glpointstemp.get(i), fspointstemp.get(i), ztpointstemp,qfzttemp,i, maxPower,maxSpeed, windturbineId)) {
                             glpoints.add(glpointstemp.get(i));
                             fspoints.add(fspointstemp.get(i));
                             ztpoints.add(ztpointstemp.get(i));
-//                        }
+                        }
                     }
                 }
 

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

@@ -5,8 +5,7 @@ package com.gyee.generation.service.initalcache;/*
 
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.gyee.generation.model.auto.ProBasicEquipment;
-import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
+import com.gyee.generation.model.auto.*;
 import com.gyee.generation.service.auto.*;
 import com.gyee.generation.util.redis.RedisService;
 import lombok.extern.slf4j.Slf4j;
@@ -87,80 +86,80 @@ public class CacheService {
         });
 
                 log.info("--------------------------完成");
-//
-//
-//        log.info("--------------------------redisSQ");
-//        List<ProBasicSquare> squareList = proBasicSquareService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-//        squareList.stream().forEach(i->{
-//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-//            qw.eq("windpowerstation_id",i.getId());
-//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//            windpowerstationtestingpoint2List.stream().forEach(x->{
-//                codeaimap.put(x.getUniformCode(),x);
-//            });
-//            String s = JSONObject.toJSONString(codeaimap);
-//            redisService.set(i.getId(),s);
-//        });
-//
-//        log.info("--------------------------redisLN");
-//        List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-//        lineList.stream().forEach(i->{
-//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-//            qw.eq("windpowerstation_id",i.getId());
-//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//            windpowerstationtestingpoint2List.stream().forEach(x->{
-//                codeaimap.put(x.getUniformCode(),x);
-//            });
-//            String s = JSONObject.toJSONString(codeaimap);
-//            redisService.set(i.getId(),s);
-//        });
-//
-//
-//
-//        log.info("--------------------------redisPJ");
-//        List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-//        projectList.stream().forEach(i->{
-//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-//            qw.eq("windpowerstation_id",i.getId());
-//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//            windpowerstationtestingpoint2List.stream().forEach(x->{
-//                codeaimap.put(x.getUniformCode(),x);
-//            });
-//            String s = JSONObject.toJSONString(codeaimap);
-//            redisService.set(i.getId(),s);
-//        });
-//
-//        log.info("--------------------------redisSubWP");
-//        redisService.select(9);
-//        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-//        subStationList.stream().forEach(i->{
-//            Map<String, ProBasicSubStationTestpoint> codeaimap = new HashMap<>();
-//            QueryWrapper<ProBasicSubStationTestpoint> qw = new QueryWrapper<>();
-//            qw.eq("windpowerstation_id",i.getId());
-//            List<ProBasicSubStationTestpoint> windpowerstationtestingpoint2List = proBasicSubStationTestpointService.list(qw);
-//            windpowerstationtestingpoint2List.stream().forEach(x->{
-//                codeaimap.put(x.getUniformCode(),x);
-//            });
-//            String s = JSONObject.toJSONString(codeaimap);
-//            redisService.set(i.getId(),s);
-//        });
-//
-//        log.info("--------------------------redisWeatherWP");
-//        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
-//        weatherStationList.stream().forEach(i->{
-//            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
-//            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
-//            qw.eq("windpowerstation_id",i.getId());
-//            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
-//            windpowerstationtestingpoint2List.stream().forEach(x->{
-//                codeaimap.put(x.getUniformCode(),x);
-//            });
-//            String s = JSONObject.toJSONString(codeaimap);
-//            redisService.set(i.getId(),s);
-//        });
+
+
+        log.info("--------------------------redisSQ");
+        List<ProBasicSquare> squareList = proBasicSquareService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        squareList.stream().forEach(i->{
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+            qw.eq("windpowerstation_id",i.getId());
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            windpowerstationtestingpoint2List.stream().forEach(x->{
+                codeaimap.put(x.getUniformCode(),x);
+            });
+            String s = JSONObject.toJSONString(codeaimap);
+            redisService.set(i.getId(),s);
+        });
+
+        log.info("--------------------------redisLN");
+        List<ProBasicLine> lineList = lineService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        lineList.stream().forEach(i->{
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+            qw.eq("windpowerstation_id",i.getId());
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            windpowerstationtestingpoint2List.stream().forEach(x->{
+                codeaimap.put(x.getUniformCode(),x);
+            });
+            String s = JSONObject.toJSONString(codeaimap);
+            redisService.set(i.getId(),s);
+        });
+
+
+
+        log.info("--------------------------redisPJ");
+        List<ProBasicProject> projectList = projectService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        projectList.stream().forEach(i->{
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+            qw.eq("windpowerstation_id",i.getId());
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            windpowerstationtestingpoint2List.stream().forEach(x->{
+                codeaimap.put(x.getUniformCode(),x);
+            });
+            String s = JSONObject.toJSONString(codeaimap);
+            redisService.set(i.getId(),s);
+        });
+
+        log.info("--------------------------redisSubWP");
+        redisService.select(9);
+        List<ProBasicSubStation> subStationList = subStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        subStationList.stream().forEach(i->{
+            Map<String, ProBasicSubStationTestpoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicSubStationTestpoint> qw = new QueryWrapper<>();
+            qw.eq("windpowerstation_id",i.getId());
+            List<ProBasicSubStationTestpoint> windpowerstationtestingpoint2List = proBasicSubStationTestpointService.list(qw);
+            windpowerstationtestingpoint2List.stream().forEach(x->{
+                codeaimap.put(x.getUniformCode(),x);
+            });
+            String s = JSONObject.toJSONString(codeaimap);
+            redisService.set(i.getId(),s);
+        });
+
+        log.info("--------------------------redisWeatherWP");
+        List<ProBasicWeatherStation> weatherStationList = proBasicWeatherStationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());
+        weatherStationList.stream().forEach(i->{
+            Map<String, ProBasicPowerstationPoint> codeaimap = new HashMap<>();
+            QueryWrapper<ProBasicPowerstationPoint> qw = new QueryWrapper<>();
+            qw.eq("windpowerstation_id",i.getId());
+            List<ProBasicPowerstationPoint> windpowerstationtestingpoint2List = windpowerstationpointnewService.list(qw);
+            windpowerstationtestingpoint2List.stream().forEach(x->{
+                codeaimap.put(x.getUniformCode(),x);
+            });
+            String s = JSONObject.toJSONString(codeaimap);
+            redisService.set(i.getId(),s);
+        });
 //
 //        log.info("--------------------------redisWP");
 //        List<ProBasicPowerstation> wpList = windpowerstationService.list().stream().filter(i->i.getIsAble().equals(1)).collect(Collectors.toList());

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

@@ -9,6 +9,7 @@ import com.gyee.generation.model.auto.*;
 import com.gyee.generation.util.PointUtil;
 import com.gyee.generation.util.realtimesource.IEdosUtil;
 import lombok.SneakyThrows;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
@@ -27,9 +28,16 @@ public class CycleCalculationService {
     @Resource
     private IEdosUtil edosUtil;
 
+    @Value("${notCalculatePower}")
+    private String notCalculatePower;
+
     @SneakyThrows
     public void saveCyle() throws Exception {
 
+
+        List<String> runWpids = Arrays.asList(notCalculatePower.split(","));
+
+
         Date currentDate = DateUtils.getCurrentDate();
         int day = DateUtils.getDay(currentDate);
         int month = DateUtils.getMonth(currentDate);
@@ -170,109 +178,109 @@ public class CycleCalculationService {
                     double ssztmx = edosUtil.getRealData(mxztPoint).getPointValueInDouble();
 
                     if (ssztmx == 12 || ssztmx == 13) {
-//                        continue;
-                        if (!wt.getWindpowerstationId().equals("SXJ_KGDL_YTY_FDC_STA")) {
-                            wtResultList.add(PointUtil.createPointData(date, 0, rfdlPoint.getNemCode(), rfdlPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, yfdlPoint.getNemCode(), yfdlPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, nfdlPoint.getNemCode(), nfdlPoint.getName()));
-                        }
-
-
-                        wtResultList.add(PointUtil.createPointData(date, 0, fdl15Point.getNemCode(), fdl15Point.getName()));
-
-                        wtResultList.add(PointUtil.createPointData(date, 0, rzhdPoint.getNemCode(), rzhdPoint.getName()));
-
-                        wtResultList.add(PointUtil.createPointData(date, 0, yzhdPoint.getNemCode(), yzhdPoint.getName()));
-
-                        wtResultList.add(PointUtil.createPointData(date, 0, nzhdPoint.getNemCode(), nzhdPoint.getName()));
-
-                        wtResultList.add(PointUtil.createPointData(date, 0, zhd15Point.getNemCode(), zhd15Point.getName()));
-
-
-                        if (wt.getId().contains("_WT_")) {
-                            wtResultList.add(PointUtil.createPointData(date, 0, rpjfsPoint.getNemCode(), rpjfsPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, ypjfsPoint.getNemCode(), ypjfsPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, npjfsPoint.getNemCode(), npjfsPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, pjfs15Point.getNemCode(), pjfs15Point.getName()));
-                        } else {
-                            wtResultList.add(PointUtil.createPointData(date, 0, rpjgzdPoint.getNemCode(), rpjgzdPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, ypjgzdPoint.getNemCode(), ypjgzdPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, npjgzdPoint.getNemCode(), npjgzdPoint.getName()));
-                            wtResultList.add(PointUtil.createPointData(date, 0, pjgzd15Point.getNemCode(), pjgzd15Point.getName()));
-                        }
-
-                        wtResultList.add(PointUtil.createPointData(date, 0, rpjglPoint.getNemCode(), rpjglPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ypjglPoint.getNemCode(), ypjglPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, npjglPoint.getNemCode(), npjglPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, pjgl15Point.getNemCode(), pjgl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rkydlPoint.getNemCode(), rkydlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ykydlPoint.getNemCode(), ykydlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nkydlPoint.getNemCode(), nkydlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, kydl15Point.getNemCode(), kydl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rlldlzsPoint.getNemCode(), rkydlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ylldlzsPoint.getNemCode(), ykydlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nlldlzsPoint.getNemCode(), nkydlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, lldl15zsPoint.getNemCode(), kydl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rgzssPoint.getNemCode(), rgzssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rgzslPoint.getNemCode(), rgzslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rjxssPoint.getNemCode(), rjxssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rjxslPoint.getNemCode(), rjxslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rdjssPoint.getNemCode(), rdjssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rsdtjPoint.getNemCode(), rsdtjPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rxnssPoint.getNemCode(), rxnssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rfdjclPoint.getNemCode(), rfdjclPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rxdjclPoint.getNemCode(), rxdjclPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rxdtjPoint.getNemCode(), rxdtjPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rdwslPoint.getNemCode(), rdwslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rhjslPoint.getNemCode(), rhjslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rqfdlPoint.getNemCode(), rqfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rzfdlPoint.getNemCode(), rzfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, rllfdlPoint.getNemCode(), rllfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ygzssPoint.getNemCode(), ygzssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ygzslPoint.getNemCode(), ygzslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yjxssPoint.getNemCode(), yjxssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yjxslPoint.getNemCode(), yjxslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ydjssPoint.getNemCode(), ydjssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ysdtjPoint.getNemCode(), ysdtjPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yxnssPoint.getNemCode(), yxnssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yfdjclPoint.getNemCode(), yfdjclPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yxdjclPoint.getNemCode(), yxdjclPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yxdtjPoint.getNemCode(), yxdtjPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ydwslPoint.getNemCode(), ydwslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yhjslPoint.getNemCode(), yhjslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yqfdlPoint.getNemCode(), yqfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yzfdlPoint.getNemCode(), yzfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, yllfdlPoint.getNemCode(), yllfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ngzssPoint.getNemCode(), ngzssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ngzslPoint.getNemCode(), ngzslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, njxssPoint.getNemCode(), njxssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, njxslPoint.getNemCode(), njxslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ndjssPoint.getNemCode(), ndjssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nsdtjPoint.getNemCode(), nsdtjPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nxnssPoint.getNemCode(), nxnssPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nfdjclPoint.getNemCode(), nfdjclPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nxdjclPoint.getNemCode(), nxdjclPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nxdtjPoint.getNemCode(), nxdtjPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, ndwslPoint.getNemCode(), ndwslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nhjslPoint.getNemCode(), nhjslPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nqfdlPoint.getNemCode(), nqfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nzfdlPoint.getNemCode(), nzfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, nllfdlPoint.getNemCode(), nllfdlPoint.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, gzss15Point.getNemCode(), gzss15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, gzsl15Point.getNemCode(), gzsl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, jxss15Point.getNemCode(), jxss15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, jxsl15Point.getNemCode(), jxsl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, djss15Point.getNemCode(), djss15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, sdtj15Point.getNemCode(), sdtj15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, xnss15Point.getNemCode(), xnss15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, fdjcl15Point.getNemCode(), fdjcl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, xdjcl15Point.getNemCode(), xdjcl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, xdtj15Point.getNemCode(), xdtj15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, dwsl15Point.getNemCode(), dwsl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, hjsl15Point.getNemCode(), hjsl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, qfdl15Point.getNemCode(), qfdl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, zfdl15Point.getNemCode(), zfdl15Point.getName()));
-                        wtResultList.add(PointUtil.createPointData(date, 0, llfdl15Point.getNemCode(), llfdl15Point.getName()));
+                        continue;
+//                        if (!runWpids.contains(wt.getWindpowerstationId())) {
+//                            wtResultList.add(PointUtil.createPointData(date, 0, rfdlPoint.getNemCode(), rfdlPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, yfdlPoint.getNemCode(), yfdlPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, nfdlPoint.getNemCode(), nfdlPoint.getName()));
+//                        }
+//
+//
+//                        wtResultList.add(PointUtil.createPointData(date, 0, fdl15Point.getNemCode(), fdl15Point.getName()));
+//
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rzhdPoint.getNemCode(), rzhdPoint.getName()));
+//
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yzhdPoint.getNemCode(), yzhdPoint.getName()));
+//
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nzhdPoint.getNemCode(), nzhdPoint.getName()));
+//
+//                        wtResultList.add(PointUtil.createPointData(date, 0, zhd15Point.getNemCode(), zhd15Point.getName()));
+//
+//
+//                        if (wt.getId().contains("_WT_")) {
+//                            wtResultList.add(PointUtil.createPointData(date, 0, rpjfsPoint.getNemCode(), rpjfsPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, ypjfsPoint.getNemCode(), ypjfsPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, npjfsPoint.getNemCode(), npjfsPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, pjfs15Point.getNemCode(), pjfs15Point.getName()));
+//                        } else {
+//                            wtResultList.add(PointUtil.createPointData(date, 0, rpjgzdPoint.getNemCode(), rpjgzdPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, ypjgzdPoint.getNemCode(), ypjgzdPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, npjgzdPoint.getNemCode(), npjgzdPoint.getName()));
+//                            wtResultList.add(PointUtil.createPointData(date, 0, pjgzd15Point.getNemCode(), pjgzd15Point.getName()));
+//                        }
+//
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rpjglPoint.getNemCode(), rpjglPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ypjglPoint.getNemCode(), ypjglPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, npjglPoint.getNemCode(), npjglPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, pjgl15Point.getNemCode(), pjgl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rkydlPoint.getNemCode(), rkydlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ykydlPoint.getNemCode(), ykydlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nkydlPoint.getNemCode(), nkydlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, kydl15Point.getNemCode(), kydl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rlldlzsPoint.getNemCode(), rkydlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ylldlzsPoint.getNemCode(), ykydlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nlldlzsPoint.getNemCode(), nkydlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, lldl15zsPoint.getNemCode(), kydl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rgzssPoint.getNemCode(), rgzssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rgzslPoint.getNemCode(), rgzslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rjxssPoint.getNemCode(), rjxssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rjxslPoint.getNemCode(), rjxslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rdjssPoint.getNemCode(), rdjssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rsdtjPoint.getNemCode(), rsdtjPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rxnssPoint.getNemCode(), rxnssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rfdjclPoint.getNemCode(), rfdjclPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rxdjclPoint.getNemCode(), rxdjclPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rxdtjPoint.getNemCode(), rxdtjPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rdwslPoint.getNemCode(), rdwslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rhjslPoint.getNemCode(), rhjslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rqfdlPoint.getNemCode(), rqfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rzfdlPoint.getNemCode(), rzfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, rllfdlPoint.getNemCode(), rllfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ygzssPoint.getNemCode(), ygzssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ygzslPoint.getNemCode(), ygzslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yjxssPoint.getNemCode(), yjxssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yjxslPoint.getNemCode(), yjxslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ydjssPoint.getNemCode(), ydjssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ysdtjPoint.getNemCode(), ysdtjPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yxnssPoint.getNemCode(), yxnssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yfdjclPoint.getNemCode(), yfdjclPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yxdjclPoint.getNemCode(), yxdjclPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yxdtjPoint.getNemCode(), yxdtjPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ydwslPoint.getNemCode(), ydwslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yhjslPoint.getNemCode(), yhjslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yqfdlPoint.getNemCode(), yqfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yzfdlPoint.getNemCode(), yzfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, yllfdlPoint.getNemCode(), yllfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ngzssPoint.getNemCode(), ngzssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ngzslPoint.getNemCode(), ngzslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, njxssPoint.getNemCode(), njxssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, njxslPoint.getNemCode(), njxslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ndjssPoint.getNemCode(), ndjssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nsdtjPoint.getNemCode(), nsdtjPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nxnssPoint.getNemCode(), nxnssPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nfdjclPoint.getNemCode(), nfdjclPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nxdjclPoint.getNemCode(), nxdjclPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nxdtjPoint.getNemCode(), nxdtjPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, ndwslPoint.getNemCode(), ndwslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nhjslPoint.getNemCode(), nhjslPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nqfdlPoint.getNemCode(), nqfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nzfdlPoint.getNemCode(), nzfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, nllfdlPoint.getNemCode(), nllfdlPoint.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, gzss15Point.getNemCode(), gzss15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, gzsl15Point.getNemCode(), gzsl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, jxss15Point.getNemCode(), jxss15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, jxsl15Point.getNemCode(), jxsl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, djss15Point.getNemCode(), djss15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, sdtj15Point.getNemCode(), sdtj15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, xnss15Point.getNemCode(), xnss15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, fdjcl15Point.getNemCode(), fdjcl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, xdjcl15Point.getNemCode(), xdjcl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, xdtj15Point.getNemCode(), xdtj15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, dwsl15Point.getNemCode(), dwsl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, hjsl15Point.getNemCode(), hjsl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, qfdl15Point.getNemCode(), qfdl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, zfdl15Point.getNemCode(), zfdl15Point.getName()));
+//                        wtResultList.add(PointUtil.createPointData(date, 0, llfdl15Point.getNemCode(), llfdl15Point.getName()));
 
                     }
                     else
@@ -311,9 +319,12 @@ public class CycleCalculationService {
                         if (nfdl < 0 || nfdl < yfdl || nfdl > modelpower.get(wt.getModelId()) * 24 * 31 * 12 * 1.5) {
                             nfdl = yfdl * month;
                         }
-
-
-                        if (!wt.getWindpowerstationId().equals("SXJ_KGDL_YTY_FDC_STA")) {
+//
+//                        if(wt.getWindpowerstationId().equals("SXJ_KGDL_YTY_FDC_STA"))
+//                        {
+//                            System.out.println("");
+//                        }
+                        if (!runWpids.contains(wt.getWindpowerstationId())) {
                             wtResultList.add(PointUtil.createPointData(date, rfdl, rfdlPoint.getNemCode(), rfdlPoint.getName()));
                             wtResultList.add(PointUtil.createPointData(date, yfdl, yfdlPoint.getNemCode(), yfdlPoint.getName()));
                             wtResultList.add(PointUtil.createPointData(date, nfdl, nfdlPoint.getNemCode(), nfdlPoint.getName()));

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

@@ -343,7 +343,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日待机损失电量
-				pewp.setRdjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setRdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 			}
 		}
 		if(pointmap.containsKey(ContantXk.RQXJCLSSDL))
@@ -353,7 +353,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日缺陷降出力损失电量
-				 pewp.setRqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				 pewp.setRqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 			}
 		}
@@ -364,7 +364,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日手动停机损失电量
-				pewp.setRsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setRsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -376,7 +376,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//日性能损失电量
-				pewp.setRxnssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setRxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 			}
 		}
@@ -671,7 +671,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月待机损失电量
-				pewp.setYdjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setYdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -683,7 +683,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月缺陷降出力损失电量
-				pewp.setYqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setYqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -695,7 +695,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月手动停机损失电量
-				pewp.setYsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setYsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -707,7 +707,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//月性能损失电量
-				pewp.setYxnssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setYxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -999,7 +999,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年待机损失电量
-				pewp.setNdjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setNdjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -1011,7 +1011,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年缺陷降出力损失电量
-				pewp.setNqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setNqxjclssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -1023,7 +1023,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年手动停机损失电量
-				pewp.setNsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setNsdtjssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}
@@ -1035,7 +1035,7 @@ public class EquipmentInfo1ThreadPool implements Callable<String>, Serializable
 			if(StringUtils.notEmp(pointValue))
 			{
 				//年性能损失电量
-				pewp.setNxnssdl(StringUtils.round(pointValue.getPointValueInDouble()*0.1,2));
+				pewp.setNxnssdl(StringUtils.round(pointValue.getPointValueInDouble(),2));
 
 
 			}

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

@@ -243,8 +243,8 @@ public class HealthTest {
 //
 //        begin=new Date();
 //        System.out.println("功率一致性系数和拟合优度调度程序执行开始!。。。。。。");
-//        for(int i=0;i<3;i++)
-//        {
+////        for(int i=0;i<3;i++)
+////        {
 //
 //
 //
@@ -257,7 +257,7 @@ public class HealthTest {
 //            c.add(Calendar.DAY_OF_MONTH,1);
 //
 //           System.out.println("完成一次!。。。 。。。");
-//        }
+////        }
 //
 //
 //        end=new Date();

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

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