计算服务优化

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

@@ -1,12 +1,12 @@
 package com.gyee.generation;
 
-import com.gyee.generation.service.ProEconStaOriginalService;
-import com.gyee.generation.service.initialpoint.InitialPointGoldenXkByEqEdosService;
+import com.gyee.generation.service.PowerCurveFittingByTimeService;
 import com.gyee.generation.util.SpringUtils;
 import org.mybatis.spring.annotation.MapperScan;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 
+import java.util.Calendar;
 import java.util.Date;
 
 /**
@@ -28,17 +28,25 @@ public class GenerationMain {
 //
 //
 
-//        ProEconStaOriginalService proEconStaOriginalService= SpringUtils.getBean("proEconStaOriginalService");
+//        ProEconEqOriginalService proEconEqOriginalService= SpringUtils.getBean("proEconEqOriginalService");
 //        System.out.println("开始生成风机报表指标统计。。。。。。");
-//        proEconStaOriginalService.calEquipmentInfoDay(new Date());
+//        proEconEqOriginalService.calEquipmentInfoDay(new Date());
 //        System.out.println("结束生成风机报表指标统计。。。。。。");
-
+//
+//        Calendar c=Calendar.getInstance();
+//        c.set(Calendar.MONTH,1);
+//        c.set(Calendar.DAY_OF_MONTH,24);
+//        c.set(Calendar.HOUR_OF_DAY, 0);
+//        c.set(Calendar.MINUTE, 0);
+//        c.set(Calendar.SECOND, 0);
+//        c.set(Calendar.MILLISECOND, 0);
+//        Date date = c.getTime();
 //        ProEconStaOriginalService proEconStaOriginalService= SpringUtils.getBean("proEconStaOriginalService");
 //         System.out.println("开始生成场站报表指标统计。。。。。。");
-//         proEconStaOriginalService.calEquipmentInfoDay(new Date());
+//         proEconStaOriginalService.calEquipmentInfoDay(date);
 //         System.out.println("结束生成场站报表指标统计。。。。。。");
 //        InitialPointGoldenXkByEqEdosService initialPointGoldenXkByEqEdosService= SpringUtils.getBean("initialPointGoldenXkByEqEdosService");
-//
+
 //
 //
 //
@@ -62,15 +70,15 @@ public class GenerationMain {
 //        System.out.println("开始导出气象测点表。。。。。。");
 //        initialPointGoldenXkByEqEdosService.initalQx();
 //        System.out.println("结束导出气象测点表。。。。。。");
-
-////        PowerCurveFittingByTimeService powerCurveFittingByTimeService= SpringUtils.getBean("powerCurveFittingByTimeService");
-//        Calendar c=Calendar.getInstance();
+//
+        PowerCurveFittingByTimeService powerCurveFittingByTimeService= SpringUtils.getBean("powerCurveFittingByTimeService");
+        Calendar c=Calendar.getInstance();
 //        c.set(Calendar.MONTH,7);
 //        c.set(Calendar.DAY_OF_MONTH,2);
-//        Date date =c.getTime();
-//        powerCurveFittingByTimeService.cureFittingDay(date);
-//        powerCurveFittingByTimeService.cureFittingMonth(new Date());
-//        powerCurveFittingByTimeService.cureFittingYear(date);
+        Date date =c.getTime();
+
+        powerCurveFittingByTimeService.cureFittingMonth(date,"1");
+        powerCurveFittingByTimeService.cureFittingYear(date);
 //        CacheService cacheService= SpringUtils.getBean("cacheService");
 //        cacheService.initRedisCache();
 //        InputOrOutPutService inputOrOutPutService= SpringUtils.getBean("inputOrOutPutService");
@@ -209,7 +217,7 @@ public class GenerationMain {
 //
 //        PowerCurveFittingModelService powerCurveFittingModelService= SpringUtils.getBean("powerCurveFittingModelService");
 //        powerCurveFittingModelService.cureFittingModel();
-//
+////
 //        Calendar c=Calendar.getInstance();
 //        c.set(Calendar.MONTH,7);
 //        c.set(Calendar.DAY_OF_MONTH,2);

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

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

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEqOriginalDay.java

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
@@ -552,4 +552,131 @@ public class ProEconEqOriginalDay extends Model {
     private Double target100;
 
 
+    private Double target101;
+    private Double target102;
+    private Double target103;
+    private Double target104;
+    private Double target105;
+    private Double target106;
+    private Double target107;
+    private Double target108;
+    private Double target109;
+    private Double target110;
+    private Double target111;
+    private Double target112;
+    private Double target113;
+    private Double target114;
+    private Double target115;
+    private Double target116;
+    private Double target117;
+    private Double target118;
+    private Double target119;
+    private Double target120;
+    private Double target121;
+    private Double target122;
+    private Double target123;
+    private Double target124;
+    private Double target125;
+    private Double target126;
+    private Double target127;
+    private Double target128;
+    private Double target129;
+    private Double target130;
+    private Double target131;
+    private Double target132;
+    private Double target133;
+    private Double target134;
+    private Double target135;
+    private Double target136;
+    private Double target137;
+    private Double target138;
+    private Double target139;
+    private Double target140;
+    private Double target141;
+    private Double target142;
+    private Double target143;
+    private Double target144;
+    private Double target145;
+    private Double target146;
+    private Double target147;
+    private Double target148;
+    private Double target149;
+    private Double target150;
+    private Double target151;
+    private Double target152;
+    private Double target153;
+    private Double target154;
+    private Double target155;
+    private Double target156;
+    private Double target157;
+    private Double target158;
+    private Double target159;
+    private Double target160;
+    private Double target161;
+    private Double target162;
+    private Double target163;
+    private Double target164;
+    private Double target165;
+    private Double target166;
+    private Double target167;
+    private Double target168;
+    private Double target169;
+    private Double target170;
+    private Double target171;
+    private Double target172;
+    private Double target173;
+    private Double target174;
+    private Double target175;
+    private Double target176;
+    private Double target177;
+    private Double target178;
+    private Double target179;
+    private Double target180;
+    private Double target181;
+    private Double target182;
+    private Double target183;
+    private Double target184;
+    private Double target185;
+    private Double target186;
+    private Double target187;
+    private Double target188;
+    private Double target189;
+    private Double target190;
+    private Double target191;
+    private Double target192;
+    private Double target193;
+    private Double target194;
+    private Double target195;
+    private Double target196;
+    private Double target197;
+    private Double target198;
+    private Double target199;
+    private Double target200;
+
+
+    /**
+     * 场站编号(冗余)
+     */
+    private String windpowerstationId;
+
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+    private Integer result;
+
+    /**
+     * 对应的流程编号
+     *
+     * 关联 ProcessInstance 的 id 属性
+     */
+    private String processInstanceId;
+
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEqOriginalMonth.java

@@ -561,5 +561,129 @@ public class ProEconEqOriginalMonth extends Model {
      */
     private Double target100;
 
+    private Double target101;
+    private Double target102;
+    private Double target103;
+    private Double target104;
+    private Double target105;
+    private Double target106;
+    private Double target107;
+    private Double target108;
+    private Double target109;
+    private Double target110;
+    private Double target111;
+    private Double target112;
+    private Double target113;
+    private Double target114;
+    private Double target115;
+    private Double target116;
+    private Double target117;
+    private Double target118;
+    private Double target119;
+    private Double target120;
+    private Double target121;
+    private Double target122;
+    private Double target123;
+    private Double target124;
+    private Double target125;
+    private Double target126;
+    private Double target127;
+    private Double target128;
+    private Double target129;
+    private Double target130;
+    private Double target131;
+    private Double target132;
+    private Double target133;
+    private Double target134;
+    private Double target135;
+    private Double target136;
+    private Double target137;
+    private Double target138;
+    private Double target139;
+    private Double target140;
+    private Double target141;
+    private Double target142;
+    private Double target143;
+    private Double target144;
+    private Double target145;
+    private Double target146;
+    private Double target147;
+    private Double target148;
+    private Double target149;
+    private Double target150;
+    private Double target151;
+    private Double target152;
+    private Double target153;
+    private Double target154;
+    private Double target155;
+    private Double target156;
+    private Double target157;
+    private Double target158;
+    private Double target159;
+    private Double target160;
+    private Double target161;
+    private Double target162;
+    private Double target163;
+    private Double target164;
+    private Double target165;
+    private Double target166;
+    private Double target167;
+    private Double target168;
+    private Double target169;
+    private Double target170;
+    private Double target171;
+    private Double target172;
+    private Double target173;
+    private Double target174;
+    private Double target175;
+    private Double target176;
+    private Double target177;
+    private Double target178;
+    private Double target179;
+    private Double target180;
+    private Double target181;
+    private Double target182;
+    private Double target183;
+    private Double target184;
+    private Double target185;
+    private Double target186;
+    private Double target187;
+    private Double target188;
+    private Double target189;
+    private Double target190;
+    private Double target191;
+    private Double target192;
+    private Double target193;
+    private Double target194;
+    private Double target195;
+    private Double target196;
+    private Double target197;
+    private Double target198;
+    private Double target199;
+    private Double target200;
+
+    /**
+     * 场站编号(冗余)
+     */
+    private String windpowerstationId;
+
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+    private Integer result;
+
+    /**
+     * 对应的流程编号
+     *
+     * 关联 ProcessInstance 的 id 属性
+     */
+    private String processInstanceId;
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconEqOriginalYear.java

@@ -555,6 +555,128 @@ public class ProEconEqOriginalYear extends Model {
      * 备用35
      */
     private Double target100;
-
+    private Double target101;
+    private Double target102;
+    private Double target103;
+    private Double target104;
+    private Double target105;
+    private Double target106;
+    private Double target107;
+    private Double target108;
+    private Double target109;
+    private Double target110;
+    private Double target111;
+    private Double target112;
+    private Double target113;
+    private Double target114;
+    private Double target115;
+    private Double target116;
+    private Double target117;
+    private Double target118;
+    private Double target119;
+    private Double target120;
+    private Double target121;
+    private Double target122;
+    private Double target123;
+    private Double target124;
+    private Double target125;
+    private Double target126;
+    private Double target127;
+    private Double target128;
+    private Double target129;
+    private Double target130;
+    private Double target131;
+    private Double target132;
+    private Double target133;
+    private Double target134;
+    private Double target135;
+    private Double target136;
+    private Double target137;
+    private Double target138;
+    private Double target139;
+    private Double target140;
+    private Double target141;
+    private Double target142;
+    private Double target143;
+    private Double target144;
+    private Double target145;
+    private Double target146;
+    private Double target147;
+    private Double target148;
+    private Double target149;
+    private Double target150;
+    private Double target151;
+    private Double target152;
+    private Double target153;
+    private Double target154;
+    private Double target155;
+    private Double target156;
+    private Double target157;
+    private Double target158;
+    private Double target159;
+    private Double target160;
+    private Double target161;
+    private Double target162;
+    private Double target163;
+    private Double target164;
+    private Double target165;
+    private Double target166;
+    private Double target167;
+    private Double target168;
+    private Double target169;
+    private Double target170;
+    private Double target171;
+    private Double target172;
+    private Double target173;
+    private Double target174;
+    private Double target175;
+    private Double target176;
+    private Double target177;
+    private Double target178;
+    private Double target179;
+    private Double target180;
+    private Double target181;
+    private Double target182;
+    private Double target183;
+    private Double target184;
+    private Double target185;
+    private Double target186;
+    private Double target187;
+    private Double target188;
+    private Double target189;
+    private Double target190;
+    private Double target191;
+    private Double target192;
+    private Double target193;
+    private Double target194;
+    private Double target195;
+    private Double target196;
+    private Double target197;
+    private Double target198;
+    private Double target199;
+    private Double target200;
+    /**
+     * 场站编号(冗余)
+     */
+    private String windpowerstationId;
+
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+    private Integer result;
+
+    /**
+     * 对应的流程编号
+     *
+     * 关联 ProcessInstance 的 id 属性
+     */
+    private String processInstanceId;
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconStaOriginalDay.java

@@ -550,6 +550,113 @@ public class ProEconStaOriginalDay extends Model {
      * 备用
      */
     private Double target100;
-
+    private Double target101;
+    private Double target102;
+    private Double target103;
+    private Double target104;
+    private Double target105;
+    private Double target106;
+    private Double target107;
+    private Double target108;
+    private Double target109;
+    private Double target110;
+    private Double target111;
+    private Double target112;
+    private Double target113;
+    private Double target114;
+    private Double target115;
+    private Double target116;
+    private Double target117;
+    private Double target118;
+    private Double target119;
+    private Double target120;
+    private Double target121;
+    private Double target122;
+    private Double target123;
+    private Double target124;
+    private Double target125;
+    private Double target126;
+    private Double target127;
+    private Double target128;
+    private Double target129;
+    private Double target130;
+    private Double target131;
+    private Double target132;
+    private Double target133;
+    private Double target134;
+    private Double target135;
+    private Double target136;
+    private Double target137;
+    private Double target138;
+    private Double target139;
+    private Double target140;
+    private Double target141;
+    private Double target142;
+    private Double target143;
+    private Double target144;
+    private Double target145;
+    private Double target146;
+    private Double target147;
+    private Double target148;
+    private Double target149;
+    private Double target150;
+    private Double target151;
+    private Double target152;
+    private Double target153;
+    private Double target154;
+    private Double target155;
+    private Double target156;
+    private Double target157;
+    private Double target158;
+    private Double target159;
+    private Double target160;
+    private Double target161;
+    private Double target162;
+    private Double target163;
+    private Double target164;
+    private Double target165;
+    private Double target166;
+    private Double target167;
+    private Double target168;
+    private Double target169;
+    private Double target170;
+    private Double target171;
+    private Double target172;
+    private Double target173;
+    private Double target174;
+    private Double target175;
+    private Double target176;
+    private Double target177;
+    private Double target178;
+    private Double target179;
+    private Double target180;
+    private Double target181;
+    private Double target182;
+    private Double target183;
+    private Double target184;
+    private Double target185;
+    private Double target186;
+    private Double target187;
+    private Double target188;
+    private Double target189;
+    private Double target190;
+    private Double target191;
+    private Double target192;
+    private Double target193;
+    private Double target194;
+    private Double target195;
+    private Double target196;
+    private Double target197;
+    private Double target198;
+    private Double target199;
+    private Double target200;
+    private Integer result;
+
+    /**
+     * 对应的流程编号
+     *
+     * 关联 ProcessInstance 的 id 属性
+     */
+    private String processInstanceId;
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconStaOriginalMonth.java

@@ -560,6 +560,113 @@ public class ProEconStaOriginalMonth extends Model {
      * 备用
      */
     private Double target100;
-
+    private Double target101;
+    private Double target102;
+    private Double target103;
+    private Double target104;
+    private Double target105;
+    private Double target106;
+    private Double target107;
+    private Double target108;
+    private Double target109;
+    private Double target110;
+    private Double target111;
+    private Double target112;
+    private Double target113;
+    private Double target114;
+    private Double target115;
+    private Double target116;
+    private Double target117;
+    private Double target118;
+    private Double target119;
+    private Double target120;
+    private Double target121;
+    private Double target122;
+    private Double target123;
+    private Double target124;
+    private Double target125;
+    private Double target126;
+    private Double target127;
+    private Double target128;
+    private Double target129;
+    private Double target130;
+    private Double target131;
+    private Double target132;
+    private Double target133;
+    private Double target134;
+    private Double target135;
+    private Double target136;
+    private Double target137;
+    private Double target138;
+    private Double target139;
+    private Double target140;
+    private Double target141;
+    private Double target142;
+    private Double target143;
+    private Double target144;
+    private Double target145;
+    private Double target146;
+    private Double target147;
+    private Double target148;
+    private Double target149;
+    private Double target150;
+    private Double target151;
+    private Double target152;
+    private Double target153;
+    private Double target154;
+    private Double target155;
+    private Double target156;
+    private Double target157;
+    private Double target158;
+    private Double target159;
+    private Double target160;
+    private Double target161;
+    private Double target162;
+    private Double target163;
+    private Double target164;
+    private Double target165;
+    private Double target166;
+    private Double target167;
+    private Double target168;
+    private Double target169;
+    private Double target170;
+    private Double target171;
+    private Double target172;
+    private Double target173;
+    private Double target174;
+    private Double target175;
+    private Double target176;
+    private Double target177;
+    private Double target178;
+    private Double target179;
+    private Double target180;
+    private Double target181;
+    private Double target182;
+    private Double target183;
+    private Double target184;
+    private Double target185;
+    private Double target186;
+    private Double target187;
+    private Double target188;
+    private Double target189;
+    private Double target190;
+    private Double target191;
+    private Double target192;
+    private Double target193;
+    private Double target194;
+    private Double target195;
+    private Double target196;
+    private Double target197;
+    private Double target198;
+    private Double target199;
+    private Double target200;
+    private Integer result;
+
+    /**
+     * 对应的流程编号
+     *
+     * 关联 ProcessInstance 的 id 属性
+     */
+    private String processInstanceId;
 
 }

realtime/generationXK-service/src/main/java/com/gyee/generation/model/auto/ProEconStaOriginalYear.java

@@ -556,5 +556,112 @@ public class ProEconStaOriginalYear extends Model {
      */
     private Double target100;
 
+    private Integer result;
+    private Double target101;
+    private Double target102;
+    private Double target103;
+    private Double target104;
+    private Double target105;
+    private Double target106;
+    private Double target107;
+    private Double target108;
+    private Double target109;
+    private Double target110;
+    private Double target111;
+    private Double target112;
+    private Double target113;
+    private Double target114;
+    private Double target115;
+    private Double target116;
+    private Double target117;
+    private Double target118;
+    private Double target119;
+    private Double target120;
+    private Double target121;
+    private Double target122;
+    private Double target123;
+    private Double target124;
+    private Double target125;
+    private Double target126;
+    private Double target127;
+    private Double target128;
+    private Double target129;
+    private Double target130;
+    private Double target131;
+    private Double target132;
+    private Double target133;
+    private Double target134;
+    private Double target135;
+    private Double target136;
+    private Double target137;
+    private Double target138;
+    private Double target139;
+    private Double target140;
+    private Double target141;
+    private Double target142;
+    private Double target143;
+    private Double target144;
+    private Double target145;
+    private Double target146;
+    private Double target147;
+    private Double target148;
+    private Double target149;
+    private Double target150;
+    private Double target151;
+    private Double target152;
+    private Double target153;
+    private Double target154;
+    private Double target155;
+    private Double target156;
+    private Double target157;
+    private Double target158;
+    private Double target159;
+    private Double target160;
+    private Double target161;
+    private Double target162;
+    private Double target163;
+    private Double target164;
+    private Double target165;
+    private Double target166;
+    private Double target167;
+    private Double target168;
+    private Double target169;
+    private Double target170;
+    private Double target171;
+    private Double target172;
+    private Double target173;
+    private Double target174;
+    private Double target175;
+    private Double target176;
+    private Double target177;
+    private Double target178;
+    private Double target179;
+    private Double target180;
+    private Double target181;
+    private Double target182;
+    private Double target183;
+    private Double target184;
+    private Double target185;
+    private Double target186;
+    private Double target187;
+    private Double target188;
+    private Double target189;
+    private Double target190;
+    private Double target191;
+    private Double target192;
+    private Double target193;
+    private Double target194;
+    private Double target195;
+    private Double target196;
+    private Double target197;
+    private Double target198;
+    private Double target199;
+    private Double target200;
+    /**
+     * 对应的流程编号
+     *
+     * 关联 ProcessInstance 的 id 属性
+     */
+    private String processInstanceId;
 
 }

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

@@ -408,7 +408,9 @@ public class PowerCurveFittingByTimeService {
             vos = windMap.get(key).getYzyglPoints().stream().filter(it -> it.getX() >= 0 && it.getX() <= 25).sorted(Comparator.comparing(PointVo::getX)).collect(Collectors.toList());
             windMap.get(key).setYzyglPoints(vos);
 
+            logger.info(key+"曲线拟合完成！");
         }
+        logger.info("曲线拟合完成！");
         List<ProEconCurveFittMonthMain> mainls=new ArrayList<>();
         for (String key : windMap.keySet()) {
 
@@ -484,6 +486,7 @@ public class PowerCurveFittingByTimeService {
                     }
                 }
             }
+
 //*********************************************年曲线偏差记录**********************************************************/
 
 
@@ -547,14 +550,14 @@ public class PowerCurveFittingByTimeService {
                 insertPoints2( windMap.get(key).getYsjglPoints(), windMap.get(key).getYzyglPoints(), key);
             }
 
-
-            logger.info(key);
-//
+            logger.info(key+"月曲线偏差率完成！");
 //            logger.info(String.format("{1}:更新sqlserver数据库记录数：{0}", z, new Date()));
 
 
         }
         proEconCurveFittMonthMainService.saveBatch(mainls);
+
+        logger.info("曲线保存完成！");
     }
 
 
@@ -1400,64 +1403,54 @@ public class PowerCurveFittingByTimeService {
     }
 
     //todo-sl 添加数据筛选
-    private boolean filterData(PointData gl, PointData fs, PointData zt, double maxPower,double maxSpeed, String windturbineId) throws Exception {
+    private boolean filterData(PointData gl, PointData fs, List<PointData> ztls,List<PointData> qfztls,int i, double maxPower,double maxSpeed, String windturbineId) throws Exception {
         if (StringUtils.notEmp(gl)) {
             //判定功率是否超过最大值
-            if (gl.getPointValueInDouble() > maxPower) {
+            if (gl.getPointValueInDouble() > maxPower || gl.getPointValueInDouble()<0) {
                 return false;
             }
         }
 
         if (StringUtils.notEmp(fs)) {
             //判定功率是否超过最大值
-            if (fs.getPointValueInDouble() > maxSpeed) {
+            if (fs.getPointValueInDouble() > maxSpeed || fs.getPointValueInDouble()<0) {
                 return false;
             }
         }
-//
-//        //判定状态不为运行的进行过滤
-//        if (zt.getPointValueInDouble() != 2) {
-//            return false;
-//        }
-//
-//
-//        //设置时间为10分钟前，10钟前有停机事件数据进行过滤
-//        Calendar c = Calendar.getInstance();
-//        c.setTimeInMillis(zt.getPointTime());
-//        Date end = c.getTime();
-//        c.add(Calendar.MINUTE, -10);
-//        Date bedin = c.getTime();
-//        List<PointData> points = edosUtil.getHistoryDatasSnap(zt.getEdnaId(), bedin.getTime() / 1000, end.getTime() / 1000);
-//        if (!points.isEmpty()) {
-//            for (PointData p : points) {
-//                if (p.getPointValueInDouble() == 4) {
-//
-//                    return false;
-//                }
-//
-//            }
-//
-//        }
-//
-//        //设置时间为10分钟后，运行后10分钟数据进行过滤
-//
-//        points = edosUtil.getHistoryDatasSnap(zt.getEdnaId(), bedin.getTime() / 1000, end.getTime() / 1000);
-//        if (!points.isEmpty()) {
-//            for (PointData p : points) {
-//                if (p.getPointValueInDouble() != 2) {
-//                    return false;
-//
-//                }
-//
-//            }
-//
-//        }
-//
-//
-//        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
-//        Map<String, ProBasicEquipmentPoint> wtpointmap = wtpAimap.get(windturbineId);
-//
-//
+
+        //判定状态不为运行的进行过滤
+        if (ztls.get(i).getPointValueInDouble() != 2) {
+            return false;
+        }
+
+
+        if(i<10)
+        {
+            return false;
+        }else {
+
+            for(int j=i-10;j<i;j++)
+            {
+                //设置时间为10分钟前，10钟前有停机事件数据进行过滤
+                if (ztls.get(j).getPointValueInDouble() == 4) {
+
+                    return false;
+                }
+                //设置时间为10分钟后，运行后10分钟数据进行过滤
+                if (ztls.get(j).getPointValueInDouble() != 2) {
+
+                    return false;
+                }
+            }
+        }
+
+
+
+
+
+
+
+
 //        List<PointVo> bzPointls=new ArrayList<>();
 //        List<PointVo> sjPointls=new ArrayList<>();
 //
@@ -1473,6 +1466,7 @@ public class PowerCurveFittingByTimeService {
 //                    double speed=StringUtils.round(fs.getPointValueInDouble(),2);
 //                    point.setX(speed);
 //                    point.setY(theoreticalMap.get(speed).getEnsurePower());
+//
 //                    modelpower=point.getY();
 //                    bzPointls.add(point);
 //                }
@@ -1485,23 +1479,53 @@ public class PowerCurveFittingByTimeService {
 //        point.setX(speed);
 //        point.setY(power);
 //        sjPointls.add(point);
-//
-//        //与保证功率进行对比，偏差大于25%的进行过滤
+
+        //与保证功率进行对比，偏差大于25%的进行过滤
 //        double value= pcl2( sjPointls, bzPointls, modelpower, speed);
 //
-//        if (value > Math.abs(0.25)) {
+//        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)) {
+                //获取保证功率曲线中的风速和功率
+                if (CacheContext.theoreticalPowerMap.containsKey(modelid)) {
+                    Map<Double,ProBasicModelPowerRd> theoreticalMap= CacheContext.theoreticalPowerMap.get(modelid);
+
+
+                    double speed=StringUtils.round(fs.getPointValueInDouble(),2);
+                    modelpower=theoreticalMap.get(speed).getEnsurePower();
+
+
+                }
+            }
+        }
+        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 = values.get(0).getPointValueInDouble();
+//            double qfzt = qfztls.get(i).getPointValueInDouble();
 //
 //            return !(qfzt > 2);
 //        }
+
+
+        //欠发状态大于2过滤掉
+        if (qfztls.get(i).getPointValueInDouble() > 2) {
+
+            return false;
+        }
         return true;
     }
 
@@ -1512,11 +1536,16 @@ public class PowerCurveFittingByTimeService {
         List<PointfVo> sjglnhpoints = new ArrayList<>();
         Map<Double, PointfVo> zyglnhpoints = new HashMap<>();
 
+        Map<String, Map<String, ProBasicEquipmentPoint>> wtpAimap = CacheContext.wtpAimap;
+        Map<String, ProBasicEquipmentPoint> wtpointmap = wtpAimap.get(windturbineId);
+        String qfzt= wtpointmap.get(ContantXk.LSQFZT).getNemCode();
+
         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> glpoints = new ArrayList<>();
@@ -1524,7 +1553,7 @@ 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.get(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/PowerCurveFittingModelService.java

@@ -58,6 +58,20 @@ public class PowerCurveFittingModelService {
 
 
                 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());

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

@@ -118,6 +118,9 @@ public class ProEconEqOriginalService {
             pewp.setWindturbineName(wt.getName());
             pewp.setRecordDate(DateUtils.truncate(recordDate));
             pewp.setWindturbineId(wt.getId());
+            pewp.setWindpowerstationId(wt.getWindpowerstationId());
+            pewp.setProjectId(wt.getProjectId());
+            pewp.setLineId(wt.getLineId());
 
             int month = c.get(Calendar.MONTH) + 1;
             int year = c.get(Calendar.YEAR);
@@ -127,12 +130,18 @@ public class ProEconEqOriginalService {
             pewpmonth.setWindturbineName(wt.getName());
             pewpmonth.setRecordDate(DateUtils.truncate(recordDate));
             pewpmonth.setWindturbineId(wt.getId());
+            pewpmonth.setWindpowerstationId(wt.getWindpowerstationId());
+            pewpmonth.setProjectId(wt.getProjectId());
+            pewpmonth.setLineId(wt.getLineId());
 
             pewpyear.setYear(year);
             pewpyear.setTypes(wt.getStatus());
             pewpyear.setWindturbineName(wt.getName());
             pewpyear.setRecordDate(DateUtils.truncate(recordDate));
             pewpyear.setWindturbineId(wt.getId());
+            pewpyear.setWindpowerstationId(wt.getWindpowerstationId());
+            pewpyear.setProjectId(wt.getProjectId());
+            pewpyear.setLineId(wt.getLineId());
 
             List<ProEconEquipmentInfoDay1> pepid1ls = new ArrayList<>();
             List<ProEconEquipmentInfoDay2> pepid2ls = new ArrayList<>();
@@ -451,6 +460,7 @@ public class ProEconEqOriginalService {
             result = new BigDecimal(24 - pewp.getTarget14()).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).doubleValue();
             pewp.setTarget55(result);
 
+
         }
         if (!pepid3ls.isEmpty()) {
             ProEconEquipmentInfoDay3 day3 = pepid3ls.get(0);
@@ -685,6 +695,8 @@ public class ProEconEqOriginalService {
             //月设备可利用率target55
             result = new BigDecimal(24 - pewp.getTarget14()).divide(new BigDecimal(24), 2, RoundingMode.HALF_EVEN).doubleValue();
             pewp.setTarget55(result);
+            //日历小时
+            pewp.setTarget66(24.0);
 
         }
         if (!pepid3ls.isEmpty()) {
@@ -702,8 +714,11 @@ public class ProEconEqOriginalService {
 
         }
 
+        Calendar c=Calendar.getInstance();
+        c.setTime(pewp.getRecordDate());
+        int day=c.get(Calendar.DAY_OF_MONTH);
         //月统计小时target36
-        pewp.setTarget36(24.0);
+        pewp.setTarget36(day*24.0);
 
         if (!pepid4ls.isEmpty()) {
             ProEconEquipmentInfoDay4 day4 = pepid4ls.get(0);
@@ -939,7 +954,11 @@ public class ProEconEqOriginalService {
         }
 
         //年统计小时target36
-        pewp.setTarget36(24.0);
+        Calendar c=Calendar.getInstance();
+        c.setTime(pewp.getRecordDate());
+        int day=c.get(Calendar.DAY_OF_YEAR);
+        //月统计小时target36
+        pewp.setTarget36(day*24.0);
 
         if (!pepid4ls.isEmpty()) {
             ProEconEquipmentInfoDay4 day4 = pepid4ls.get(0);
@@ -1554,6 +1573,106 @@ public class ProEconEqOriginalService {
          * 备用35
          */
         pepd.setTarget100(0.0);
+        pepd.setTarget101(0.0);
+        pepd.setTarget102(0.0);
+        pepd.setTarget103(0.0);
+        pepd.setTarget104(0.0);
+        pepd.setTarget105(0.0);
+        pepd.setTarget106(0.0);
+        pepd.setTarget107(0.0);
+        pepd.setTarget108(0.0);
+        pepd.setTarget109(0.0);
+        pepd.setTarget110(0.0);
+        pepd.setTarget111(0.0);
+        pepd.setTarget112(0.0);
+        pepd.setTarget113(0.0);
+        pepd.setTarget114(0.0);
+        pepd.setTarget115(0.0);
+        pepd.setTarget116(0.0);
+        pepd.setTarget117(0.0);
+        pepd.setTarget118(0.0);
+        pepd.setTarget119(0.0);
+        pepd.setTarget120(0.0);
+        pepd.setTarget121(0.0);
+        pepd.setTarget122(0.0);
+        pepd.setTarget123(0.0);
+        pepd.setTarget124(0.0);
+        pepd.setTarget125(0.0);
+        pepd.setTarget126(0.0);
+        pepd.setTarget127(0.0);
+        pepd.setTarget128(0.0);
+        pepd.setTarget129(0.0);
+        pepd.setTarget130(0.0);
+        pepd.setTarget131(0.0);
+        pepd.setTarget132(0.0);
+        pepd.setTarget133(0.0);
+        pepd.setTarget134(0.0);
+        pepd.setTarget135(0.0);
+        pepd.setTarget136(0.0);
+        pepd.setTarget137(0.0);
+        pepd.setTarget138(0.0);
+        pepd.setTarget139(0.0);
+        pepd.setTarget140(0.0);
+        pepd.setTarget141(0.0);
+        pepd.setTarget142(0.0);
+        pepd.setTarget143(0.0);
+        pepd.setTarget144(0.0);
+        pepd.setTarget145(0.0);
+        pepd.setTarget146(0.0);
+        pepd.setTarget147(0.0);
+        pepd.setTarget148(0.0);
+        pepd.setTarget149(0.0);
+        pepd.setTarget150(0.0);
+        pepd.setTarget151(0.0);
+        pepd.setTarget152(0.0);
+        pepd.setTarget153(0.0);
+        pepd.setTarget154(0.0);
+        pepd.setTarget155(0.0);
+        pepd.setTarget156(0.0);
+        pepd.setTarget157(0.0);
+        pepd.setTarget158(0.0);
+        pepd.setTarget159(0.0);
+        pepd.setTarget160(0.0);
+        pepd.setTarget161(0.0);
+        pepd.setTarget162(0.0);
+        pepd.setTarget163(0.0);
+        pepd.setTarget164(0.0);
+        pepd.setTarget165(0.0);
+        pepd.setTarget166(0.0);
+        pepd.setTarget167(0.0);
+        pepd.setTarget168(0.0);
+        pepd.setTarget169(0.0);
+        pepd.setTarget170(0.0);
+        pepd.setTarget171(0.0);
+        pepd.setTarget172(0.0);
+        pepd.setTarget173(0.0);
+        pepd.setTarget174(0.0);
+        pepd.setTarget175(0.0);
+        pepd.setTarget176(0.0);
+        pepd.setTarget177(0.0);
+        pepd.setTarget178(0.0);
+        pepd.setTarget179(0.0);
+        pepd.setTarget180(0.0);
+        pepd.setTarget181(0.0);
+        pepd.setTarget182(0.0);
+        pepd.setTarget183(0.0);
+        pepd.setTarget184(0.0);
+        pepd.setTarget185(0.0);
+        pepd.setTarget186(0.0);
+        pepd.setTarget187(0.0);
+        pepd.setTarget188(0.0);
+        pepd.setTarget189(0.0);
+        pepd.setTarget190(0.0);
+        pepd.setTarget191(0.0);
+        pepd.setTarget192(0.0);
+        pepd.setTarget193(0.0);
+        pepd.setTarget194(0.0);
+        pepd.setTarget195(0.0);
+        pepd.setTarget196(0.0);
+        pepd.setTarget197(0.0);
+        pepd.setTarget198(0.0);
+        pepd.setTarget199(0.0);
+        pepd.setTarget200(0.0);
     }
 
     public static void initial(ProEconEqOriginalMonth pepd) {
@@ -2057,6 +2176,106 @@ public class ProEconEqOriginalService {
          * 备用35
          */
         pepd.setTarget100(0.0);
+        pepd.setTarget101(0.0);
+        pepd.setTarget102(0.0);
+        pepd.setTarget103(0.0);
+        pepd.setTarget104(0.0);
+        pepd.setTarget105(0.0);
+        pepd.setTarget106(0.0);
+        pepd.setTarget107(0.0);
+        pepd.setTarget108(0.0);
+        pepd.setTarget109(0.0);
+        pepd.setTarget110(0.0);
+        pepd.setTarget111(0.0);
+        pepd.setTarget112(0.0);
+        pepd.setTarget113(0.0);
+        pepd.setTarget114(0.0);
+        pepd.setTarget115(0.0);
+        pepd.setTarget116(0.0);
+        pepd.setTarget117(0.0);
+        pepd.setTarget118(0.0);
+        pepd.setTarget119(0.0);
+        pepd.setTarget120(0.0);
+        pepd.setTarget121(0.0);
+        pepd.setTarget122(0.0);
+        pepd.setTarget123(0.0);
+        pepd.setTarget124(0.0);
+        pepd.setTarget125(0.0);
+        pepd.setTarget126(0.0);
+        pepd.setTarget127(0.0);
+        pepd.setTarget128(0.0);
+        pepd.setTarget129(0.0);
+        pepd.setTarget130(0.0);
+        pepd.setTarget131(0.0);
+        pepd.setTarget132(0.0);
+        pepd.setTarget133(0.0);
+        pepd.setTarget134(0.0);
+        pepd.setTarget135(0.0);
+        pepd.setTarget136(0.0);
+        pepd.setTarget137(0.0);
+        pepd.setTarget138(0.0);
+        pepd.setTarget139(0.0);
+        pepd.setTarget140(0.0);
+        pepd.setTarget141(0.0);
+        pepd.setTarget142(0.0);
+        pepd.setTarget143(0.0);
+        pepd.setTarget144(0.0);
+        pepd.setTarget145(0.0);
+        pepd.setTarget146(0.0);
+        pepd.setTarget147(0.0);
+        pepd.setTarget148(0.0);
+        pepd.setTarget149(0.0);
+        pepd.setTarget150(0.0);
+        pepd.setTarget151(0.0);
+        pepd.setTarget152(0.0);
+        pepd.setTarget153(0.0);
+        pepd.setTarget154(0.0);
+        pepd.setTarget155(0.0);
+        pepd.setTarget156(0.0);
+        pepd.setTarget157(0.0);
+        pepd.setTarget158(0.0);
+        pepd.setTarget159(0.0);
+        pepd.setTarget160(0.0);
+        pepd.setTarget161(0.0);
+        pepd.setTarget162(0.0);
+        pepd.setTarget163(0.0);
+        pepd.setTarget164(0.0);
+        pepd.setTarget165(0.0);
+        pepd.setTarget166(0.0);
+        pepd.setTarget167(0.0);
+        pepd.setTarget168(0.0);
+        pepd.setTarget169(0.0);
+        pepd.setTarget170(0.0);
+        pepd.setTarget171(0.0);
+        pepd.setTarget172(0.0);
+        pepd.setTarget173(0.0);
+        pepd.setTarget174(0.0);
+        pepd.setTarget175(0.0);
+        pepd.setTarget176(0.0);
+        pepd.setTarget177(0.0);
+        pepd.setTarget178(0.0);
+        pepd.setTarget179(0.0);
+        pepd.setTarget180(0.0);
+        pepd.setTarget181(0.0);
+        pepd.setTarget182(0.0);
+        pepd.setTarget183(0.0);
+        pepd.setTarget184(0.0);
+        pepd.setTarget185(0.0);
+        pepd.setTarget186(0.0);
+        pepd.setTarget187(0.0);
+        pepd.setTarget188(0.0);
+        pepd.setTarget189(0.0);
+        pepd.setTarget190(0.0);
+        pepd.setTarget191(0.0);
+        pepd.setTarget192(0.0);
+        pepd.setTarget193(0.0);
+        pepd.setTarget194(0.0);
+        pepd.setTarget195(0.0);
+        pepd.setTarget196(0.0);
+        pepd.setTarget197(0.0);
+        pepd.setTarget198(0.0);
+        pepd.setTarget199(0.0);
+        pepd.setTarget200(0.0);
     }
 
     public static void initial(ProEconEqOriginalYear pepd) {
@@ -2560,6 +2779,106 @@ public class ProEconEqOriginalService {
          * 备用35
          */
         pepd.setTarget100(0.0);
+        pepd.setTarget101(0.0);
+        pepd.setTarget102(0.0);
+        pepd.setTarget103(0.0);
+        pepd.setTarget104(0.0);
+        pepd.setTarget105(0.0);
+        pepd.setTarget106(0.0);
+        pepd.setTarget107(0.0);
+        pepd.setTarget108(0.0);
+        pepd.setTarget109(0.0);
+        pepd.setTarget110(0.0);
+        pepd.setTarget111(0.0);
+        pepd.setTarget112(0.0);
+        pepd.setTarget113(0.0);
+        pepd.setTarget114(0.0);
+        pepd.setTarget115(0.0);
+        pepd.setTarget116(0.0);
+        pepd.setTarget117(0.0);
+        pepd.setTarget118(0.0);
+        pepd.setTarget119(0.0);
+        pepd.setTarget120(0.0);
+        pepd.setTarget121(0.0);
+        pepd.setTarget122(0.0);
+        pepd.setTarget123(0.0);
+        pepd.setTarget124(0.0);
+        pepd.setTarget125(0.0);
+        pepd.setTarget126(0.0);
+        pepd.setTarget127(0.0);
+        pepd.setTarget128(0.0);
+        pepd.setTarget129(0.0);
+        pepd.setTarget130(0.0);
+        pepd.setTarget131(0.0);
+        pepd.setTarget132(0.0);
+        pepd.setTarget133(0.0);
+        pepd.setTarget134(0.0);
+        pepd.setTarget135(0.0);
+        pepd.setTarget136(0.0);
+        pepd.setTarget137(0.0);
+        pepd.setTarget138(0.0);
+        pepd.setTarget139(0.0);
+        pepd.setTarget140(0.0);
+        pepd.setTarget141(0.0);
+        pepd.setTarget142(0.0);
+        pepd.setTarget143(0.0);
+        pepd.setTarget144(0.0);
+        pepd.setTarget145(0.0);
+        pepd.setTarget146(0.0);
+        pepd.setTarget147(0.0);
+        pepd.setTarget148(0.0);
+        pepd.setTarget149(0.0);
+        pepd.setTarget150(0.0);
+        pepd.setTarget151(0.0);
+        pepd.setTarget152(0.0);
+        pepd.setTarget153(0.0);
+        pepd.setTarget154(0.0);
+        pepd.setTarget155(0.0);
+        pepd.setTarget156(0.0);
+        pepd.setTarget157(0.0);
+        pepd.setTarget158(0.0);
+        pepd.setTarget159(0.0);
+        pepd.setTarget160(0.0);
+        pepd.setTarget161(0.0);
+        pepd.setTarget162(0.0);
+        pepd.setTarget163(0.0);
+        pepd.setTarget164(0.0);
+        pepd.setTarget165(0.0);
+        pepd.setTarget166(0.0);
+        pepd.setTarget167(0.0);
+        pepd.setTarget168(0.0);
+        pepd.setTarget169(0.0);
+        pepd.setTarget170(0.0);
+        pepd.setTarget171(0.0);
+        pepd.setTarget172(0.0);
+        pepd.setTarget173(0.0);
+        pepd.setTarget174(0.0);
+        pepd.setTarget175(0.0);
+        pepd.setTarget176(0.0);
+        pepd.setTarget177(0.0);
+        pepd.setTarget178(0.0);
+        pepd.setTarget179(0.0);
+        pepd.setTarget180(0.0);
+        pepd.setTarget181(0.0);
+        pepd.setTarget182(0.0);
+        pepd.setTarget183(0.0);
+        pepd.setTarget184(0.0);
+        pepd.setTarget185(0.0);
+        pepd.setTarget186(0.0);
+        pepd.setTarget187(0.0);
+        pepd.setTarget188(0.0);
+        pepd.setTarget189(0.0);
+        pepd.setTarget190(0.0);
+        pepd.setTarget191(0.0);
+        pepd.setTarget192(0.0);
+        pepd.setTarget193(0.0);
+        pepd.setTarget194(0.0);
+        pepd.setTarget195(0.0);
+        pepd.setTarget196(0.0);
+        pepd.setTarget197(0.0);
+        pepd.setTarget198(0.0);
+        pepd.setTarget199(0.0);
+        pepd.setTarget200(0.0);
     }
 }
 

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

@@ -406,6 +406,8 @@ public class ProEconStaOriginalService {
         }
 
 
+        //日统计小时target36
+        pewp.setTarget53(24.0);
 
     }
 
@@ -570,6 +572,12 @@ public class ProEconStaOriginalService {
             double result = new BigDecimal(day5.getYfdldb()).divide(new BigDecimal(capacity), 2, RoundingMode.HALF_EVEN).doubleValue();
             pewp.setTarget42(result);
         }
+
+        Calendar c=Calendar.getInstance();
+        c.setTime(pewp.getRecordDate());
+        int day=c.get(Calendar.DAY_OF_MONTH);
+        //月统计小时target53
+        pewp.setTarget53(day*24.0);
     }
 
 
@@ -734,6 +742,12 @@ public class ProEconStaOriginalService {
             double result = new BigDecimal(day5.getNfdldb()).divide(new BigDecimal(capacity), 2, RoundingMode.HALF_EVEN).doubleValue();
             pewp.setTarget42(result);
         }
+
+        Calendar c=Calendar.getInstance();
+        c.setTime(pewp.getRecordDate());
+        int day=c.get(Calendar.DAY_OF_YEAR);
+        //月统计小时target53
+        pewp.setTarget53(day*24.0);
     }
 
     public static void initial(ProEconStaOriginalDay pepd) {
@@ -1236,6 +1250,106 @@ public class ProEconStaOriginalService {
          * 备用
          */
         pepd.setTarget100(0.0);
+        pepd.setTarget101(0.0);
+        pepd.setTarget102(0.0);
+        pepd.setTarget103(0.0);
+        pepd.setTarget104(0.0);
+        pepd.setTarget105(0.0);
+        pepd.setTarget106(0.0);
+        pepd.setTarget107(0.0);
+        pepd.setTarget108(0.0);
+        pepd.setTarget109(0.0);
+        pepd.setTarget110(0.0);
+        pepd.setTarget111(0.0);
+        pepd.setTarget112(0.0);
+        pepd.setTarget113(0.0);
+        pepd.setTarget114(0.0);
+        pepd.setTarget115(0.0);
+        pepd.setTarget116(0.0);
+        pepd.setTarget117(0.0);
+        pepd.setTarget118(0.0);
+        pepd.setTarget119(0.0);
+        pepd.setTarget120(0.0);
+        pepd.setTarget121(0.0);
+        pepd.setTarget122(0.0);
+        pepd.setTarget123(0.0);
+        pepd.setTarget124(0.0);
+        pepd.setTarget125(0.0);
+        pepd.setTarget126(0.0);
+        pepd.setTarget127(0.0);
+        pepd.setTarget128(0.0);
+        pepd.setTarget129(0.0);
+        pepd.setTarget130(0.0);
+        pepd.setTarget131(0.0);
+        pepd.setTarget132(0.0);
+        pepd.setTarget133(0.0);
+        pepd.setTarget134(0.0);
+        pepd.setTarget135(0.0);
+        pepd.setTarget136(0.0);
+        pepd.setTarget137(0.0);
+        pepd.setTarget138(0.0);
+        pepd.setTarget139(0.0);
+        pepd.setTarget140(0.0);
+        pepd.setTarget141(0.0);
+        pepd.setTarget142(0.0);
+        pepd.setTarget143(0.0);
+        pepd.setTarget144(0.0);
+        pepd.setTarget145(0.0);
+        pepd.setTarget146(0.0);
+        pepd.setTarget147(0.0);
+        pepd.setTarget148(0.0);
+        pepd.setTarget149(0.0);
+        pepd.setTarget150(0.0);
+        pepd.setTarget151(0.0);
+        pepd.setTarget152(0.0);
+        pepd.setTarget153(0.0);
+        pepd.setTarget154(0.0);
+        pepd.setTarget155(0.0);
+        pepd.setTarget156(0.0);
+        pepd.setTarget157(0.0);
+        pepd.setTarget158(0.0);
+        pepd.setTarget159(0.0);
+        pepd.setTarget160(0.0);
+        pepd.setTarget161(0.0);
+        pepd.setTarget162(0.0);
+        pepd.setTarget163(0.0);
+        pepd.setTarget164(0.0);
+        pepd.setTarget165(0.0);
+        pepd.setTarget166(0.0);
+        pepd.setTarget167(0.0);
+        pepd.setTarget168(0.0);
+        pepd.setTarget169(0.0);
+        pepd.setTarget170(0.0);
+        pepd.setTarget171(0.0);
+        pepd.setTarget172(0.0);
+        pepd.setTarget173(0.0);
+        pepd.setTarget174(0.0);
+        pepd.setTarget175(0.0);
+        pepd.setTarget176(0.0);
+        pepd.setTarget177(0.0);
+        pepd.setTarget178(0.0);
+        pepd.setTarget179(0.0);
+        pepd.setTarget180(0.0);
+        pepd.setTarget181(0.0);
+        pepd.setTarget182(0.0);
+        pepd.setTarget183(0.0);
+        pepd.setTarget184(0.0);
+        pepd.setTarget185(0.0);
+        pepd.setTarget186(0.0);
+        pepd.setTarget187(0.0);
+        pepd.setTarget188(0.0);
+        pepd.setTarget189(0.0);
+        pepd.setTarget190(0.0);
+        pepd.setTarget191(0.0);
+        pepd.setTarget192(0.0);
+        pepd.setTarget193(0.0);
+        pepd.setTarget194(0.0);
+        pepd.setTarget195(0.0);
+        pepd.setTarget196(0.0);
+        pepd.setTarget197(0.0);
+        pepd.setTarget198(0.0);
+        pepd.setTarget199(0.0);
+        pepd.setTarget200(0.0);
     }
 
     public static void initial(ProEconStaOriginalMonth pepd) {
@@ -1739,6 +1853,107 @@ public class ProEconStaOriginalService {
          * 备用
          */
         pepd.setTarget100(0.0);
+
+        pepd.setTarget101(0.0);
+        pepd.setTarget102(0.0);
+        pepd.setTarget103(0.0);
+        pepd.setTarget104(0.0);
+        pepd.setTarget105(0.0);
+        pepd.setTarget106(0.0);
+        pepd.setTarget107(0.0);
+        pepd.setTarget108(0.0);
+        pepd.setTarget109(0.0);
+        pepd.setTarget110(0.0);
+        pepd.setTarget111(0.0);
+        pepd.setTarget112(0.0);
+        pepd.setTarget113(0.0);
+        pepd.setTarget114(0.0);
+        pepd.setTarget115(0.0);
+        pepd.setTarget116(0.0);
+        pepd.setTarget117(0.0);
+        pepd.setTarget118(0.0);
+        pepd.setTarget119(0.0);
+        pepd.setTarget120(0.0);
+        pepd.setTarget121(0.0);
+        pepd.setTarget122(0.0);
+        pepd.setTarget123(0.0);
+        pepd.setTarget124(0.0);
+        pepd.setTarget125(0.0);
+        pepd.setTarget126(0.0);
+        pepd.setTarget127(0.0);
+        pepd.setTarget128(0.0);
+        pepd.setTarget129(0.0);
+        pepd.setTarget130(0.0);
+        pepd.setTarget131(0.0);
+        pepd.setTarget132(0.0);
+        pepd.setTarget133(0.0);
+        pepd.setTarget134(0.0);
+        pepd.setTarget135(0.0);
+        pepd.setTarget136(0.0);
+        pepd.setTarget137(0.0);
+        pepd.setTarget138(0.0);
+        pepd.setTarget139(0.0);
+        pepd.setTarget140(0.0);
+        pepd.setTarget141(0.0);
+        pepd.setTarget142(0.0);
+        pepd.setTarget143(0.0);
+        pepd.setTarget144(0.0);
+        pepd.setTarget145(0.0);
+        pepd.setTarget146(0.0);
+        pepd.setTarget147(0.0);
+        pepd.setTarget148(0.0);
+        pepd.setTarget149(0.0);
+        pepd.setTarget150(0.0);
+        pepd.setTarget151(0.0);
+        pepd.setTarget152(0.0);
+        pepd.setTarget153(0.0);
+        pepd.setTarget154(0.0);
+        pepd.setTarget155(0.0);
+        pepd.setTarget156(0.0);
+        pepd.setTarget157(0.0);
+        pepd.setTarget158(0.0);
+        pepd.setTarget159(0.0);
+        pepd.setTarget160(0.0);
+        pepd.setTarget161(0.0);
+        pepd.setTarget162(0.0);
+        pepd.setTarget163(0.0);
+        pepd.setTarget164(0.0);
+        pepd.setTarget165(0.0);
+        pepd.setTarget166(0.0);
+        pepd.setTarget167(0.0);
+        pepd.setTarget168(0.0);
+        pepd.setTarget169(0.0);
+        pepd.setTarget170(0.0);
+        pepd.setTarget171(0.0);
+        pepd.setTarget172(0.0);
+        pepd.setTarget173(0.0);
+        pepd.setTarget174(0.0);
+        pepd.setTarget175(0.0);
+        pepd.setTarget176(0.0);
+        pepd.setTarget177(0.0);
+        pepd.setTarget178(0.0);
+        pepd.setTarget179(0.0);
+        pepd.setTarget180(0.0);
+        pepd.setTarget181(0.0);
+        pepd.setTarget182(0.0);
+        pepd.setTarget183(0.0);
+        pepd.setTarget184(0.0);
+        pepd.setTarget185(0.0);
+        pepd.setTarget186(0.0);
+        pepd.setTarget187(0.0);
+        pepd.setTarget188(0.0);
+        pepd.setTarget189(0.0);
+        pepd.setTarget190(0.0);
+        pepd.setTarget191(0.0);
+        pepd.setTarget192(0.0);
+        pepd.setTarget193(0.0);
+        pepd.setTarget194(0.0);
+        pepd.setTarget195(0.0);
+        pepd.setTarget196(0.0);
+        pepd.setTarget197(0.0);
+        pepd.setTarget198(0.0);
+        pepd.setTarget199(0.0);
+        pepd.setTarget200(0.0);
     }
 
     public static void initial(ProEconStaOriginalYear pepd) {
@@ -2242,6 +2457,106 @@ public class ProEconStaOriginalService {
          * 备用
          */
         pepd.setTarget100(0.0);
+        pepd.setTarget101(0.0);
+        pepd.setTarget102(0.0);
+        pepd.setTarget103(0.0);
+        pepd.setTarget104(0.0);
+        pepd.setTarget105(0.0);
+        pepd.setTarget106(0.0);
+        pepd.setTarget107(0.0);
+        pepd.setTarget108(0.0);
+        pepd.setTarget109(0.0);
+        pepd.setTarget110(0.0);
+        pepd.setTarget111(0.0);
+        pepd.setTarget112(0.0);
+        pepd.setTarget113(0.0);
+        pepd.setTarget114(0.0);
+        pepd.setTarget115(0.0);
+        pepd.setTarget116(0.0);
+        pepd.setTarget117(0.0);
+        pepd.setTarget118(0.0);
+        pepd.setTarget119(0.0);
+        pepd.setTarget120(0.0);
+        pepd.setTarget121(0.0);
+        pepd.setTarget122(0.0);
+        pepd.setTarget123(0.0);
+        pepd.setTarget124(0.0);
+        pepd.setTarget125(0.0);
+        pepd.setTarget126(0.0);
+        pepd.setTarget127(0.0);
+        pepd.setTarget128(0.0);
+        pepd.setTarget129(0.0);
+        pepd.setTarget130(0.0);
+        pepd.setTarget131(0.0);
+        pepd.setTarget132(0.0);
+        pepd.setTarget133(0.0);
+        pepd.setTarget134(0.0);
+        pepd.setTarget135(0.0);
+        pepd.setTarget136(0.0);
+        pepd.setTarget137(0.0);
+        pepd.setTarget138(0.0);
+        pepd.setTarget139(0.0);
+        pepd.setTarget140(0.0);
+        pepd.setTarget141(0.0);
+        pepd.setTarget142(0.0);
+        pepd.setTarget143(0.0);
+        pepd.setTarget144(0.0);
+        pepd.setTarget145(0.0);
+        pepd.setTarget146(0.0);
+        pepd.setTarget147(0.0);
+        pepd.setTarget148(0.0);
+        pepd.setTarget149(0.0);
+        pepd.setTarget150(0.0);
+        pepd.setTarget151(0.0);
+        pepd.setTarget152(0.0);
+        pepd.setTarget153(0.0);
+        pepd.setTarget154(0.0);
+        pepd.setTarget155(0.0);
+        pepd.setTarget156(0.0);
+        pepd.setTarget157(0.0);
+        pepd.setTarget158(0.0);
+        pepd.setTarget159(0.0);
+        pepd.setTarget160(0.0);
+        pepd.setTarget161(0.0);
+        pepd.setTarget162(0.0);
+        pepd.setTarget163(0.0);
+        pepd.setTarget164(0.0);
+        pepd.setTarget165(0.0);
+        pepd.setTarget166(0.0);
+        pepd.setTarget167(0.0);
+        pepd.setTarget168(0.0);
+        pepd.setTarget169(0.0);
+        pepd.setTarget170(0.0);
+        pepd.setTarget171(0.0);
+        pepd.setTarget172(0.0);
+        pepd.setTarget173(0.0);
+        pepd.setTarget174(0.0);
+        pepd.setTarget175(0.0);
+        pepd.setTarget176(0.0);
+        pepd.setTarget177(0.0);
+        pepd.setTarget178(0.0);
+        pepd.setTarget179(0.0);
+        pepd.setTarget180(0.0);
+        pepd.setTarget181(0.0);
+        pepd.setTarget182(0.0);
+        pepd.setTarget183(0.0);
+        pepd.setTarget184(0.0);
+        pepd.setTarget185(0.0);
+        pepd.setTarget186(0.0);
+        pepd.setTarget187(0.0);
+        pepd.setTarget188(0.0);
+        pepd.setTarget189(0.0);
+        pepd.setTarget190(0.0);
+        pepd.setTarget191(0.0);
+        pepd.setTarget192(0.0);
+        pepd.setTarget193(0.0);
+        pepd.setTarget194(0.0);
+        pepd.setTarget195(0.0);
+        pepd.setTarget196(0.0);
+        pepd.setTarget197(0.0);
+        pepd.setTarget198(0.0);
+        pepd.setTarget199(0.0);
+        pepd.setTarget200(0.0);
     }
 }
 

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

@@ -0,0 +1,133 @@
+server:
+  port: 7011
+  servlet:
+    context-path: /
+
+
+spring:
+  main:
+    allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
+  #redis集群
+  redis:
+    host: 127.0.0.1
+    #host: 192.168.11.250
+    port: 6379
+    timeout: 100000
+    #    集群环境打开下面注释，单机不需要打开
+    #    cluster:
+    #      #集群信息
+    #      nodes: 10.83.68.151:6379,10.83.68.152:6379,10.83.68.153:6379,10.83.68.154:6379,10.83.68.155:6379,10.83.68.156:6379,10.83.68.157:6379,10.83.68.158:6379,10.83.68.159:6379
+    #      #默认值是5 一般当此值设置过大时，容易报：Too many Cluster redirections
+    #      maxRedirects: 3
+    password:
+    application:
+      name: test
+    jedis:
+      pool:
+        max-active: 8
+        min-idle: 0
+        max-idle: 8
+        max-wait: -1
+    database: 9
+  autoconfigure:
+    exclude: org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.jdbc.DataSourceTransactionManagerAutoConfiguration
+  datasource:
+    type: com.alibaba.druid.pool.DruidDataSource
+    url: jdbc:postgresql://127.0.0.1:5432/IMS_NEM_JN
+    username: postgres
+    password: gd123
+    driver-class-name: org.postgresql.Driver
+    #    url: jdbc:postgresql://124.70.75.91:5432/jn_test?rewriteBatchedStatements=true
+    #    username: postgres
+    #    password: gd123
+    oracle-schema=:
+    #    type: com.alibaba.druid.pool.DruidDataSource
+    #    url: jdbc:mysql://127.0.0.1:3306/test?characterEncoding=utf8&serverTimezone=UTC
+    #    username: root
+    #    password: root
+    #    driver-class-name: com.mysql.jdbc.Driver
+    druid:
+      max-active: 20
+      initial-size: 1
+      min-idle: 3
+      max-wait: 60000
+      time-between-eviction-runs-millis: 60000
+      min-evictable-idle-time-millis: 300000
+      test-while-idle: true
+      test-on-borrow: false
+      test-on-return: false
+  servlet:
+    multipart:
+      # 开启 multipart 上传功能
+      enabled: true
+      # 文件写入磁盘的阈值
+      file-size-threshold: 2KB
+      # 最大文件大小
+      max-file-size: 200MB
+      # 最大请求大小
+      max-request-size: 215MB
+
+mybatis-plus:
+  configuration:
+    map-underscore-to-camel-case: true
+    auto-mapping-behavior: full
+    log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+  mapper-locations: classpath*:mapper/**/*Mapper.xml
+  global-config:
+    # 逻辑删除配置
+    db-config:
+      id-type: auto
+      # 删除前
+      logic-not-delete-value: 1
+      # 删除后
+      logic-delete-value: 0
+logging:
+  level:
+    root: info
+    com.example: debug
+#db url
+db:
+  url: http://127.0.0.1:8011/ts
+  #url: http://10.81.3.155:8011/ts
+  #url: http://192.168.11.250:8011/ts
+  #url: http://124.70.75.91:8011/ts
+#参与计算的场站
+#runWindpowerstation: SD_GDDL_WHWD_FDC_STA,SD_GDDL_WHXQ_FDC_STA,SD_GDDL_RZLX_FDC_STA,SD_GDDL_QDJN_FDC_STA,SD_SXNY_FXFC_FDC_STA,SD_SXNY_LXLN_FDC_STA,SD_SXNY_LQJS_FDC_STA,SD_SXNY_ZYFS_FDC_STA,SD_LYDL_BH2_FDC_STA,SD_GDDL_RZWL_FDC_STA,SD_SXNY_PLHS_FDC_STA,SD_SXNY_ZYXD_FDC_STA,SD_GDDL_DZXJ_FDC_STA,SD_GDDL_XTTA_FDC_STA,SD_GDDL_WFZC_FDC_STA,SD_SXNY_JNSS_FDC_STA,SD_SXNY_WFBH_FDC_STA,SD_LYDL_CG_FDC_STA,SD_LYDL_FJ_FDC_STA,SD_LYDL_YS_FDC_STA,SD_SXNY_JNCQ_FDC_STA,SD_LYDL_BH1_FDC_STA,SD_GHTZ_HZJ_GDC_STA
+runWindpowerstation: SXJ_KGDL_GJY_FDC_STA
+#计算状态用ai或者di
+clauStatus:
+  ai: GJY03_GC,YLZ01_GC,PTZ02_GC   #配置期次
+  di: GJY01_GC,GJY02_GC,DJY01_GC,DJY02_GC,YF01_GC,YF02_GC,HSM01_GC,PTZ01_GC,ZK01_GC,NJL01_GC,YTY01_GC,PDL01_GC
+#判断数据终端
+second: 1800
+#判断降出力
+AI110: 17.4    #叶轮转速给定
+AI178: 17.4    #转矩给定
+#AI443:容量
+
+#功率曲线拟合
+curvefitting:
+  #维度
+  dimension: 20
+  #尺度
+  scale: 0.01
+initialcode: INITIAL
+##调用区间间隔时长，需要与XXLJOB调度时长结合，保证查询区间时长大于调度时长，单位分钟
+frequency:
+  #停机
+  shutdown: 6
+  #限电
+  powerrationing: 6
+  #切入切出
+  cutinandout: 6
+
+
+
+
+
+
+
+
+
+
+

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

@@ -1,6 +1,6 @@
 spring:
   profiles:
-    active: hf
+    active: sl
 #    active: yun
 
 #    active: td