修改自动生成测点功能，开发场站日信息1、2后台统计开发

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

@@ -23,9 +23,9 @@ public class GenerationMain {
 
         InitialPointGoldenXkService InitialPointGoldenXkService= SpringUtils.getBean("initialPointGoldenXkService");
 
-//                System.out.println("开始导出风机测点。。。。。。");
-//        InitialPointGoldenXkService.initalFj();
-//        System.out.println("结束导出风机测点。。。。。。");
+        System.out.println("开始导出风机测点。。。。。。");
+        InitialPointGoldenXkService.initalFj();
+        System.out.println("结束导出风机测点。。。。。。");
 
         System.out.println("开始导出风场测点。。。。。。");
         InitialPointGoldenXkService.initalFc();

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconEquipmentInfoDay2Mapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface ProEconEquipmentInfoDay2Mapper extends BaseMapper<ProEconEquipmentInfoDay2> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconEquipmentInfoDay3Mapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface ProEconEquipmentInfoDay3Mapper extends BaseMapper<ProEconEquipmentInfoDay3> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconPowerstationInfoDay2Mapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface ProEconPowerstationInfoDay2Mapper extends BaseMapper<ProEconPowerstationInfoDay2> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/mapper/auto/ProEconPowerstationInfoDay3Mapper.java

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface ProEconPowerstationInfoDay3Mapper extends BaseMapper<ProEconPowerstationInfoDay3> {
 

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,8 +1,10 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
+import java.util.Date;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -68,7 +70,7 @@ public class ProBasicProject extends Model {
     /**
      * 投产日期
      */
-    private LocalDate commissionDate;
+    private Date commissionDate;
 
     /**
      * 主控电话

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,8 +1,10 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
+import java.util.Date;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -68,7 +70,7 @@ public class ProBasicWindturbine extends Model {
     /**
      * 首次并网时间
      */
-    private LocalDate firstIntegratedTime;
+    private Date firstIntegratedTime;
 
     /**
      * 图片

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -71,22 +71,22 @@ public class ProBasicWppoint extends Model {
     /**
      * 最大值
      */
-    private BigDecimal maxval;
+    private Double maxval;
 
     /**
      * 最小值
      */
-    private BigDecimal minval;
+    private Double minval;
 
     /**
      * 合理最大值
      */
-    private BigDecimal reasonableMaxval;
+    private Double reasonableMaxval;
 
     /**
      * 合理最小值
      */
-    private BigDecimal reasonableMinval;
+    private Double reasonableMinval;
 
 
 
@@ -128,7 +128,7 @@ public class ProBasicWppoint extends Model {
     /**
      * 系数
      */
-    private BigDecimal coefficient;
+    private Double coefficient;
 
 
 }

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -33,7 +33,7 @@ public class ProEconEquipmentInfoDay1 extends Model {
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 风场编号
@@ -63,362 +63,362 @@ public class ProEconEquipmentInfoDay1 extends Model {
     /**
      * 日最大风速
      */
-    private BigDecimal rzdfs;
+    private Double rzdfs;
 
     /**
      * 日最小风速
      */
-    private BigDecimal rzxfs;
+    private Double rzxfs;
 
     /**
      * 日最大功率
      */
-    private BigDecimal rzdgl;
+    private Double rzdgl;
 
     /**
      * 日最小功率
      */
-    private BigDecimal rzxgl;
+    private Double rzxgl;
 
     /**
      * 日平均功率
      */
-    private BigDecimal rpjgl;
+    private Double rpjgl;
 
     /**
      * 日平均风速
      */
-    private BigDecimal rpjfs;
+    private Double rpjfs;
 
     /**
      * 日发电量
      */
-    private BigDecimal rfdl;
+    private Double rfdl;
 
     /**
      * 日可用电量
      */
-    private BigDecimal rkydl;
+    private Double rkydl;
 
     /**
      * 日理论发电量
      */
-    private BigDecimal rllfdl;
+    private Double rllfdl;
 
     /**
      * 日故障损失电量
      */
-    private BigDecimal rgzssdl;
+    private Double rgzssdl;
 
     /**
      * 日场内受累故障损失电量
      */
-    private BigDecimal rcnslgzssdl;
+    private Double rcnslgzssdl;
 
     /**
      * 日检修损失电量
      */
-    private BigDecimal rjxssdl;
+    private Double rjxssdl;
 
     /**
      * 日场内受累检修损失电量
      */
-    private BigDecimal rcnsljxssdl;
+    private Double rcnsljxssdl;
 
     /**
      * 日待机损失电量
      */
-    private BigDecimal rdjssdl;
+    private Double rdjssdl;
 
     /**
      * 日缺陷降出力损失电量
      */
-    private BigDecimal rqxjclssdl;
+    private Double rqxjclssdl;
 
     /**
      * 日手动停机损失电量
      */
-    private BigDecimal rsdtjssdl;
+    private Double rsdtjssdl;
 
     /**
      * 日性能损失电量
      */
-    private BigDecimal rxnssdl;
+    private Double rxnssdl;
 
     /**
      * 日限电停机损失电量
      */
-    private BigDecimal rxdtjssdl;
+    private Double rxdtjssdl;
 
     /**
      * 日限电降出力损失电量
      */
-    private BigDecimal rxdjclssdl;
+    private Double rxdjclssdl;
 
     /**
      * 日场外受累电网损失电量
      */
-    private BigDecimal rcwsldwssdl;
+    private Double rcwsldwssdl;
 
     /**
      * 日场外受累天气损失电量
      */
-    private BigDecimal rcwsltqssdl;
+    private Double rcwsltqssdl;
 
     /**
      * 日增发电量
      */
-    private BigDecimal rzfdl;
+    private Double rzfdl;
 
     /**
      * 日欠发电量
      */
-    private BigDecimal rqfdl;
+    private Double rqfdl;
 
     /**
      * 月最大风速
      */
-    private BigDecimal yzdfs;
+    private Double yzdfs;
 
     /**
      * 月最小风速
      */
-    private BigDecimal yrzxfs;
+    private Double yrzxfs;
 
     /**
      * 月最大功率
      */
-    private BigDecimal yzdgl;
+    private Double yzdgl;
 
     /**
      * 月最小功率
      */
-    private BigDecimal yzxgl;
+    private Double yzxgl;
 
     /**
      * 月平均功率
      */
-    private BigDecimal ypjgl;
+    private Double ypjgl;
 
     /**
      * 月平均风速
      */
-    private BigDecimal ypjfs;
+    private Double ypjfs;
 
     /**
      * 月发电量
      */
-    private BigDecimal yfdl;
+    private Double yfdl;
 
     /**
      * 月可用电量
      */
-    private BigDecimal ykydl;
+    private Double ykydl;
 
     /**
      * 月理论发电量
      */
-    private BigDecimal yllfdl;
+    private Double yllfdl;
 
     /**
      * 月故障损失电量
      */
-    private BigDecimal ygzssdl;
+    private Double ygzssdl;
 
     /**
      * 月场内受累故障损失电量
      */
-    private BigDecimal ycnslgzssdl;
+    private Double ycnslgzssdl;
 
     /**
      * 月检修损失电量
      */
-    private BigDecimal yjxssdl;
+    private Double yjxssdl;
 
     /**
      * 月场内受累检修损失电量
      */
-    private BigDecimal ycnsljxssdl;
+    private Double ycnsljxssdl;
 
     /**
      * 月待机损失电量
      */
-    private BigDecimal ydjssdl;
+    private Double ydjssdl;
 
     /**
      * 月缺陷降出力损失电量
      */
-    private BigDecimal yqxjclssdl;
+    private Double yqxjclssdl;
 
     /**
      * 月手动停机损失电量
      */
-    private BigDecimal ysdtjssdl;
+    private Double ysdtjssdl;
 
     /**
      * 月性能损失电量
      */
-    private BigDecimal yxnssdl;
+    private Double yxnssdl;
 
     /**
      * 月限电停机损失电量
      */
-    private BigDecimal yxdtjssdl;
+    private Double yxdtjssdl;
 
     /**
      * 月限电降出力损失电量
      */
-    private BigDecimal yxdjclssdl;
+    private Double yxdjclssdl;
 
     /**
      * 月场外受累电网损失电量
      */
-    private BigDecimal ycwsldwssdl;
+    private Double ycwsldwssdl;
 
     /**
      * 月场外受累天气损失电量
      */
-    private BigDecimal ycwsltqssdl;
+    private Double ycwsltqssdl;
 
     /**
      * 月增发电量
      */
-    private BigDecimal yzfdl;
+    private Double yzfdl;
 
     /**
      * 月欠发电量
      */
-    private BigDecimal yqfdl;
+    private Double yqfdl;
 
     /**
      * 年最大风速
      */
-    private BigDecimal nzdfs;
+    private Double nzdfs;
 
     /**
      * 年最小风速
      */
-    private BigDecimal nzxfs;
+    private Double nzxfs;
 
     /**
      * 年最大功率
      */
-    private BigDecimal nzdgl;
+    private Double nzdgl;
 
     /**
      * 年最小功率
      */
-    private BigDecimal nzxgl;
+    private Double nzxgl;
 
     /**
      * 年平均功率
      */
-    private BigDecimal npjgl;
+    private Double npjgl;
 
     /**
      * 年平均风速
      */
-    private BigDecimal npjfs;
+    private Double npjfs;
 
     /**
      * 年发电量
      */
-    private BigDecimal nfdl;
+    private Double nfdl;
 
     /**
      * 年可用电量
      */
-    private BigDecimal nkydl;
+    private Double nkydl;
 
     /**
      * 年理论发电量
      */
-    private BigDecimal nllfdl;
+    private Double nllfdl;
 
     /**
      * 年故障损失电量
      */
-    private BigDecimal ngzssdl;
+    private Double ngzssdl;
 
     /**
      * 年场内受累故障损失电量
      */
-    private BigDecimal ncnslgzssdl;
+    private Double ncnslgzssdl;
 
     /**
      * 年检修损失电量
      */
-    private BigDecimal njxssdl;
+    private Double njxssdl;
 
     /**
      * 年场内受累检修损失电量
      */
-    private BigDecimal ncnsljxssdl;
+    private Double ncnsljxssdl;
 
     /**
      * 年待机损失电量
      */
-    private BigDecimal ndjssdl;
+    private Double ndjssdl;
 
     /**
      * 年缺陷降出力损失电量
      */
-    private BigDecimal nqxjclssdl;
+    private Double nqxjclssdl;
 
     /**
      * 年手动停机损失电量
      */
-    private BigDecimal nsdtjssdl;
+    private Double nsdtjssdl;
 
     /**
      * 年性能损失电量
      */
-    private BigDecimal nxnssdl;
+    private Double nxnssdl;
 
     /**
      * 年限电停机损失电量
      */
-    private BigDecimal nxdtjssdl;
+    private Double nxdtjssdl;
 
     /**
      * 年限电降出力损失电量
      */
-    private BigDecimal nxdjclssdl;
+    private Double nxdjclssdl;
 
     /**
      * 年场外受累电网损失电量
      */
-    private BigDecimal ncwsldwssdl;
+    private Double ncwsldwssdl;
 
     /**
      * 年场外受累天气损失电量
      */
-    private BigDecimal ncwsltqssdl;
+    private Double ncwsltqssdl;
 
     /**
      * 年增发电量
      */
-    private BigDecimal nzfdl;
+    private Double nzfdl;
 
     /**
      * 年欠发电量
      */
-    private BigDecimal nqfdl;
+    private Double nqfdl;
 
     /**
      * 日自耗电
      */
-    private BigDecimal rzhd;
+    private Double rzhd;
 
     /**
      * 月自耗电
      */
-    private BigDecimal yzhd;
+    private Double yzhd;
 
     /**
      * 年自耗电
      */
-    private BigDecimal nzhd;
+    private Double nzhd;
 
 
 }

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

@@ -1,8 +1,10 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -33,7 +35,7 @@ public class ProEconEquipmentInfoDay2 extends Model {
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 风场编号
@@ -63,302 +65,317 @@ public class ProEconEquipmentInfoDay2 extends Model {
     /**
      * 日故障小时（明细）
      */
-    private BigDecimal rgzxsmx;
+    private Double rgzxsmx;
 
     /**
      * 日场内受累故障小时（明细）
      */
-    private BigDecimal rcnslgzxsmx;
+    private Double rcnslgzxsmx;
 
     /**
      * 日检修小时（明细）
      */
-    private BigDecimal rjxxsmx;
+    private Double rjxxsmx;
 
     /**
      * 日场内受累检修小时（明细）
      */
-    private BigDecimal rcnsljxxsmx;
+    private Double rcnsljxxsmx;
 
     /**
      * 日待机小时（明细）
      */
-    private BigDecimal rdjxsmx;
+    private Double rdjxsmx;
 
     /**
      * 日缺陷降出力小时（明细）
      */
-    private BigDecimal rqxjclxsmx;
+    private Double rqxjclxsmx;
 
     /**
      * 日手动停机小时（明细）
      */
-    private BigDecimal rsdtjxsmx;
+    private Double rsdtjxsmx;
 
     /**
-     * 日性能小时（明细）
+     * 日并网小时（明细）
      */
-    private BigDecimal rxnxsmx;
+    private Double rbwxsmx;
 
     /**
      * 日限电停机小时（明细）
      */
-    private BigDecimal rxdtjxsmx;
+    private Double rxdtjxsmx;
 
     /**
      * 日限电降出力小时（明细）
      */
-    private BigDecimal rxdjclxsmx;
+    private Double rxdjclxsmx;
 
     /**
      * 日场外受累电网小时（明细）
      */
-    private BigDecimal rcwsldwxsmx;
+    private Double rcwsldwxsmx;
 
     /**
      * 日场外受累天气小时（明细）
      */
-    private BigDecimal rcwsltqxsmx;
+    private Double rcwsltqxsmx;
 
     /**
      * 日离线小时（明细）
      */
-    private BigDecimal rlxxsmx;
+    private Double rlxxsmx;
 
     /**
      * 日通讯中断小时（明细）
      */
-    private BigDecimal rtxzdxsmx;
+    private Double rtxzdxsmx;
 
     /**
      * 日待机小时
      */
-    private BigDecimal rdjxs;
+    private Double rdjxs;
 
     /**
      * 日故障停机小时
      */
-    private BigDecimal rgztjxs;
+    private Double rgztjxs;
 
     /**
      * 日通讯中断小时
      */
-    private BigDecimal rtxzdxs;
+    private Double rtxzdxs;
 
     /**
      * 日维护停机小时
      */
-    private BigDecimal rjxtjxs;
+    private Double rjxtjxs;
 
     /**
      * 日限电小时
      */
-    private BigDecimal rxdxs;
+    private Double rxdxs;
 
     /**
      * 日运行小时
      */
-    private BigDecimal ryxxs;
+    private Double ryxxs;
 
     /**
      * 月故障小时（明细）
      */
-    private BigDecimal ygzxsmx;
+    private Double ygzxsmx;
 
     /**
      * 月场内受累故障小时（明细）
      */
-    private BigDecimal ycnslgzxsmx;
+    private Double ycnslgzxsmx;
 
     /**
      * 月检修小时（明细）
      */
-    private BigDecimal yjxxsmx;
+    private Double yjxxsmx;
 
     /**
      * 月场内受累检修小时（明细）
      */
-    private BigDecimal ycnsljxxsmx;
+    private Double ycnsljxxsmx;
 
     /**
      * 月待机小时（明细）
      */
-    private BigDecimal ydjxsmx;
+    private Double ydjxsmx;
 
     /**
      * 月缺陷降出力小时（明细）
      */
-    private BigDecimal yqxjclxsmx;
+    private Double yqxjclxsmx;
 
     /**
      * 月手动停机小时（明细）
      */
-    private BigDecimal ysdtjxsmx;
+    private Double ysdtjxsmx;
 
     /**
-     * 月性能小时（明细）
+     * 月并网小时（明细）
      */
-    private BigDecimal yxnxsmx;
+    private Double ybwxsmx;
 
     /**
      * 月限电停机小时（明细）
      */
-    private BigDecimal yxdtjxsmx;
+    private Double yxdtjxsmx;
 
     /**
      * 月限电降出力小时（明细）
      */
-    private BigDecimal yxdjclxsmx;
+    private Double yxdjclxsmx;
 
     /**
      * 月场外受累电网小时（明细）
      */
-    private BigDecimal ycwsldwxsmx;
+    private Double ycwsldwxsmx;
 
     /**
      * 月场外受累天气小时（明细）
      */
-    private BigDecimal ycwsltqxsmx;
+    private Double ycwsltqxsmx;
 
     /**
      * 月离线小时（明细）
      */
-    private BigDecimal ylxxsmx;
+    private Double ylxxsmx;
 
     /**
      * 月通讯中断小时（明细）
      */
-    private BigDecimal ytxzdxsmx;
+    private Double ytxzdxsmx;
 
     /**
      * 月待机小时
      */
-    private BigDecimal ydjxs;
+    private Double ydjxs;
 
     /**
      * 月故障停机小时
      */
-    private BigDecimal ygztjxs;
+    private Double ygztjxs;
 
     /**
      * 月通讯中断小时
      */
-    private BigDecimal ytxzdxs;
+    private Double ytxzdxs;
 
     /**
      * 月维护停机小时
      */
-    private BigDecimal yjxtjxs;
+    private Double yjxtjxs;
 
     /**
      * 月限电小时
      */
-    private BigDecimal yxdxs;
+    private Double yxdxs;
 
     /**
      * 月运行小时
      */
-    private BigDecimal yyxxs;
+    private Double yyxxs;
 
     /**
      * 年故障小时（明细）
      */
-    private BigDecimal ngzxsmx;
+    private Double ngzxsmx;
 
     /**
      * 年场内受累故障小时（明细）
      */
-    private BigDecimal ncnslgzxsmx;
+    private Double ncnslgzxsmx;
 
     /**
      * 年检修小时（明细）
      */
-    private BigDecimal njxxsmx;
+    private Double njxxsmx;
 
     /**
      * 年场内受累检修小时（明细）
      */
-    private BigDecimal ncnsljxxsmx;
+    private Double ncnsljxxsmx;
 
     /**
      * 年待机小时（明细）
      */
-    private BigDecimal ndjxsmx;
+    private Double ndjxsmx;
 
     /**
      * 年缺陷降出力小时（明细）
      */
-    private BigDecimal nqxjclxsmx;
+    private Double nqxjclxsmx;
 
     /**
      * 年手动停机小时（明细）
      */
-    private BigDecimal nsdtjxsmx;
+    private Double nsdtjxsmx;
 
     /**
-     * 年性能小时（明细）
+     * 年并网小时（明细）
      */
-    private BigDecimal nxnxsmx;
+    private Double nbwxsmx;
 
     /**
      * 年限电停机小时（明细）
      */
-    private BigDecimal nxdtjxsmx;
+    private Double nxdtjxsmx;
 
     /**
      * 年限电降出力小时（明细）
      */
-    private BigDecimal nxdjclxsmx;
+    private Double nxdjclxsmx;
 
     /**
      * 年场外受累电网小时（明细）
      */
-    private BigDecimal ncwsldwxsmx;
+    private Double ncwsldwxsmx;
 
     /**
      * 年场外受累天气小时（明细）
      */
-    private BigDecimal ncwsltqxsmx;
+    private Double ncwsltqxsmx;
 
     /**
      * 年离线小时（明细）
      */
-    private BigDecimal nlxxsmx;
+    private Double nlxxsmx;
 
     /**
      * 年通讯中断小时（明细）
      */
-    private BigDecimal ntxzdxsmx;
+    private Double ntxzdxsmx;
 
     /**
      * 年待机小时
      */
-    private BigDecimal ndjxs;
+    private Double ndjxs;
 
     /**
      * 年故障停机小时
      */
-    private BigDecimal ngztjxs;
+    private Double ngztjxs;
 
     /**
      * 年通讯中断小时
      */
-    private BigDecimal ntxzdxs;
+    private Double ntxzdxs;
 
     /**
      * 年维护停机小时
      */
-    private BigDecimal njxtjxs;
+    private Double njxtjxs;
 
     /**
      * 年限电小时
      */
-    private BigDecimal nxdxs;
+    private Double nxdxs;
 
     /**
      * 年运行小时
      */
-    private BigDecimal nyxxs;
+    private Double nyxxs;
+
+    /**
+     * 日受累小时
+     */
+    private Double rslxs;
+
+    /**
+     * 月受累小时
+     */
+    private Double yslxs;
+
+    /**
+     * 年受累小时
+     */
+    private Double nslxs;
 
 
 }

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

@@ -3,6 +3,8 @@ package com.gyee.generation.model.auto;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import java.time.LocalDate;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -33,7 +35,7 @@ public class ProEconEquipmentInfoDay3 extends Model {
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 风场编号
@@ -63,302 +65,317 @@ public class ProEconEquipmentInfoDay3 extends Model {
     /**
      * 日故障次数（明细）
      */
-    private BigDecimal rgzcsmx;
+    private Double rgzcsmx;
 
     /**
      * 日场内受累故障次数（明细）
      */
-    private BigDecimal rcnslgzcsmx;
+    private Double rcnslgzcsmx;
 
     /**
      * 日检修次数（明细）
      */
-    private BigDecimal rjxcsmx;
+    private Double rjxcsmx;
 
     /**
      * 日场内受累检修次数（明细）
      */
-    private BigDecimal rcnsljxcsmx;
+    private Double rcnsljxcsmx;
 
     /**
      * 日待机次数（明细）
      */
-    private BigDecimal rdjcsmx;
+    private Double rdjcsmx;
 
     /**
      * 日缺陷降出力次数（明细）
      */
-    private BigDecimal rqxjclcsmx;
+    private Double rqxjclcsmx;
 
     /**
      * 日手动停机次数（明细）
      */
-    private BigDecimal rsdtjcsmx;
+    private Double rsdtjcsmx;
 
     /**
-     * 日性能次数（明细）
+     * 日并网次数（明细）
      */
-    private BigDecimal rxncsmx;
+    private Double rbwcsmx;
 
     /**
      * 日限电停机次数（明细）
      */
-    private BigDecimal rxdtjcsmx;
+    private Double rxdtjcsmx;
 
     /**
      * 日限电降出力次数（明细）
      */
-    private BigDecimal rxdjclcsmx;
+    private Double rxdjclcsmx;
 
     /**
      * 日场外受累电网次数（明细）
      */
-    private BigDecimal rcwsldwcsmx;
+    private Double rcwsldwcsmx;
 
     /**
      * 日场外受累天气次数（明细）
      */
-    private BigDecimal rcwsltqcsmx;
+    private Double rcwsltqcsmx;
 
     /**
      * 日离线次数（明细）
      */
-    private BigDecimal rlxcsmx;
+    private Double rlxcsmx;
 
     /**
      * 日通讯中断次数（明细）
      */
-    private BigDecimal rtxzdcsmx;
+    private Double rtxzdcsmx;
 
     /**
      * 日待机次数
      */
-    private BigDecimal rdjcs;
+    private Double rdjcs;
 
     /**
      * 日故障停机次数
      */
-    private BigDecimal rgztjcs;
+    private Double rgztjcs;
 
     /**
      * 日通讯中断次数
      */
-    private BigDecimal rtxzdcs;
+    private Double rtxzdcs;
 
     /**
      * 日维护停机次数
      */
-    private BigDecimal rjxtjcs;
+    private Double rjxtjcs;
 
     /**
      * 日限电次数
      */
-    private BigDecimal rxdcs;
+    private Double rxdcs;
 
     /**
      * 日运行次数
      */
-    private BigDecimal ryxcs;
+    private Double ryxcs;
 
     /**
      * 月故障次数（明细）
      */
-    private BigDecimal ygzcsmx;
+    private Double ygzcsmx;
 
     /**
      * 月场内受累故障次数（明细）
      */
-    private BigDecimal ycnslgzcsmx;
+    private Double ycnslgzcsmx;
 
     /**
      * 月检修次数（明细）
      */
-    private BigDecimal yjxcsmx;
+    private Double yjxcsmx;
 
     /**
      * 月场内受累检修次数（明细）
      */
-    private BigDecimal ycnsljxcsmx;
+    private Double ycnsljxcsmx;
 
     /**
      * 月待机次数（明细）
      */
-    private BigDecimal ydjcsmx;
+    private Double ydjcsmx;
 
     /**
      * 月缺陷降出力次数（明细）
      */
-    private BigDecimal yqxjclcsmx;
+    private Double yqxjclcsmx;
 
     /**
      * 月手动停机次数（明细）
      */
-    private BigDecimal ysdtjcsmx;
+    private Double ysdtjcsmx;
 
     /**
-     * 月性能次数（明细）
+     * 月并网次数（明细）
      */
-    private BigDecimal yxncsmx;
+    private Double ybwcsmx;
 
     /**
      * 月限电停机次数（明细）
      */
-    private BigDecimal yxdtjcsmx;
+    private Double yxdtjcsmx;
 
     /**
      * 月限电降出力次数（明细）
      */
-    private BigDecimal yxdjclcsmx;
+    private Double yxdjclcsmx;
 
     /**
      * 月场外受累电网次数（明细）
      */
-    private BigDecimal ycwsldwcsmx;
+    private Double ycwsldwcsmx;
 
     /**
      * 月场外受累天气次数（明细）
      */
-    private BigDecimal ycwsltqcsmx;
+    private Double ycwsltqcsmx;
 
     /**
      * 月离线次数（明细）
      */
-    private BigDecimal ylxcsmx;
+    private Double ylxcsmx;
 
     /**
      * 月通讯中断次数（明细）
      */
-    private BigDecimal ytxzdcsmx;
+    private Double ytxzdcsmx;
 
     /**
      * 月待机次数
      */
-    private BigDecimal ydjcs;
+    private Double ydjcs;
 
     /**
      * 月故障停机次数
      */
-    private BigDecimal ygztjcs;
+    private Double ygztjcs;
 
     /**
      * 月通讯中断次数
      */
-    private BigDecimal ytxzdcs;
+    private Double ytxzdcs;
 
     /**
      * 月维护停机次数
      */
-    private BigDecimal yjxtjcs;
+    private Double yjxtjcs;
 
     /**
      * 月限电次数
      */
-    private BigDecimal yxdcs;
+    private Double yxdcs;
 
     /**
      * 月运行次数
      */
-    private BigDecimal yyxcs;
+    private Double yyxcs;
 
     /**
      * 年故障次数（明细）
      */
-    private BigDecimal ngzcsmx;
+    private Double ngzcsmx;
 
     /**
      * 年场内受累故障次数（明细）
      */
-    private BigDecimal ncnslgzcsmx;
+    private Double ncnslgzcsmx;
 
     /**
      * 年检修次数（明细）
      */
-    private BigDecimal njxcsmx;
+    private Double njxcsmx;
 
     /**
      * 年场内受累检修次数（明细）
      */
-    private BigDecimal ncnsljxcsmx;
+    private Double ncnsljxcsmx;
 
     /**
      * 年待机次数（明细）
      */
-    private BigDecimal ndjcsmx;
+    private Double ndjcsmx;
 
     /**
      * 年缺陷降出力次数（明细）
      */
-    private BigDecimal nqxjclcsmx;
+    private Double nqxjclcsmx;
 
     /**
      * 年手动停机次数（明细）
      */
-    private BigDecimal nsdtjcsmx;
+    private Double nsdtjcsmx;
 
     /**
-     * 年性能次数（明细）
+     * 年并网次数（明细）
      */
-    private BigDecimal nxncsmx;
+    private Double nbwcsmx;
 
     /**
      * 年限电停机次数（明细）
      */
-    private BigDecimal nxdtjcsmx;
+    private Double nxdtjcsmx;
 
     /**
      * 年限电降出力次数（明细）
      */
-    private BigDecimal nxdjclcsmx;
+    private Double nxdjclcsmx;
 
     /**
      * 年场外受累电网次数（明细）
      */
-    private BigDecimal ncwsldwcsmx;
+    private Double ncwsldwcsmx;
 
     /**
      * 年场外受累天气次数（明细）
      */
-    private BigDecimal ncwsltqcsmx;
+    private Double ncwsltqcsmx;
 
     /**
      * 年离线次数（明细）
      */
-    private BigDecimal nlxcsmx;
+    private Double nlxcsmx;
 
     /**
      * 年通讯中断次数（明细）
      */
-    private BigDecimal ntxzdcsmx;
+    private Double ntxzdcsmx;
 
     /**
      * 年待机次数
      */
-    private BigDecimal ndjcs;
+    private Double ndjcs;
 
     /**
      * 年故障停机次数
      */
-    private BigDecimal ngztjcs;
+    private Double ngztjcs;
 
     /**
      * 年通讯中断次数
      */
-    private BigDecimal ntxzdcs;
+    private Double ntxzdcs;
 
     /**
      * 年维护停机次数
      */
-    private BigDecimal njxtjcs;
+    private Double njxtjcs;
 
     /**
      * 年限电次数
      */
-    private BigDecimal nxdcs;
+    private Double nxdcs;
 
     /**
      * 年运行次数
      */
-    private BigDecimal nyxcs;
+    private Double nyxcs;
+
+    /**
+     * 日受累次数
+     */
+    private Double rslcs;
+
+    /**
+     * 月受累次数
+     */
+    private Double yslcs;
+
+    /**
+     * 年受累次数
+     */
+    private Double nslcs;
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -33,7 +33,7 @@ public class ProEconEquipmentInfoDay4 extends Model {
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 风场编号
@@ -63,347 +63,347 @@ public class ProEconEquipmentInfoDay4 extends Model {
     /**
      * 日静风时长
      */
-    private BigDecimal rjfsc;
+    private Double rjfsc;
 
     /**
      * 日有效风时数
      */
-    private BigDecimal ryxfss;
+    private Double ryxfss;
 
     /**
      * 日小风切入风速
      */
-    private BigDecimal rxfqrfs;
+    private Double rxfqrfs;
 
     /**
      * 日大风切入风速
      */
-    private BigDecimal rdfqrfs;
+    private Double rdfqrfs;
 
     /**
      * 日小风切出风速
      */
-    private BigDecimal rxfqcfs;
+    private Double rxfqcfs;
 
     /**
      * 日大风切出风速
      */
-    private BigDecimal rdfqcfs;
+    private Double rdfqcfs;
 
     /**
      * 日额定风速
      */
-    private BigDecimal redfs;
+    private Double redfs;
 
     /**
      * 日功率一致性系数
      */
-    private BigDecimal rglyzxxs;
+    private Double rglyzxxs;
 
     /**
      * 日拟合优度
      */
-    private BigDecimal rnhyd;
+    private Double rnhyd;
 
     /**
      * 日曲线偏差率保证
      */
-    private BigDecimal rqxpcbbz;
+    private Double rqxpcbbz;
 
     /**
      * 日曲线偏差率同期
      */
-    private BigDecimal rqxpcbtq;
+    private Double rqxpcbtq;
 
     /**
      * 日曲线偏差率环比
      */
-    private BigDecimal rqxpcbhb;
+    private Double rqxpcbhb;
 
     /**
      * 日曲线偏差率标杆
      */
-    private BigDecimal rqxpcbbg;
+    private Double rqxpcbbg;
 
     /**
      * 日3-5米曲线偏差率
      */
-    private BigDecimal r35mqxpcl;
+    private Double r35mqxpcl;
 
     /**
      * 日5-11米曲线偏差率
      */
-    private BigDecimal r511mqxpcl;
+    private Double r511mqxpcl;
 
     /**
      * 日11米以上曲线偏差率
      */
-    private BigDecimal r11mycqxpcl;
+    private Double r11mycqxpcl;
 
     /**
      * 日对风偏差率（-50 +50之间）
      */
-    private BigDecimal rdfpcl;
+    private Double rdfpcl;
 
     /**
      * 日MTBF
      */
-    private BigDecimal rmtbf;
+    private Double rmtbf;
 
     /**
      * 日MTTR
      */
-    private BigDecimal rmttr;
+    private Double rmttr;
 
     /**
      * 日MTTF
      */
-    private BigDecimal rmttf;
+    private Double rmttf;
 
     /**
      * 日复位及时率
      */
-    private BigDecimal rfwjsl;
+    private Double rfwjsl;
 
     /**
      * 日状态转换及时率
      */
-    private BigDecimal rztzhjsl;
+    private Double rztzhjsl;
 
     /**
      * 日故障消缺及时率
      */
-    private BigDecimal rgzxqjsl;
+    private Double rgzxqjsl;
 
     /**
      * 月静风时长
      */
-    private BigDecimal yjfsc;
+    private Double yjfsc;
 
     /**
      * 月有效风时数
      */
-    private BigDecimal yyxfss;
+    private Double yyxfss;
 
     /**
      * 月小风切入风速
      */
-    private BigDecimal yxfqrfs;
+    private Double yxfqrfs;
 
     /**
      * 月大风切入风速
      */
-    private BigDecimal ydfqrfs;
+    private Double ydfqrfs;
 
     /**
      * 月小风切出风速
      */
-    private BigDecimal yxfqcfs;
+    private Double yxfqcfs;
 
     /**
      * 月大风切出风速
      */
-    private BigDecimal ydfqcfs;
+    private Double ydfqcfs;
 
     /**
      * 月额定风速
      */
-    private BigDecimal yedfs;
+    private Double yedfs;
 
     /**
      * 月功率一致性系数
      */
-    private BigDecimal yglyzxxs;
+    private Double yglyzxxs;
 
     /**
      * 月拟合优度
      */
-    private BigDecimal ynhyd;
+    private Double ynhyd;
 
     /**
      * 月曲线偏差率保证
      */
-    private BigDecimal yqxpcbbz;
+    private Double yqxpcbbz;
 
     /**
      * 月曲线偏差率同期
      */
-    private BigDecimal yqxpcbtq;
+    private Double yqxpcbtq;
 
     /**
      * 月曲线偏差率环比
      */
-    private BigDecimal yqxpcbhb;
+    private Double yqxpcbhb;
 
     /**
      * 月曲线偏差率标杆
      */
-    private BigDecimal yqxpcbbg;
+    private Double yqxpcbbg;
 
     /**
      * 月3-5米曲线偏差率
      */
-    private BigDecimal y35mqxpcl;
+    private Double y35mqxpcl;
 
     /**
      * 月5-11米曲线偏差率
      */
-    private BigDecimal y511mqxpcl;
+    private Double y511mqxpcl;
 
     /**
      * 月11米以上曲线偏差率
      */
-    private BigDecimal y11mycqxpcl;
+    private Double y11mycqxpcl;
 
     /**
      * 月对风偏差率（-50 +50之间）
      */
-    private BigDecimal ydfpcl;
+    private Double ydfpcl;
 
     /**
      * 月MTBF
      */
-    private BigDecimal ymtbf;
+    private Double ymtbf;
 
     /**
      * 月MTTR
      */
-    private BigDecimal ymttr;
+    private Double ymttr;
 
     /**
      * 月MTTF
      */
-    private BigDecimal ymttf;
+    private Double ymttf;
 
     /**
      * 月复位及时率
      */
-    private BigDecimal yfwjsl;
+    private Double yfwjsl;
 
     /**
      * 月状态转换及时率
      */
-    private BigDecimal yztzhjsl;
+    private Double yztzhjsl;
 
     /**
      * 月故障消缺及时率
      */
-    private BigDecimal ygzxqjsl;
+    private Double ygzxqjsl;
 
     /**
      * 年静风时长
      */
-    private BigDecimal njfsc;
+    private Double njfsc;
 
     /**
      * 年有效风时数
      */
-    private BigDecimal nyxfss;
+    private Double nyxfss;
 
     /**
      * 年小风切入风速
      */
-    private BigDecimal nxfqrfs;
+    private Double nxfqrfs;
 
     /**
      * 年大风切入风速
      */
-    private BigDecimal ndfqrfs;
+    private Double ndfqrfs;
 
     /**
      * 年小风切出风速
      */
-    private BigDecimal nxfqcfs;
+    private Double nxfqcfs;
 
     /**
      * 年大风切出风速
      */
-    private BigDecimal ndfqcfs;
+    private Double ndfqcfs;
 
     /**
      * 年额定风速
      */
-    private BigDecimal nedfs;
+    private Double nedfs;
 
     /**
      * 年功率一致性系数
      */
-    private BigDecimal nglyzxxs;
+    private Double nglyzxxs;
 
     /**
      * 年拟合优度
      */
-    private BigDecimal nnhyd;
+    private Double nnhyd;
 
     /**
      * 年曲线偏差率保证
      */
-    private BigDecimal nqxpcbbz;
+    private Double nqxpcbbz;
 
     /**
      * 年曲线偏差率同期
      */
-    private BigDecimal nqxpcbtq;
+    private Double nqxpcbtq;
 
     /**
      * 年曲线偏差率环比
      */
-    private BigDecimal nqxpcbhb;
+    private Double nqxpcbhb;
 
     /**
      * 年曲线偏差率标杆
      */
-    private BigDecimal nqxpcbbg;
+    private Double nqxpcbbg;
 
     /**
      * 年3-5米曲线偏差率
      */
-    private BigDecimal n35mqxpcl;
+    private Double n35mqxpcl;
 
     /**
      * 年5-11米曲线偏差率
      */
-    private BigDecimal n511mqxpcl;
+    private Double n511mqxpcl;
 
     /**
      * 年11米以上曲线偏差率
      */
-    private BigDecimal n11mycqxpcl;
+    private Double n11mycqxpcl;
 
     /**
      * 年对风偏差率（-50 +50之间）
      */
-    private BigDecimal ndfpcl;
+    private Double ndfpcl;
 
     /**
      * 年MTBF
      */
-    private BigDecimal nmtbf;
+    private Double nmtbf;
 
     /**
      * 年MTTR
      */
-    private BigDecimal nmttr;
+    private Double nmttr;
 
     /**
      * 年MTTF
      */
-    private BigDecimal nmttf;
+    private Double nmttf;
 
     /**
      * 年复位及时率
      */
-    private BigDecimal nfwjsl;
+    private Double nfwjsl;
 
     /**
      * 年状态转换及时率
      */
-    private BigDecimal nztzhjsl;
+    private Double nztzhjsl;
 
     /**
      * 年故障消缺及时率
      */
-    private BigDecimal ngzxqjsl;
+    private Double ngzxqjsl;
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -33,7 +33,7 @@ public class ProEconEquipmentInfoDay5 extends Model {
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 风场编号
@@ -63,112 +63,112 @@ public class ProEconEquipmentInfoDay5 extends Model {
     /**
      * 小于3米5分钟转换及时次数
      */
-    private BigDecimal timerate1;
+    private Double timerate1;
 
     /**
      * 小于3米10分钟转换及时次数
      */
-    private BigDecimal timerate2;
+    private Double timerate2;
 
     /**
      * 小于3米15分钟转换及时次数
      */
-    private BigDecimal timerate3;
+    private Double timerate3;
 
     /**
      * 小于3米20分钟转换及时次数
      */
-    private BigDecimal timerate4;
+    private Double timerate4;
 
     /**
      * 大于3米5分钟转换及时次数
      */
-    private BigDecimal timerate5;
+    private Double timerate5;
 
     /**
      * 大于3米10分钟转换及时次数
      */
-    private BigDecimal timerate6;
+    private Double timerate6;
 
     /**
      * 大于3米15分钟转换及时次数
      */
-    private BigDecimal timerate7;
+    private Double timerate7;
 
     /**
      * 大于3米20分钟转换及时次数
      */
-    private BigDecimal timerate8;
+    private Double timerate8;
 
     /**
      * 大于4米5分钟转换及时次数
      */
-    private BigDecimal timerate9;
+    private Double timerate9;
 
     /**
      * 大于4米10分钟转换及时次数
      */
-    private BigDecimal timerate10;
+    private Double timerate10;
 
     /**
      * 大于4米15分钟转换及时次数
      */
-    private BigDecimal timerate11;
+    private Double timerate11;
 
     /**
      * 大于4米20分钟转换及时次数
      */
-    private BigDecimal timerate12;
+    private Double timerate12;
 
     /**
      * 小于3米状态转换总次数
      */
-    private BigDecimal timerate13;
+    private Double timerate13;
 
     /**
      * 大于3米状态转换总次数
      */
-    private BigDecimal timerate14;
+    private Double timerate14;
 
     /**
      * 大于4米状态转换总次数
      */
-    private BigDecimal timerate15;
+    private Double timerate15;
 
     /**
      * 5分钟复位及时次数
      */
-    private BigDecimal timerate16;
+    private Double timerate16;
 
     /**
      * 10分钟复位及时次数
      */
-    private BigDecimal timerate17;
+    private Double timerate17;
 
     /**
      * 15分钟复位及时次数
      */
-    private BigDecimal timerate18;
+    private Double timerate18;
 
     /**
      * 20分钟复位及时次数
      */
-    private BigDecimal timerate19;
+    private Double timerate19;
 
     /**
      * 总复位次数
      */
-    private BigDecimal timerate20;
+    private Double timerate20;
 
     /**
      * 故障消缺及时次数
      */
-    private BigDecimal timerate21;
+    private Double timerate21;
 
     /**
      * 故障消缺总次数
      */
-    private BigDecimal timerate22;
+    private Double timerate22;
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -33,7 +33,7 @@ public class ProEconEquipmentInfoDay6 extends Model {
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 风场编号
@@ -63,47 +63,47 @@ public class ProEconEquipmentInfoDay6 extends Model {
     /**
      * 日系统效率(PR)
      */
-    private BigDecimal rxtxl;
+    private Double rxtxl;
 
     /**
      * 日离散率
      */
-    private BigDecimal rlsl;
+    private Double rlsl;
 
     /**
      * 日逆变器转换效率
      */
-    private BigDecimal rnbqzhxl;
+    private Double rnbqzhxl;
 
     /**
      * 月系统效率(PR)
      */
-    private BigDecimal yxtxl;
+    private Double yxtxl;
 
     /**
      * 月离散率
      */
-    private BigDecimal ylsl;
+    private Double ylsl;
 
     /**
      * 月逆变器转换效率
      */
-    private BigDecimal ynbqzhxl;
+    private Double ynbqzhxl;
 
     /**
      * 年系统效率(PR)
      */
-    private BigDecimal nxtxl;
+    private Double nxtxl;
 
     /**
      * 年离散率
      */
-    private BigDecimal nlsl;
+    private Double nlsl;
 
     /**
      * 年逆变器转换效率
      */
-    private BigDecimal nnbqzhxl;
+    private Double nnbqzhxl;
 
 
 }

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -1,8 +1,10 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,12 +30,12 @@ public class ProEconPowerstationInfoDay1 extends Model {
     /**
      * 外键编号
      */
-    private String foreignkeyid;
+    private String foreignKeyId;
 
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 类型
@@ -66,364 +68,369 @@ public class ProEconPowerstationInfoDay1 extends Model {
     private String regionId;
 
     /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
      * 日最大风速
      */
-    private BigDecimal rzdfs;
+    private Double rzdfs;
 
     /**
      * 日最小风速
      */
-    private BigDecimal rzxfs;
+    private Double rzxfs;
 
     /**
      * 日最大功率
      */
-    private BigDecimal rzdgl;
+    private Double rzdgl;
 
     /**
      * 日最小功率
      */
-    private BigDecimal rzxgl;
+    private Double rzxgl;
 
     /**
      * 日平均功率
      */
-    private BigDecimal rpjgl;
+    private Double rpjgl;
 
     /**
      * 日平均风速
      */
-    private BigDecimal rpjfs;
+    private Double rpjfs;
 
     /**
      * 日发电量
      */
-    private BigDecimal rfdl;
+    private Double rfdl;
 
     /**
      * 日可用电量
      */
-    private BigDecimal rkydl;
+    private Double rkydl;
 
     /**
      * 日理论发电量
      */
-    private BigDecimal rllfdl;
+    private Double rllfdl;
 
     /**
      * 日故障损失电量
      */
-    private BigDecimal rgzssdl;
+    private Double rgzssdl;
 
     /**
      * 日场内受累故障损失电量
      */
-    private BigDecimal rcnslgzssdl;
+    private Double rcnslgzssdl;
 
     /**
      * 日检修损失电量
      */
-    private BigDecimal rjxssdl;
+    private Double rjxssdl;
 
     /**
      * 日场内受累检修损失电量
      */
-    private BigDecimal rcnsljxssdl;
+    private Double rcnsljxssdl;
 
     /**
      * 日待机损失电量
      */
-    private BigDecimal rdjssdl;
+    private Double rdjssdl;
 
     /**
      * 日缺陷降出力损失电量
      */
-    private BigDecimal rqxjclssdl;
+    private Double rqxjclssdl;
 
     /**
      * 日手动停机损失电量
      */
-    private BigDecimal rsdtjssdl;
+    private Double rsdtjssdl;
 
     /**
      * 日性能损失电量
      */
-    private BigDecimal rxnssdl;
+    private Double rxnssdl;
 
     /**
      * 日限电停机损失电量
      */
-    private BigDecimal rxdtjssdl;
+    private Double rxdtjssdl;
 
     /**
      * 日限电降出力损失电量
      */
-    private BigDecimal rxdjclssdl;
+    private Double rxdjclssdl;
 
     /**
      * 日场外受累电网损失电量
      */
-    private BigDecimal rcwsldwssdl;
+    private Double rcwsldwssdl;
 
     /**
      * 日场外受累天气损失电量
      */
-    private BigDecimal rcwsltqssdl;
+    private Double rcwsltqssdl;
 
     /**
      * 日增发电量
      */
-    private BigDecimal rzfdl;
+    private Double rzfdl;
 
     /**
      * 日欠发电量
      */
-    private BigDecimal rqfdl;
+    private Double rqfdl;
 
     /**
      * 月最大风速
      */
-    private BigDecimal yzdfs;
+    private Double yzdfs;
 
     /**
      * 月最小风速
      */
-    private BigDecimal yzxfs;
+    private Double yzxfs;
 
     /**
      * 月最大功率
      */
-    private BigDecimal yzdgl;
+    private Double yzdgl;
 
     /**
      * 月最小功率
      */
-    private BigDecimal yzxgl;
+    private Double yzxgl;
 
     /**
      * 月平均功率
      */
-    private BigDecimal ypjgl;
+    private Double ypjgl;
 
     /**
      * 月平均风速
      */
-    private BigDecimal ypjfs;
+    private Double ypjfs;
 
     /**
      * 月发电量
      */
-    private BigDecimal yfdl;
+    private Double yfdl;
 
     /**
      * 月可用电量
      */
-    private BigDecimal ykydl;
+    private Double ykydl;
 
     /**
      * 月理论发电量
      */
-    private BigDecimal yllfdl;
+    private Double yllfdl;
 
     /**
      * 月故障损失电量
      */
-    private BigDecimal ygzssdl;
+    private Double ygzssdl;
 
     /**
      * 月场内受累故障损失电量
      */
-    private BigDecimal ycnslgzssdl;
+    private Double ycnslgzssdl;
 
     /**
      * 月检修损失电量
      */
-    private BigDecimal yjxssdl;
+    private Double yjxssdl;
 
     /**
      * 月场内受累检修损失电量
      */
-    private BigDecimal ycnsljxssdl;
+    private Double ycnsljxssdl;
 
     /**
      * 月待机损失电量
      */
-    private BigDecimal ydjssdl;
+    private Double ydjssdl;
 
     /**
      * 月缺陷降出力损失电量
      */
-    private BigDecimal yqxjclssdl;
+    private Double yqxjclssdl;
 
     /**
      * 月手动停机损失电量
      */
-    private BigDecimal ysdtjssdl;
+    private Double ysdtjssdl;
 
     /**
      * 月性能损失电量
      */
-    private BigDecimal yxnssdl;
+    private Double yxnssdl;
 
     /**
      * 月限电停机损失电量
      */
-    private BigDecimal yxdtjssdl;
+    private Double yxdtjssdl;
 
     /**
      * 月限电降出力损失电量
      */
-    private BigDecimal yxdjclssdl;
+    private Double yxdjclssdl;
 
     /**
      * 月场外受累电网损失电量
      */
-    private BigDecimal ycwsldwssdl;
+    private Double ycwsldwssdl;
 
     /**
      * 月场外受累天气损失电量
      */
-    private BigDecimal ycwsltqssdl;
+    private Double ycwsltqssdl;
 
     /**
      * 月增发电量
      */
-    private BigDecimal yzfdl;
+    private Double yzfdl;
 
     /**
      * 月欠发电量
      */
-    private BigDecimal yqfdl;
+    private Double yqfdl;
 
     /**
      * 年最大风速
      */
-    private BigDecimal nzdfs;
+    private Double nzdfs;
 
     /**
      * 年最小风速
      */
-    private BigDecimal nzxfs;
+    private Double nzxfs;
 
     /**
      * 年最大功率
      */
-    private BigDecimal nzdgl;
+    private Double nzdgl;
 
     /**
      * 年最小功率
      */
-    private BigDecimal nzxgl;
+    private Double nzxgl;
 
     /**
      * 年平均功率
      */
-    private BigDecimal npjgl;
+    private Double npjgl;
 
     /**
      * 年平均风速
      */
-    private BigDecimal npjfs;
+    private Double npjfs;
 
     /**
      * 年发电量
      */
-    private BigDecimal nfdl;
+    private Double nfdl;
 
     /**
      * 年可用电量
      */
-    private BigDecimal nkydl;
+    private Double nkydl;
 
     /**
      * 年理论发电量
      */
-    private BigDecimal nllfdl;
+    private Double nllfdl;
 
     /**
      * 年故障损失电量
      */
-    private BigDecimal ngzssdl;
+    private Double ngzssdl;
 
     /**
      * 年场内受累故障损失电量
      */
-    private BigDecimal ncnslgzssdl;
+    private Double ncnslgzssdl;
 
     /**
      * 年检修损失电量
      */
-    private BigDecimal njxssdl;
+    private Double njxssdl;
 
     /**
      * 年场内受累检修损失电量
      */
-    private BigDecimal ncnsljxssdl;
+    private Double ncnsljxssdl;
 
     /**
      * 年待机损失电量
      */
-    private BigDecimal ndjssdl;
+    private Double ndjssdl;
 
     /**
      * 年缺陷降出力损失电量
      */
-    private BigDecimal nqxjclssdl;
+    private Double nqxjclssdl;
 
     /**
      * 年手动停机损失电量
      */
-    private BigDecimal nsdtjssdl;
+    private Double nsdtjssdl;
 
     /**
      * 年性能损失电量
      */
-    private BigDecimal nxnssdl;
+    private Double nxnssdl;
 
     /**
      * 年限电停机损失电量
      */
-    private BigDecimal nxdtjssdl;
+    private Double nxdtjssdl;
 
     /**
      * 年限电降出力损失电量
      */
-    private BigDecimal nxdjclssdl;
+    private Double nxdjclssdl;
 
     /**
      * 年场外受累电网损失电量
      */
-    private BigDecimal ncwsldwssdl;
+    private Double ncwsldwssdl;
 
     /**
      * 年场外受累天气损失电量
      */
-    private BigDecimal ncwsltqssdl;
+    private Double ncwsltqssdl;
 
     /**
      * 年增发电量
      */
-    private BigDecimal nzfdl;
+    private Double nzfdl;
 
     /**
      * 年欠发电量
      */
-    private BigDecimal nqfdl;
+    private Double nqfdl;
 
     /**
      * 日自耗电
      */
-    private BigDecimal rzhd;
+    private Double rzhd;
 
     /**
      * 月自耗电
      */
-    private BigDecimal yzhd;
+    private Double yzhd;
 
     /**
      * 年自耗电
      */
-    private BigDecimal nzhd;
+    private Double nzhd;
 
 
 }

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

@@ -2,7 +2,9 @@ package com.gyee.generation.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,12 +30,12 @@ public class ProEconPowerstationInfoDay2 extends Model {
     /**
      * 外键编号
      */
-    private String foreignkeyid;
+    private String foreignKeyId;
 
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 类型
@@ -66,304 +68,324 @@ public class ProEconPowerstationInfoDay2 extends Model {
     private String regionId;
 
     /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
      * 日合计故障小时（明细）
      */
-    private BigDecimal rhjgzxsmx;
+    private Double rhjgzxsmx;
 
     /**
      * 日合计场内受累故障小时（明细）
      */
-    private BigDecimal rhjcnslgzxsmx;
+    private Double rhjcnslgzxsmx;
 
     /**
      * 日合计检修小时（明细）
      */
-    private BigDecimal rhjjxxsmx;
+    private Double rhjjxxsmx;
 
     /**
      * 日合计场内受累检修小时（明细）
      */
-    private BigDecimal rhjcnsljxxsmx;
+    private Double rhjcnsljxxsmx;
 
     /**
      * 日合计待机小时（明细）
      */
-    private BigDecimal rhjdjxsmx;
+    private Double rhjdjxsmx;
 
     /**
      * 日合计缺陷降出力小时（明细）
      */
-    private BigDecimal rhjqxjclxsmx;
+    private Double rhjqxjclxsmx;
 
     /**
      * 日合计手动停机小时（明细）
      */
-    private BigDecimal rhjsdtjxsmx;
+    private Double rhjsdtjxsmx;
 
     /**
-     * 日合计性能小时（明细）
+     * 日合计并网小时（明细）
      */
-    private BigDecimal rhjxnxsmx;
+    private Double rhjbwxsmx;
 
     /**
      * 日合计限电停机小时（明细）
      */
-    private BigDecimal rhjxdtjxsmx;
+    private Double rhjxdtjxsmx;
 
     /**
      * 日合计限电降出力小时（明细）
      */
-    private BigDecimal rhjxdjclxsmx;
+    private Double rhjxdjclxsmx;
 
     /**
      * 日合计场外受累电网小时（明细）
      */
-    private BigDecimal rhjcwsldwxsmx;
+    private Double rhjcwsldwxsmx;
 
     /**
      * 日合计场外受累天气小时（明细）
      */
-    private BigDecimal rhjcwsltqxsmx;
+    private Double rhjcwsltqxsmx;
 
     /**
      * 日合计离线小时（明细）
      */
-    private BigDecimal rhjlxxsmx;
+    private Double rhjlxxsmx;
 
     /**
      * 日合计通讯中断小时（明细）
      */
-    private BigDecimal rhjtxxsmx;
+    private Double rhjtxzdxsmx;
 
     /**
      * 日合计待机小时
      */
-    private BigDecimal rhjdjxs;
+    private Double rhjdjxs;
 
     /**
      * 日合计故障停机小时
      */
-    private BigDecimal rhjgztjxs;
+    private Double rhjgztjxs;
 
     /**
      * 日合计通讯中断小时
      */
-    private BigDecimal rhjtxzdxs;
+    private Double rhjtxzdxs;
 
     /**
      * 日合计维护停机小时
      */
-    private BigDecimal rhjjxtjxs;
+    private Double rhjjxtjxs;
 
     /**
      * 日合计限电小时
      */
-    private BigDecimal rhjxdxs;
+    private Double rhjxdxs;
 
     /**
      * 日合计运行小时
      */
-    private BigDecimal rhjyxxs;
+    private Double rhjyxxs;
 
     /**
      * 月合计故障小时（明细）
      */
-    private BigDecimal yhjgzxsmx;
+    private Double yhjgzxsmx;
 
     /**
      * 月合计场内受累故障小时（明细）
      */
-    private BigDecimal yhjcnslgzxsmx;
+    private Double yhjcnslgzxsmx;
 
     /**
      * 月合计检修小时（明细）
      */
-    private BigDecimal yhjjxxsmx;
+    private Double yhjjxxsmx;
 
     /**
      * 月合计场内受累检修小时（明细）
      */
-    private BigDecimal yhjcnsljxxsmx;
+    private Double yhjcnsljxxsmx;
 
     /**
      * 月合计待机小时（明细）
      */
-    private BigDecimal yhjdjxsmx;
+    private Double yhjdjxsmx;
 
     /**
      * 月合计缺陷降出力小时（明细）
      */
-    private BigDecimal yhjqxjclxsmx;
+    private Double yhjqxjclxsmx;
 
     /**
      * 月合计手动停机小时（明细）
      */
-    private BigDecimal yhjsdtjxsmx;
+    private Double yhjsdtjxsmx;
 
     /**
-     * 月合计性能小时（明细）
+     * 月合计并网小时（明细）
      */
-    private BigDecimal yhjxnxsmx;
+    private Double yhjbwxsmx;
 
     /**
      * 月合计限电停机小时（明细）
      */
-    private BigDecimal yhjxdtjxsmx;
+    private Double yhjxdtjxsmx;
 
     /**
      * 月合计限电降出力小时（明细）
      */
-    private BigDecimal yhjxdjclxsmx;
+    private Double yhjxdjclxsmx;
 
     /**
      * 月合计场外受累电网小时（明细）
      */
-    private BigDecimal yhjcwsldwxsmx;
+    private Double yhjcwsldwxsmx;
 
     /**
      * 月合计场外受累天气小时（明细）
      */
-    private BigDecimal yhjcwsltqxsmx;
+    private Double yhjcwsltqxsmx;
 
     /**
      * 月合计离线小时（明细）
      */
-    private BigDecimal yhjlxxsmx;
+    private Double yhjlxxsmx;
 
     /**
      * 月合计通讯中断小时（明细）
      */
-    private BigDecimal yhjtxxsmx;
+    private Double yhjtxzdxsmx;
 
     /**
      * 月合计待机小时
      */
-    private BigDecimal yhjdjxs;
+    private Double yhjdjxs;
 
     /**
      * 月合计故障停机小时
      */
-    private BigDecimal yhjgztjxs;
+    private Double yhjgztjxs;
 
     /**
      * 月合计通讯中断小时
      */
-    private BigDecimal yhjtxzdxs;
+    private Double yhjtxzdxs;
 
     /**
      * 月合计维护停机小时
      */
-    private BigDecimal yhjjxtjxs;
+    private Double yhjjxtjxs;
 
     /**
      * 月合计限电小时
      */
-    private BigDecimal yhjxdxs;
+    private Double yhjxdxs;
 
     /**
      * 月合计运行小时
      */
-    private BigDecimal yhjyxxs;
+    private Double yhjyxxs;
 
     /**
      * 年合计故障小时（明细）
      */
-    private BigDecimal nhjgzxsmx;
+    private Double nhjgzxsmx;
 
     /**
      * 年合计场内受累故障小时（明细）
      */
-    private BigDecimal nhjcnslgzxsmx;
+    private Double nhjcnslgzxsmx;
 
     /**
      * 年合计检修小时（明细）
      */
-    private BigDecimal nhjjxxsmx;
+    private Double nhjjxxsmx;
 
     /**
      * 年合计场内受累检修小时（明细）
      */
-    private BigDecimal nhjcnsljxxsmx;
+    private Double nhjcnsljxxsmx;
 
     /**
      * 年合计待机小时（明细）
      */
-    private BigDecimal nhjdjxsmx;
+    private Double nhjdjxsmx;
 
     /**
      * 年合计缺陷降出力小时（明细）
      */
-    private BigDecimal nhjqxjclxsmx;
+    private Double nhjqxjclxsmx;
 
     /**
      * 年合计手动停机小时（明细）
      */
-    private BigDecimal nhjsdtjxsmx;
+    private Double nhjsdtjxsmx;
 
     /**
-     * 年合计性能小时（明细）
+     * 年合计并网小时（明细）
      */
-    private BigDecimal nhjxnxsmx;
+    private Double nhjbwxsmx;
 
     /**
      * 年合计限电停机小时（明细）
      */
-    private BigDecimal nhjxdtjxsmx;
+    private Double nhjxdtjxsmx;
 
     /**
      * 年合计限电降出力小时（明细）
      */
-    private BigDecimal nhjxdjclxsmx;
+    private Double nhjxdjclxsmx;
 
     /**
      * 年合计场外受累电网小时（明细）
      */
-    private BigDecimal nhjcwsldwxsmx;
+    private Double nhjcwsldwxsmx;
 
     /**
      * 年合计场外受累天气小时（明细）
      */
-    private BigDecimal nhjcwsltqxsmx;
+    private Double nhjcwsltqxsmx;
 
     /**
      * 年合计离线小时（明细）
      */
-    private BigDecimal nhjlxxsmx;
+    private Double nhjlxxsmx;
 
     /**
      * 年合计通讯中断小时（明细）
      */
-    private BigDecimal nhjtxxsmx;
+    private Double nhjtxzdxsmx;
 
     /**
      * 年合计待机小时
      */
-    private BigDecimal nhjdjxs;
+    private Double nhjdjxs;
 
     /**
      * 年合计故障停机小时
      */
-    private BigDecimal nhjgztjxs;
+    private Double nhjgztjxs;
 
     /**
      * 年合计通讯中断小时
      */
-    private BigDecimal nhjtxzdxs;
+    private Double nhjtxzdxs;
 
     /**
      * 年合计维护停机小时
      */
-    private BigDecimal nhjjxtjxs;
+    private Double nhjjxtjxs;
 
     /**
      * 年合计限电小时
      */
-    private BigDecimal nhjxdxs;
+    private Double nhjxdxs;
 
     /**
      * 年合计运行小时
      */
-    private BigDecimal nhjyxxs;
+    private Double nhjyxxs;
+
+    /**
+     * 年合计受累小时
+     */
+    private Double nhjslxs;
+
+    /**
+     * 月合计受累小时
+     */
+    private Double yhjslxs;
+
+    /**
+     * 日合计受累小时
+     */
+    private Double rhjslxs;
 
 
 }

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

@@ -2,7 +2,9 @@ package com.gyee.generation.model.auto;
 
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+
+import java.util.Date;
+
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -12,7 +14,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -28,12 +30,12 @@ public class ProEconPowerstationInfoDay3 extends Model {
     /**
      * 外键编号
      */
-    private String foreignkeyid;
+    private String foreignKeyId;
 
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 类型
@@ -66,304 +68,324 @@ public class ProEconPowerstationInfoDay3 extends Model {
     private String regionId;
 
     /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
      * 日合计故障次数（明细）
      */
-    private BigDecimal rhjgzcsmx;
+    private Double rhjgzcsmx;
 
     /**
      * 日合计场内受累故障次数（明细）
      */
-    private BigDecimal rhjcnslgzcsmx;
+    private Double rhjcnslgzcsmx;
 
     /**
      * 日合计检修次数（明细）
      */
-    private BigDecimal rhjjxcsmx;
+    private Double rhjjxcsmx;
 
     /**
      * 日合计场内受累检修次数（明细）
      */
-    private BigDecimal rhjcnsljxcsmx;
+    private Double rhjcnsljxcsmx;
 
     /**
      * 日合计待机次数（明细）
      */
-    private BigDecimal rhjdjcsmx;
+    private Double rhjdjcsmx;
 
     /**
      * 日合计缺陷降出力次数（明细）
      */
-    private BigDecimal rhjqxjclcsmx;
+    private Double rhjqxjclcsmx;
 
     /**
      * 日合计手动停机次数（明细）
      */
-    private BigDecimal rhjsdtjcsmx;
+    private Double rhjsdtjcsmx;
 
     /**
-     * 日合计性能次数（明细）
+     * 日合计并网次数（明细）
      */
-    private BigDecimal rhjxncsmx;
+    private Double rhjbwcsmx;
 
     /**
      * 日合计限电停机次数（明细）
      */
-    private BigDecimal rhjxdtjcsmx;
+    private Double rhjxdtjcsmx;
 
     /**
      * 日合计限电降出力次数（明细）
      */
-    private BigDecimal rhjxdjclcsmx;
+    private Double rhjxdjclcsmx;
 
     /**
      * 日合计场外受累电网次数（明细）
      */
-    private BigDecimal rhjcwsldwcsmx;
+    private Double rhjcwsldwcsmx;
 
     /**
      * 日合计场外受累天气次数（明细）
      */
-    private BigDecimal rhjcwsltqcsmx;
+    private Double rhjcwsltqcsmx;
 
     /**
      * 日合计离线次数（明细）
      */
-    private BigDecimal rhjlxcsmx;
+    private Double rhjlxcsmx;
 
     /**
      * 日合计通讯中断次数（明细）
      */
-    private BigDecimal rhjtxzdcsmx;
+    private Double rhjtxzdcsmx;
 
     /**
      * 日合计待机次数
      */
-    private BigDecimal rhjdjcs;
+    private Double rhjdjcs;
 
     /**
      * 日合计故障停机次数
      */
-    private BigDecimal rhjgztjcs;
+    private Double rhjgztjcs;
 
     /**
      * 日合计通讯中断次数
      */
-    private BigDecimal rhjtxzccs;
+    private Double rhjtxzdcs;
 
     /**
-     * 日合计维护停机次数
+     * 日合计检修停机次数
      */
-    private BigDecimal rhjwhtjcs;
+    private Double rhjjxtjcs;
 
     /**
      * 日合计限电次数
      */
-    private BigDecimal rhjxdcs;
+    private Double rhjxdcs;
 
     /**
      * 日合计运行次数
      */
-    private BigDecimal rhjyxcs;
+    private Double rhjyxcs;
 
     /**
      * 月合计故障次数（明细）
      */
-    private BigDecimal yhjgzcsmx;
+    private Double yhjgzcsmx;
 
     /**
      * 月合计场内受累故障次数（明细）
      */
-    private BigDecimal yhjcnslgzcsmx;
+    private Double yhjcnslgzcsmx;
 
     /**
      * 月合计检修次数（明细）
      */
-    private BigDecimal yhjjxcsmx;
+    private Double yhjjxcsmx;
 
     /**
      * 月合计场内受累检修次数（明细）
      */
-    private BigDecimal yhjcnsljxcsmx;
+    private Double yhjcnsljxcsmx;
 
     /**
      * 月合计待机次数（明细）
      */
-    private BigDecimal yhjdjcsmx;
+    private Double yhjdjcsmx;
 
     /**
      * 月合计缺陷降出力次数（明细）
      */
-    private BigDecimal yhjqxjclcsmx;
+    private Double yhjqxjclcsmx;
 
     /**
      * 月合计手动停机次数（明细）
      */
-    private BigDecimal yhjsdtjcsmx;
+    private Double yhjsdtjcsmx;
 
     /**
-     * 月合计性能次数（明细）
+     * 月合计并网次数（明细）
      */
-    private BigDecimal yhjxncsmx;
+    private Double yhjbwcsmx;
 
     /**
      * 月合计限电停机次数（明细）
      */
-    private BigDecimal yhjxdtjcsmx;
+    private Double yhjxdtjcsmx;
 
     /**
      * 月合计限电降出力次数（明细）
      */
-    private BigDecimal yhjxdjclcsmx;
+    private Double yhjxdjclcsmx;
 
     /**
      * 月合计场外受累电网次数（明细）
      */
-    private BigDecimal yhjcwsldwcsmx;
+    private Double yhjcwsldwcsmx;
 
     /**
      * 月合计场外受累天气次数（明细）
      */
-    private BigDecimal yhjcwsltqcsmx;
+    private Double yhjcwsltqcsmx;
 
     /**
      * 月合计离线次数（明细）
      */
-    private BigDecimal yhjlxcsmx;
+    private Double yhjlxcsmx;
 
     /**
      * 月合计通讯中断次数（明细）
      */
-    private BigDecimal yhjtxzdcsmx;
+    private Double yhjtxzdcsmx;
 
     /**
      * 月合计待机次数
      */
-    private BigDecimal yhjdjcs;
+    private Double yhjdjcs;
 
     /**
      * 月合计故障停机次数
      */
-    private BigDecimal yhjgztjcs;
+    private Double yhjgztjcs;
 
     /**
      * 月合计通讯中断次数
      */
-    private BigDecimal yhjtxzccs;
+    private Double yhjtxzdcs;
 
     /**
-     * 月合计维护停机次数
+     * 月合计检修停机次数
      */
-    private BigDecimal yhjwhtjcs;
+    private Double yhjjxtjcs;
 
     /**
      * 月合计限电次数
      */
-    private BigDecimal yhjxdcs;
+    private Double yhjxdcs;
 
     /**
      * 月合计运行次数
      */
-    private BigDecimal yhjyxcs;
+    private Double yhjyxcs;
 
     /**
      * 年合计故障次数（明细）
      */
-    private BigDecimal nhjgzcsmx;
+    private Double nhjgzcsmx;
 
     /**
      * 年合计场内受累故障次数（明细）
      */
-    private BigDecimal nhjcnslgzcsmx;
+    private Double nhjcnslgzcsmx;
 
     /**
      * 年合计检修次数（明细）
      */
-    private BigDecimal nhjjxcsmx;
+    private Double nhjjxcsmx;
 
     /**
      * 年合计场内受累检修次数（明细）
      */
-    private BigDecimal nhjcnsljxcsmx;
+    private Double nhjcnsljxcsmx;
 
     /**
      * 年合计待机次数（明细）
      */
-    private BigDecimal nhjdjcsmx;
+    private Double nhjdjcsmx;
 
     /**
      * 年合计缺陷降出力次数（明细）
      */
-    private BigDecimal nhjqxjclcsmx;
+    private Double nhjqxjclcsmx;
 
     /**
      * 年合计手动停机次数（明细）
      */
-    private BigDecimal nhjsdtjcsmx;
+    private Double nhjsdtjcsmx;
 
     /**
-     * 年合计性能次数（明细）
+     * 年合计并网次数（明细）
      */
-    private BigDecimal nhjxncsmx;
+    private Double nhjbwcsmx;
 
     /**
      * 年合计限电停机次数（明细）
      */
-    private BigDecimal nhjxdtjcsmx;
+    private Double nhjxdtjcsmx;
 
     /**
      * 年合计限电降出力次数（明细）
      */
-    private BigDecimal nhjxdjclcsmx;
+    private Double nhjxdjclcsmx;
 
     /**
      * 年合计场外受累电网次数（明细）
      */
-    private BigDecimal nhjcwsldwcsmx;
+    private Double nhjcwsldwcsmx;
 
     /**
      * 年合计场外受累天气次数（明细）
      */
-    private BigDecimal nhjcwsltqcsmx;
+    private Double nhjcwsltqcsmx;
 
     /**
      * 年合计离线次数（明细）
      */
-    private BigDecimal nhjlxcsmx;
+    private Double nhjlxcsmx;
 
     /**
      * 年合计通讯中断次数（明细）
      */
-    private BigDecimal nhjtxzdcsmx;
+    private Double nhjtxzdcsmx;
 
     /**
      * 年合计待机次数
      */
-    private BigDecimal nhjdjcs;
+    private Double nhjdjcs;
 
     /**
      * 年合计故障停机次数
      */
-    private BigDecimal nhjgztjcs;
+    private Double nhjgztjcs;
 
     /**
      * 年合计通讯中断次数
      */
-    private BigDecimal nhjtxzccs;
+    private Double nhjtxzdcs;
 
     /**
-     * 年合计维护停机次数
+     * 年合计检修停机次数
      */
-    private BigDecimal nhjwhtjcs;
+    private Double nhjjxtjcs;
 
     /**
      * 年合计限电次数
      */
-    private BigDecimal nhjxdcs;
+    private Double nhjxdcs;
 
     /**
      * 年合计运行次数
      */
-    private BigDecimal nhjyxcs;
+    private Double nhjyxcs;
+
+    /**
+     * 日合计受累次数
+     */
+    private Double rhjslcs;
+
+    /**
+     * 月合计受累次数
+     */
+    private Double yhjslcs;
+
+    /**
+     * 年合计受累次数
+     */
+    private Double nhjslcs;
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,12 +28,12 @@ public class ProEconPowerstationInfoDay4 extends Model {
     /**
      * 外键编号
      */
-    private String foreignkeyid;
+    private String foreignKeyId;
 
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 类型
@@ -66,94 +66,99 @@ public class ProEconPowerstationInfoDay4 extends Model {
     private String regionId;
 
     /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
      * 日MTBF
      */
-    private BigDecimal rmtbf;
+    private Double rmtbf;
 
     /**
      * 日MTTR
      */
-    private BigDecimal rmttr;
+    private Double rmttr;
 
     /**
      * 日MTTF
      */
-    private BigDecimal rmttf;
+    private Double rmttf;
 
     /**
      * 日复位及时率
      */
-    private BigDecimal rfwjsl;
+    private Double rfwjsl;
 
     /**
      * 日状态转换及时率
      */
-    private BigDecimal rztzhjsl;
+    private Double rztzhjsl;
 
     /**
      * 日故障消缺及时率
      */
-    private BigDecimal rgzxqjsl;
+    private Double rgzxqjsl;
 
     /**
      * 月MTBF
      */
-    private BigDecimal ymtbf;
+    private Double ymtbf;
 
     /**
      * 月MTTR
      */
-    private BigDecimal ymttr;
+    private Double ymttr;
 
     /**
      * 月MTTF
      */
-    private BigDecimal ymttf;
+    private Double ymttf;
 
     /**
      * 月复位及时率
      */
-    private BigDecimal yfwjsl;
+    private Double yfwjsl;
 
     /**
      * 月状态转换及时率
      */
-    private BigDecimal yztzhjsl;
+    private Double yztzhjsl;
 
     /**
      * 月故障消缺及时率
      */
-    private BigDecimal ygzxqjsl;
+    private Double ygzxqjsl;
 
     /**
      * 年MTBF
      */
-    private BigDecimal nmtbf;
+    private Double nmtbf;
 
     /**
      * 年MTTR
      */
-    private BigDecimal nmttr;
+    private Double nmttr;
 
     /**
      * 年MTTF
      */
-    private BigDecimal nmttf;
+    private Double nmttf;
 
     /**
      * 年复位及时率
      */
-    private BigDecimal nfwjsl;
+    private Double nfwjsl;
 
     /**
      * 年状态转换及时率
      */
-    private BigDecimal nztzhjsl;
+    private Double nztzhjsl;
 
     /**
      * 年故障消缺及时率
      */
-    private BigDecimal ngzxqjsl;
+    private Double ngzxqjsl;
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,12 +28,12 @@ public class ProEconPowerstationInfoDay5 extends Model {
     /**
      * 外键编号
      */
-    private String foreignkeyid;
+    private String foreignKeyId;
 
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 类型
@@ -66,94 +66,99 @@ public class ProEconPowerstationInfoDay5 extends Model {
     private String regionId;
 
     /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
      * 日发电量(电表)
      */
-    private BigDecimal rfdldb;
+    private Double rfdldb;
 
     /**
      * 日上网电量(电表)
      */
-    private BigDecimal rswdldb;
+    private Double rswdldb;
 
     /**
      * 日工网购网电量(电表)
      */
-    private BigDecimal rgwgwdldb;
+    private Double rgwgwdldb;
 
     /**
      * 日农网购网电量(电表)
      */
-    private BigDecimal rnwgwdldb;
+    private Double rnwgwdldb;
 
     /**
      * 日综合场用电量(电表)
      */
-    private BigDecimal rzhcydldb;
+    private Double rzhcydldb;
 
     /**
      * 日发电厂用电量(电表)
      */
-    private BigDecimal rfdcydldb;
+    private Double rfdcydldb;
 
     /**
      * 月发电量(电表)
      */
-    private BigDecimal yfdldb;
+    private Double yfdldb;
 
     /**
      * 月上网电量(电表)
      */
-    private BigDecimal yswdldb;
+    private Double yswdldb;
 
     /**
      * 月工网购网电量(电表)
      */
-    private BigDecimal ygwgwdldb;
+    private Double ygwgwdldb;
 
     /**
      * 月农网购网电量(电表)
      */
-    private BigDecimal ynwgwdldb;
+    private Double ynwgwdldb;
 
     /**
      * 月综合场用电量(电表)
      */
-    private BigDecimal yzhcydldb;
+    private Double yzhcydldb;
 
     /**
      * 月发电厂用电量(电表)
      */
-    private BigDecimal yfdcydldb;
+    private Double yfdcydldb;
 
     /**
      * 年发电量(电表)
      */
-    private BigDecimal nfdldb;
+    private Double nfdldb;
 
     /**
      * 年上网电量(电表)
      */
-    private BigDecimal nswdldb;
+    private Double nswdldb;
 
     /**
      * 年工网购网电量(电表)
      */
-    private BigDecimal ngwgwdldb;
+    private Double ngwgwdldb;
 
     /**
      * 年农网购网电量(电表)
      */
-    private BigDecimal nnwgwdldb;
+    private Double nnwgwdldb;
 
     /**
      * 年综合场用电量(电表)
      */
-    private BigDecimal nzhcydldb;
+    private Double nzhcydldb;
 
     /**
      * 年发电厂用电量(电表)
      */
-    private BigDecimal nfdcydldb;
+    private Double nfdcydldb;
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,12 +28,12 @@ public class ProEconPowerstationInfoDay6 extends Model {
     /**
      * 外键编号
      */
-    private String foreignkeyid;
+    private String foreignKeyId;
 
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 类型
@@ -66,94 +66,99 @@ public class ProEconPowerstationInfoDay6 extends Model {
     private String regionId;
 
     /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
      * 日最大风速（测风塔）
      */
-    private BigDecimal rzdfscft;
+    private Double rzdfscft;
 
     /**
      * 日最小风速（测风塔）
      */
-    private BigDecimal rzxfdcft;
+    private Double rzxfdcft;
 
     /**
      * 日最大功率（出线）
      */
-    private BigDecimal rzdglcx;
+    private Double rzdglcx;
 
     /**
      * 日最小功率（出线）
      */
-    private BigDecimal rzxglcx;
+    private Double rzxglcx;
 
     /**
      * 日平均功率（出线）
      */
-    private BigDecimal rpjglcx;
+    private Double rpjglcx;
 
     /**
      * 日平均风速（测风塔）
      */
-    private BigDecimal rpjfscft;
+    private Double rpjfscft;
 
     /**
      * 月最大风速（测风塔）
      */
-    private BigDecimal yzdfscft;
+    private Double yzdfscft;
 
     /**
      * 月最小风速（测风塔）
      */
-    private BigDecimal yzxfdcft;
+    private Double yzxfdcft;
 
     /**
      * 月最大功率（出线）
      */
-    private BigDecimal yzdglcx;
+    private Double yzdglcx;
 
     /**
      * 月最小功率（出线）
      */
-    private BigDecimal yzxglcx;
+    private Double yzxglcx;
 
     /**
      * 月平均功率（出线）
      */
-    private BigDecimal ypjglcx;
+    private Double ypjglcx;
 
     /**
      * 月平均风速（测风塔）
      */
-    private BigDecimal ypjfscft;
+    private Double ypjfscft;
 
     /**
      * 年最大风速（测风塔）
      */
-    private BigDecimal nzdfscft;
+    private Double nzdfscft;
 
     /**
      * 年最小风速（测风塔）
      */
-    private BigDecimal nzxfdcft;
+    private Double nzxfdcft;
 
     /**
      * 年最大功率（出线）
      */
-    private BigDecimal nzdglcx;
+    private Double nzdglcx;
 
     /**
      * 年最小功率（出线）
      */
-    private BigDecimal nzxglcx;
+    private Double nzxglcx;
 
     /**
      * 年平均功率（出线）
      */
-    private BigDecimal npjglcx;
+    private Double npjglcx;
 
     /**
      * 年平均风速（测风塔）
      */
-    private BigDecimal npjfscft;
+    private Double npjfscft;
 
 
 }

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

@@ -1,8 +1,8 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.time.LocalDate;
+import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
@@ -28,12 +28,12 @@ public class ProEconPowerstationInfoDay7 extends Model {
     /**
      * 外键编号
      */
-    private String foreignkeyid;
+    private String foreignKeyId;
 
     /**
      * 日期
      */
-    private LocalDate recorddate;
+    private Date recordDate;
 
     /**
      * 类型
@@ -66,49 +66,54 @@ public class ProEconPowerstationInfoDay7 extends Model {
     private String regionId;
 
     /**
+     * 所属位置(区域、区域风、区域光、公司、公司、公司风、公司光、场站、期次、线路)
+     */
+    private String location;
+
+    /**
      * 日系统效率（PR）
      */
-    private BigDecimal rxtxlpr;
+    private Double rxtxlpr;
 
     /**
      * 日离散率
      */
-    private BigDecimal rlsl;
+    private Double rlsl;
 
     /**
      * 日逆变器转换效率
      */
-    private BigDecimal rnbqzhxl;
+    private Double rnbqzhxl;
 
     /**
      * 月系统效率（PR）
      */
-    private BigDecimal yxtxlpr;
+    private Double yxtxlpr;
 
     /**
      * 月离散率
      */
-    private BigDecimal ylsl;
+    private Double ylsl;
 
     /**
      * 月逆变器转换效率
      */
-    private BigDecimal ynbqzhxl;
+    private Double ynbqzhxl;
 
     /**
      * 年系统效率（PR）
      */
-    private BigDecimal nxtxlpr;
+    private Double nxtxlpr;
 
     /**
      * 年离散率
      */
-    private BigDecimal nlsl;
+    private Double nlsl;
 
     /**
      * 年逆变器转换效率
      */
-    private BigDecimal nnbqzhxl;
+    private Double nnbqzhxl;
 
 
 }

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

@@ -1,6 +1,6 @@
 package com.gyee.generation.model.auto;
 
-import java.math.BigDecimal;
+
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;

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

@@ -0,0 +1,786 @@
+package com.gyee.generation.service;//package com.gyee.generation.service;
+
+import com.gyee.common.contant.ContantXk;
+import com.gyee.common.model.PointData;
+import com.gyee.common.model.StringUtils;
+import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.model.auto.*;
+import com.gyee.generation.model.vo.Location;
+import com.gyee.generation.service.auto.*;
+import com.gyee.generation.util.DateUtils;
+import com.gyee.generation.util.realtimesource.IEdosUtil;
+import com.gyee.generation.util.statisticcs.Initial;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.util.*;
+import java.util.stream.Collectors;
+
+@Service
+public class WindPowerInfo5Service {
+
+    private static final Logger logger = LoggerFactory.getLogger(WindPowerInfo1Service.class);
+    @Resource
+    private IEdosUtil edosUtil;
+
+    @Resource
+    private IProEconPowerstationInfoDay5Service proEconPowerstationInfoDay5Service;
+
+
+
+
+    /**
+     * 计算区域日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calRegionInfoDay(Date recordDate) throws Exception {
+
+        List<ProEconPowerstationInfoDay5> wpinfodayls = proEconPowerstationInfoDay5Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                        && i.getLocation().equals(Location.cp.getValue()))
+                .collect(Collectors.toList());
+        if(!wpinfodayls.isEmpty())
+        {
+
+            Map<String, Map<String, List<ProEconPowerstationInfoDay5>>>rgmap=new HashMap<>();
+
+
+
+
+            for(ProEconPowerstationInfoDay5 wpinfo:wpinfodayls)
+            {
+
+                if(rgmap.containsKey(wpinfo.getCompanyId()))
+                {
+                    Map<String, List<ProEconPowerstationInfoDay5>> map=rgmap.get(wpinfo.getCompanyId());
+                    List<ProEconPowerstationInfoDay5> qbls=map.get("qb");
+                    List<ProEconPowerstationInfoDay5> gfls=map.get("fd");
+                    List<ProEconPowerstationInfoDay5> fdls=map.get("gf");
+
+                    if(wpinfo.getForeignKeyId().equals("-1"))
+                    {
+                        fdls.add(wpinfo);
+                    }else if(wpinfo.getForeignKeyId().equals("-2")){
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                }else
+                {
+                    Map<String, List<ProEconPowerstationInfoDay5>> map=new HashMap<>();
+
+                    List<ProEconPowerstationInfoDay5> qbls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay5> gfls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay5> fdls=new ArrayList<>();
+
+                    if(wpinfo.getForeignKeyId().equals("-1"))
+                    {
+                        fdls.add(wpinfo);
+                    }else if(wpinfo.getForeignKeyId().equals("-2")){
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                    map.put("qb",qbls);
+                    map.put("fd",fdls);
+                    map.put("gf",gfls);
+                }
+            }
+
+
+            //判断是否有重复记录，先删除重复记录
+            List<String> idls = proEconPowerstationInfoDay5Service.list().stream()
+                    .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                            && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                            && i.getLocation().equals(Location.rg.getValue())).map(ProEconPowerstationInfoDay5::getId)
+                    .collect(Collectors.toList());
+
+            if (idls != null && idls.size() > 0) {
+
+                proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+            }
+            for(Map.Entry<String, Map<String, List<ProEconPowerstationInfoDay5>>> entry:rgmap.entrySet()){
+                Map<String, List<ProEconPowerstationInfoDay5>> map=entry.getValue();
+                List<ProEconPowerstationInfoDay5> qbls=map.get("qb");
+                List<ProEconPowerstationInfoDay5> gfls=map.get("fd");
+                List<ProEconPowerstationInfoDay5> fdls=map.get("gf");
+//                if(CacheContext.cpwpmap.size()==qbls.size())
+//                {
+
+                ProEconPowerstationInfoDay5 qb=new ProEconPowerstationInfoDay5();
+                ProEconPowerstationInfoDay5 fd=new ProEconPowerstationInfoDay5();
+                ProEconPowerstationInfoDay5 gf=new ProEconPowerstationInfoDay5();
+
+                if(CacheContext.rgmap.containsKey(entry.getKey()))
+                {
+                    ProBasicRegion cp=CacheContext.rgmap.get(entry.getKey());
+                    gf.setRegionId(cp.getId());
+
+                    gf.setRecordDate(DateUtils.truncDay(recordDate));
+                    gf.setForeignKeyId("-2");
+                    gf.setLocation(Location.rg.getValue());
+
+                    fd.setRegionId(cp.getId());
+
+                    fd.setRecordDate(DateUtils.truncDay(recordDate));
+                    fd.setForeignKeyId("-1");
+                    fd.setLocation(Location.rg.getValue());
+
+                    qb.setRegionId(cp.getId());
+
+                    qb.setRecordDate(DateUtils.truncDay(recordDate));
+                    qb.setForeignKeyId("0");
+                    qb.setLocation(Location.rg.getValue());
+
+                    //计算区域级全部
+                    calCp(qb,qbls);
+                    //计算公司级风电场站
+                    calCp(fd,fdls);
+                    //计算公司级光电场站
+                    calCp(gf,gfls);
+
+                    proEconPowerstationInfoDay5Service.save(qb);
+                    proEconPowerstationInfoDay5Service.save(fd);
+                    proEconPowerstationInfoDay5Service.save(gf);
+                }
+
+
+//                }else
+//                {
+//                    logger.debug("公司所属场站数量与保存的场站日信息数量不一致，未进行{0}统计-------结束", entry.getKey());
+//
+//                }
+
+
+
+
+
+            };
+        }
+
+    }
+
+    /**
+     * 计算公司日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calCompanyInfoDay(Date recordDate) throws Exception {
+
+        List<ProEconPowerstationInfoDay5> wpinfodayls = proEconPowerstationInfoDay5Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                        && i.getLocation().equals(Location.wp.getValue()))
+                .collect(Collectors.toList());
+        if(!wpinfodayls.isEmpty())
+        {
+
+            Map<String, Map<String, List<ProEconPowerstationInfoDay5>>>cpmap=new HashMap<>();
+
+
+
+
+            for(ProEconPowerstationInfoDay5 wpinfo:wpinfodayls)
+            {
+
+                if(cpmap.containsKey(wpinfo.getCompanyId()))
+                {
+                    Map<String, List<ProEconPowerstationInfoDay5>> map=cpmap.get(wpinfo.getCompanyId());
+                    List<ProEconPowerstationInfoDay5> qbls=map.get("qb");
+                    List<ProEconPowerstationInfoDay5> gfls=map.get("fd");
+                    List<ProEconPowerstationInfoDay5> fdls=map.get("gf");
+
+                    if(wpinfo.getWindpowerstationId().indexOf("FDC")>=0)
+                    {
+                        fdls.add(wpinfo);
+                    }else {
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                }else
+                {
+                    Map<String, List<ProEconPowerstationInfoDay5>> map=new HashMap<>();
+
+                    List<ProEconPowerstationInfoDay5> qbls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay5> gfls=new ArrayList<>();
+                    List<ProEconPowerstationInfoDay5> fdls=new ArrayList<>();
+
+                    if(wpinfo.getWindpowerstationId().indexOf("FDC")>=0)
+                    {
+                        fdls.add(wpinfo);
+                    }else {
+                        gfls.add(wpinfo);
+                    }
+                    qbls.add(wpinfo);
+                    map.put("qb",qbls);
+                    map.put("fd",fdls);
+                    map.put("gf",gfls);
+                }
+            }
+
+
+            //判断是否有重复记录，先删除重复记录
+            List<String> idls = proEconPowerstationInfoDay5Service.list().stream()
+                    .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+//                            && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                            && i.getLocation().equals(Location.cp.getValue())).map(ProEconPowerstationInfoDay5::getId)
+                    .collect(Collectors.toList());
+
+            if (idls != null && idls.size() > 0) {
+
+                proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+            }
+            for(Map.Entry<String, Map<String, List<ProEconPowerstationInfoDay5>>> entry:cpmap.entrySet()){
+                Map<String, List<ProEconPowerstationInfoDay5>> map=entry.getValue();
+                List<ProEconPowerstationInfoDay5> qbls=map.get("qb");
+                List<ProEconPowerstationInfoDay5> gfls=map.get("fd");
+                List<ProEconPowerstationInfoDay5> fdls=map.get("gf");
+//                if(CacheContext.cpwpmap.size()==qbls.size())
+//                {
+
+                ProEconPowerstationInfoDay5 qb=new ProEconPowerstationInfoDay5();
+                ProEconPowerstationInfoDay5 fd=new ProEconPowerstationInfoDay5();
+                ProEconPowerstationInfoDay5 gf=new ProEconPowerstationInfoDay5();
+
+                if(CacheContext.cpmap.containsKey(entry.getKey()))
+                {
+                    ProBasicCompany cp=CacheContext.cpmap.get(entry.getKey());
+                    gf.setRegionId(cp.getRegionId());
+                    gf.setCompanyId(cp.getId());
+                    gf.setRecordDate(DateUtils.truncDay(recordDate));
+                    gf.setForeignKeyId("-2");
+                    gf.setLocation(Location.cp.getValue());
+
+
+
+                    fd.setRegionId(cp.getRegionId());
+                    fd.setCompanyId(cp.getId());
+                    fd.setRecordDate(DateUtils.truncDay(recordDate));
+                    fd.setForeignKeyId("-1");
+                    fd.setLocation(Location.cp.getValue());
+
+                    qb.setRegionId(cp.getRegionId());
+                    qb.setCompanyId(cp.getId());
+                    qb.setRecordDate(DateUtils.truncDay(recordDate));
+                    qb.setForeignKeyId("0");
+                    qb.setLocation(Location.cp.getValue());
+
+                    //计算公司级全部场站
+                    calCp(qb,qbls);
+                    //计算公司级风电场站
+                    calCp(fd,fdls);
+                    //计算公司级光电场站
+                    calCp(gf,gfls);
+
+                    proEconPowerstationInfoDay5Service.save(qb);
+                    proEconPowerstationInfoDay5Service.save(fd);
+                    proEconPowerstationInfoDay5Service.save(gf);
+                }
+
+
+//                }else
+//                {
+//                    logger.debug("公司所属场站数量与保存的场站日信息数量不一致，未进行{0}统计-------结束", entry.getKey());
+//
+//                }
+
+
+
+
+
+            };
+        }
+
+    }
+
+    private void calCp(ProEconPowerstationInfoDay5 pewp,List<ProEconPowerstationInfoDay5> ls) throws Exception {
+
+        if(!ls.isEmpty())
+        {
+
+            for(ProEconPowerstationInfoDay5 pepid:ls)
+            {
+                //日发电量(升压站)
+                pewp.setRfdldb(StringUtils.round(pewp.getRfdldb()+pepid.getRfdldb(),2));
+                //日上网电量
+                pewp.setRswdldb(StringUtils.round(pewp.getRswdldb()+pepid.getRswdldb(),2));
+                //日工网购网电量
+                pewp.setRgwgwdldb(StringUtils.round(pewp.getRgwgwdldb()+pepid.getRgwgwdldb(),2));
+                //日农网购网电量
+                pewp.setRnwgwdldb(StringUtils.round(pewp.getRnwgwdldb()+pepid.getRnwgwdldb(),2));
+                //日综合场用电量(电表)
+                pewp.setRzhcydldb(StringUtils.round(pewp.getRzhcydldb()+pepid.getRzhcydldb(),2));
+                //日厂用电量
+                pewp.setRfdcydldb(StringUtils.round(pewp.getRfdcydldb()+pepid.getRfdcydldb(),2));
+
+                //月发电量(升压站)
+                pewp.setYfdldb(StringUtils.round(pewp.getYfdldb()+pepid.getYfdldb(),2));
+                //月上网电量
+                pewp.setYswdldb(StringUtils.round(pewp.getYswdldb()+pepid.getYswdldb(),2));
+                //月工网购网电量
+                pewp.setYgwgwdldb(StringUtils.round(pewp.getYgwgwdldb()+pepid.getYgwgwdldb(),2));
+                //月农网购网电量
+                pewp.setYnwgwdldb(StringUtils.round(pewp.getYnwgwdldb()+pepid.getYnwgwdldb(),2));
+                //月综合场用电量(电表)
+                pewp.setYzhcydldb(StringUtils.round(pewp.getYzhcydldb()+pepid.getYzhcydldb(),2));
+                //月厂用电量
+                pewp.setYfdcydldb(StringUtils.round(pewp.getYfdcydldb()+pepid.getYfdcydldb(),2));
+
+                //年发电量(升压站)
+                pewp.setNfdldb(StringUtils.round(pewp.getNfdldb()+pepid.getNfdldb(),2));
+                //年上网电量
+                pewp.setNswdldb(StringUtils.round(pewp.getNswdldb()+pepid.getNswdldb(),2));
+                //年工网购网电量
+                pewp.setNgwgwdldb(StringUtils.round(pewp.getNgwgwdldb()+pepid.getNgwgwdldb(),2));
+                //年农网购网电量
+                pewp.setNnwgwdldb(StringUtils.round(pewp.getNnwgwdldb()+pepid.getNnwgwdldb(),2));
+                //年综合场用电量(电表)
+                pewp.setNzhcydldb(StringUtils.round(pewp.getNzhcydldb()+pepid.getNzhcydldb(),2));
+                //年厂用电量
+                pewp.setNfdcydldb(StringUtils.round(pewp.getNfdcydldb()+pepid.getNfdcydldb(),2));
+
+            }
+
+        }
+    }
+    /**
+     * 计算场站日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calWindpowerInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+
+        List<ProEconPowerstationInfoDay5> wpinfodayls=new ArrayList<>();
+
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconPowerstationInfoDay5Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.wpmap.containsKey(i.getWindpowerstationId())
+                        && i.getLocation().equals(Location.wp.getValue())).map(ProEconPowerstationInfoDay5::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+        }
+        for(ProBasicWindpowerstation wp:CacheContext.wpls)
+        {
+            if(CacheContext.wppointmap.containsKey(wp.getId()))
+            {
+                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(wp.getId());
+
+                ProEconPowerstationInfoDay5 pewp=new ProEconPowerstationInfoDay5();
+                Initial.initial(pewp);
+                pewp.setRegionId(wp.getRegionId());
+                pewp.setCompanyId(wp.getCompanyId());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+                pewp.setForeignKeyId("0");
+                pewp.setWindpowerstationId(wp.getId());
+                pewp.setLocation(Location.wp.getValue());
+
+                //昨日的统计结果
+                List<ProEconPowerstationInfoDay5> pepid1ls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepid1ls = proEconPowerstationInfoDay5Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getWindpowerstationId().equals(wp.getId())
+                                    && i.getLocation().equals(Location.wp.getValue()))
+                            .collect(Collectors.toList());
+                }
+                extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
+/*******************************************年信息统计*********************************************************/
+//                wpinfodayls.add(pewp);
+                proEconPowerstationInfoDay5Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+
+    /**
+     * 计算项目日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calProjectInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconPowerstationInfoDay5Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.pjmap.containsKey(i.getProjectId())
+                        && i.getLocation().equals(Location.pj.getValue())).map(ProEconPowerstationInfoDay5::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+        }
+        for(ProBasicProject pj:CacheContext.pjls)
+        {
+            if(CacheContext.wppointmap.containsKey(pj.getId()))
+            {
+                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(pj.getId());
+
+                ProEconPowerstationInfoDay5 pewp=new ProEconPowerstationInfoDay5();
+                Initial.initial(pewp);
+                pewp.setForeignKeyId("0");
+                pewp.setWindpowerstationId(pj.getWindpowerstationId());
+                pewp.setProjectId(pj.getId());
+                pewp.setLocation(Location.pj.getValue());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+
+                //昨日的统计结果
+                List<ProEconPowerstationInfoDay5> pepid1ls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepid1ls = proEconPowerstationInfoDay5Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getWindpowerstationId().equals(pj.getId())
+                                    && i.getLocation().equals(Location.pj.getValue()))
+                            .collect(Collectors.toList());
+                }
+                extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
+
+
+                proEconPowerstationInfoDay5Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+    /**
+     * 计算线路日信息
+     * @param recordDate
+     * @throws Exception
+     */
+    public void calLineInfoDay(Date recordDate) throws Exception {
+        Calendar c=Calendar.getInstance();
+        c.setTime(recordDate);
+
+        Date end=c.getTime();
+
+        Date begin= DateUtils.truncDay(c.getTime());
+
+        //判断是否有重复记录，先删除重复记录
+        List<String> idls = proEconPowerstationInfoDay5Service.list().stream()
+                .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(recordDate))==0
+                        && CacheContext.lnmap.containsKey(i.getLineId())
+                        && i.getLocation().equals(Location.ln.getValue()) ).map(ProEconPowerstationInfoDay5::getId)
+                .collect(Collectors.toList());
+
+        if (idls != null && idls.size() > 0) {
+
+            proEconPowerstationInfoDay5Service.removeByIds(idls);
+
+        }
+        for(ProBasicLine ln:CacheContext.lnls)
+        {
+            if(CacheContext.wppointmap.containsKey(ln.getId()))
+            {
+                Map<String, ProBasicWppoint> pointmap=CacheContext.wppointmap.get(ln.getId());
+
+                ProEconPowerstationInfoDay5 pewp=new ProEconPowerstationInfoDay5();
+                Initial.initial(pewp);
+                pewp.setForeignKeyId("0");
+                pewp.setLineId(ln.getId());
+                pewp.setLocation(Location.ln.getValue());
+                pewp.setProjectId(ln.getProjectId());
+                pewp.setRecordDate(DateUtils.truncDay(recordDate));
+
+                //昨日的统计结果
+                List<ProEconPowerstationInfoDay5> pepid1ls =new ArrayList<>();
+                Calendar cl=Calendar.getInstance();
+                cl.setTime(recordDate);
+                if(cl.get(Calendar.DAY_OF_MONTH)!=1)
+
+                {
+                    pepid1ls = proEconPowerstationInfoDay5Service.list().stream()
+                            .filter(i -> i.getRecordDate().compareTo(DateUtils.truncDay(cl.getTime())) == 0
+                                    && i.getWindpowerstationId().equals(ln.getId())
+                                    && i.getLocation().equals(Location.ln.getValue()))
+                            .collect(Collectors.toList());
+                }
+                extracted(recordDate, end, begin, pointmap, pewp,pepid1ls);
+
+                proEconPowerstationInfoDay5Service.save(pewp);
+
+            }
+
+
+        }
+
+    }
+
+    private void extracted(Date recordDate, Date end, Date begin,Map<String, ProBasicWppoint> pointmap, ProEconPowerstationInfoDay5 pewp,List<ProEconPowerstationInfoDay5> pepid1ls) throws Exception {
+        /*******************************************日信息统计*********************************************************/
+
+                double rfdlsyz=0.0;
+                double rswdlsyz=0.0;
+                double rgwgwdlsyz=0.0;
+                double rnwgwdlsyz=0.0;
+                if(pointmap.containsKey(ContantXk.RFDLSYZ));
+                {
+                    ProBasicWppoint point=pointmap.get(ContantXk.RFDLSYZ);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    if(StringUtils.notEmp(pointValue))
+                    {
+                        //日发电量(升压站)
+                        rfdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                        pewp.setRfdldb(rfdlsyz);
+
+                    }
+                }
+
+                if(pointmap.containsKey(ContantXk.RSWDL));
+                {
+                    ProBasicWppoint point=pointmap.get(ContantXk.RSWDL);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    if(StringUtils.notEmp(pointValue))
+                    {
+                        //日上网电量
+                        rswdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                        pewp.setRswdldb(rswdlsyz);
+
+                    }
+                }
+
+                if(pointmap.containsKey(ContantXk.RGWGWDL));
+                {
+                    ProBasicWppoint point=pointmap.get(ContantXk.RGWGWDL);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    if(StringUtils.notEmp(pointValue))
+                    {
+                        //日工网购网电量
+                        rgwgwdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                        pewp.setRgwgwdldb(rgwgwdlsyz);
+
+                    }
+                }
+
+                if(pointmap.containsKey(ContantXk.RNWGWDL));
+                {
+                    ProBasicWppoint point=pointmap.get(ContantXk.RNWGWDL);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    if(StringUtils.notEmp(pointValue))
+                    {
+                        //日农网购网电量
+                        rnwgwdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                        pewp.setRnwgwdldb(rnwgwdlsyz);
+
+                    }
+                }
+
+                //日综合场用电量(电表)
+                pewp.setRzhcydldb(StringUtils.round(rfdlsyz-rswdlsyz+rgwgwdlsyz+rnwgwdlsyz,2));
+
+
+                if(pointmap.containsKey(ContantXk.RCYDL));
+                {
+                    ProBasicWppoint point=pointmap.get(ContantXk.RCYDL);
+                    PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+                    if(StringUtils.notEmp(pointValue))
+                    {
+                        //日厂用电量
+                        pewp.setRfdcydldb(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+                    }
+                }
+
+
+/*******************************************日信息统计*********************************************************/
+
+/*******************************************月信息统计*********************************************************/
+
+        double yfdlsyz=0.0;
+        double yswdlsyz=0.0;
+        double ygwgwdlsyz=0.0;
+        double ynwgwdlsyz=0.0;
+        if(pointmap.containsKey(ContantXk.YFDLSYZ));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.YFDLSYZ);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月发电量(升压站)
+                yfdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setYfdldb(yfdlsyz);
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YSWDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.YSWDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月上网电量
+                yswdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setYswdldb(yswdlsyz);
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YGWGWDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.YGWGWDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月工网购网电量
+                ygwgwdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setYgwgwdldb(ygwgwdlsyz);
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.YNWGWDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.YNWGWDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月农网购网电量
+                ynwgwdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setYnwgwdldb(ynwgwdlsyz);
+
+            }
+        }
+
+        //月综合场用电量(电表)
+        pewp.setYzhcydldb(StringUtils.round(yfdlsyz-yswdlsyz+ygwgwdlsyz+ynwgwdlsyz,2));
+
+
+        if(pointmap.containsKey(ContantXk.YCYDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.YCYDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //月厂用电量
+                pewp.setYfdcydldb(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+
+
+/*******************************************月信息统计*********************************************************/
+
+/*******************************************年信息统计*********************************************************/
+        double nfdlsyz=0.0;
+        double nswdlsyz=0.0;
+        double ngwgwdlsyz=0.0;
+        double nnwgwdlsyz=0.0;
+        if(pointmap.containsKey(ContantXk.NFDLSYZ));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.NFDLSYZ);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年发电量(升压站)
+                nfdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setNfdldb(nfdlsyz);
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NSWDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.NSWDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年上网电量
+                nswdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setNswdldb(nswdlsyz);
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NGWGWDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.NGWGWDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年工网购网电量
+                ngwgwdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setNgwgwdldb(ngwgwdlsyz);
+
+            }
+        }
+
+        if(pointmap.containsKey(ContantXk.NNWGWDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.NNWGWDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年农网购网电量
+                nnwgwdlsyz=StringUtils.round(pointValue.getPointValueInDouble(),2);
+                pewp.setNnwgwdldb(nnwgwdlsyz);
+
+            }
+        }
+
+        //年综合场用电量(电表)
+        pewp.setNzhcydldb(StringUtils.round(nfdlsyz-nswdlsyz+ngwgwdlsyz+nnwgwdlsyz,2));
+
+
+        if(pointmap.containsKey(ContantXk.NCYDL));
+        {
+            ProBasicWppoint point=pointmap.get(ContantXk.NCYDL);
+            PointData pointValue=edosUtil.getHistMatrix(point.getCode(),recordDate.getTime()/1000);
+            if(StringUtils.notEmp(pointValue))
+            {
+                //年厂用电量
+                pewp.setNfdcydldb(StringUtils.round(pointValue.getPointValueInDouble(),2));
+
+            }
+        }
+    }
+
+
+
+
+}
+
+
+
+
+
+
+

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface IProEconEquipmentInfoDay2Service extends IService<ProEconEquipmentInfoDay2> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface IProEconEquipmentInfoDay3Service extends IService<ProEconEquipmentInfoDay3> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface IProEconPowerstationInfoDay2Service extends IService<ProEconPowerstationInfoDay2> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 public interface IProEconPowerstationInfoDay3Service extends IService<ProEconPowerstationInfoDay3> {
 

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconEquipmentInfoDay2ServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Service
 public class ProEconEquipmentInfoDay2ServiceImpl extends ServiceImpl<ProEconEquipmentInfoDay2Mapper, ProEconEquipmentInfoDay2> implements IProEconEquipmentInfoDay2Service {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconEquipmentInfoDay3ServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Service
 public class ProEconEquipmentInfoDay3ServiceImpl extends ServiceImpl<ProEconEquipmentInfoDay3Mapper, ProEconEquipmentInfoDay3> implements IProEconEquipmentInfoDay3Service {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconPowerstationInfoDay2ServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Service
 public class ProEconPowerstationInfoDay2ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay2Mapper, ProEconPowerstationInfoDay2> implements IProEconPowerstationInfoDay2Service {

realtime/generationXK-service/src/main/java/com/gyee/generation/service/auto/impl/ProEconPowerstationInfoDay3ServiceImpl.java

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-11-01
+ * @since 2022-11-02
  */
 @Service
 public class ProEconPowerstationInfoDay3ServiceImpl extends ServiceImpl<ProEconPowerstationInfoDay3Mapper, ProEconPowerstationInfoDay3> implements IProEconPowerstationInfoDay3Service {

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

@@ -0,0 +1,862 @@
+package com.gyee.generation.service.initialpoint;
+
+
+
+import com.gyee.generation.init.CacheContext;
+import com.gyee.generation.model.auto.*;
+import com.gyee.generation.service.auto.*;
+import com.gyee.generation.util.ExcelExport;
+import com.gyee.generation.util.StringUtils;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+public class InitialPointGoldenXkByEqService implements IinitialPoint {
+
+
+    @Resource
+    private IProBasicRegionService proBasicRegionService;
+    @Resource
+    private IProBasicCompanyService proBasicCompanyService;
+
+    @Resource
+    private IProEconTestingPointService proEconTestingPointService;
+
+    private final String FJ = "fj";
+    private final String FJJSFW = "fjjsfw";
+    private final String GFJSFW = "gfjsfw";
+    private final String GF = "gf";
+
+    private final String GCJSFW = "gcjsfw";
+    private final String FCJSFW = "fcjsfw";
+
+
+
+    @Override
+    public void initalFc() throws IOException {
+
+
+        //   windPowerstationTestingPointService.deleteAll();
+
+
+        List<ProEconTestingPoint> pointls = proEconTestingPointService.list().stream()
+                .filter(i->i.getTypeId().equals(FCJSFW) || i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());
+
+        List<ProEconTestingPoint> fdpointls = proEconTestingPointService.list().stream()
+                .filter(i->i.getTypeId().equals(FCJSFW) ).collect(Collectors.toList());
+        List<ProEconTestingPoint> gfpointls = proEconTestingPointService.list().stream()
+                .filter(i->i.getTypeId().equals(GCJSFW)).collect(Collectors.toList());
+
+
+        List<ProBasicRegion> regions = proBasicRegionService.list();
+
+
+        List<ProBasicWppoint> allpoints = new ArrayList<>();
+
+        if(!regions.isEmpty())
+        {
+
+
+            for(ProBasicRegion re:regions)
+            {
+
+                StringBuilder sba=new StringBuilder();
+                sba.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_");
+/********************************************区域公司测点**************************************************/
+
+                
+                List<ProBasicWppoint>  points=new ArrayList<>();
+                for(int i=0;i<pointls.size();i++)
+                {
+
+                    ProEconTestingPoint stp=pointls.get(i);
+                    StringBuilder sb =new StringBuilder();
+                    StringBuilder sbtable =new StringBuilder();
+                    sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append("XXXX_XXX_X_XX_XX_XXXX_");
+                    sb.append("CI");
+                    sb.append(stp.getCode());
+                    
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+                    
+                    ProBasicWppoint po=new ProBasicWppoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setCode(V2Config.getInitialcode());
+                    po.setCode(String.valueOf(sbtable));
+                    sb =new StringBuilder();
+                    sb.append(re.getName()).append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb=new StringBuilder();
+
+                    if(StringUtils.notEmp(re.getCode()))
+                    {
+                        tempsb.append(re.getCode()).append("0");
+                    }else
+                    {
+                        tempsb.append("0");
+                    }
+
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+
+
+
+                    sb =new StringBuilder();
+                    sb.append(re.getCode()).append(".JSFW");
+                    po.setRealtimeId(String.valueOf(sb));
+
+
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+                // windPowerstationTestingPointService.insertBatch(points);
+
+/*******************************************区域公司测点*******************************************************/
+/********************************************风电场公司测点**************************************************/
+                points=new ArrayList<>();
+
+                for(int i=0;i<fdpointls.size();i++)
+                {
+                     sba=new StringBuilder();
+
+                    ProEconTestingPoint stp=fdpointls.get(i);
+                    StringBuilder sb =new StringBuilder();
+                    StringBuilder sbtable =new StringBuilder();
+                    sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
+                    sb.append("CI");
+                    sb.append(stp.getCode());
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicWppoint po=new ProBasicWppoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setCode(V2Config.getInitialcode());
+                    po.setCode(String.valueOf(sbtable));
+                    sb =new StringBuilder();
+                    sb.append(re.getName()).append("风电").append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+
+                    StringBuilder tempsb=new StringBuilder();
+                    if(StringUtils.notEmp(re.getCode()))
+                    {
+                        tempsb.append(re.getCode()).append("-1");
+                    }else
+                    {
+                        tempsb.append("-1");
+                    }
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+
+
+
+                    sb =new StringBuilder();
+                    sb.append(re.getCode()).append(".JSFW");
+                    po.setRealtimeId(String.valueOf(sb));
+//                            else
+//                            {
+//                                sb =new StringBuilder();
+//                                sb.append(re.getCode()).append(cs.getId()).append(".JSFWDD");
+//                                po.setRealtimeId(String.valueOf(sb));
+//                            }
+
+
+
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+                // windPowerstationTestingPointService.insertBatch(points);
+
+                /*******************************************风电测点生成*******************************************************/
+
+
+/*********************************************光伏测点生成*****************************************************/
+
+                points=new ArrayList<>();
+                for(int i=0;i<gfpointls.size();i++)
+                {
+
+
+                    ProEconTestingPoint stp=gfpointls.get(i);
+                    StringBuilder sb =new StringBuilder();
+                    StringBuilder sbtable =new StringBuilder();
+                    sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
+                    sb.append(String.valueOf(sba));
+                    sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_G_XX_XX_XXXX_");
+                    sb.append("CI");
+                    sb.append(stp.getCode());
+
+                    sbtable.append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicWppoint po=new ProBasicWppoint();
+                    po.setId(StringUtils.getUUID());
+//                            po.setCode(V2Config.getInitialcode());
+                    po.setCode(String.valueOf(sbtable));
+                    sb =new StringBuilder();
+                    sb.append(re.getName()).append("光伏").append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+                    StringBuilder tempsb=new StringBuilder();
+
+                    if(StringUtils.notEmp(re.getCode()))
+                    {
+                        tempsb.append(re.getCode()).append("-2");
+                    }else
+                    {
+                        tempsb.append("-2");
+                    }
+
+                    po.setWindpowerstationId(String.valueOf(tempsb));
+                    po.setUniformCode(stp.getUniformCode());
+
+                    sb =new StringBuilder();
+                    sb.append(re.getCode()).append(".JSFW");
+                    po.setRealtimeId(String.valueOf(sb));
+
+
+                    points.add(po);
+                }
+
+                allpoints.addAll(points);
+                List<ProBasicCompany> companys= proBasicCompanyService.list().stream().filter(i->i.getRegionId().equals(re.getId())).collect(Collectors.toList());
+                if(!companys.isEmpty())
+                {
+                    for(ProBasicCompany cs:companys)
+                    {
+                        sba=new StringBuilder();
+                        sba.append(cs.getId().substring(0,cs.getId().lastIndexOf("_"))).append("_");
+/********************************************区域公司测点**************************************************/
+                         points=new ArrayList<>();
+                        for(int i=0;i<pointls.size();i++)
+                        {
+
+
+                            ProEconTestingPoint stp=pointls.get(i);
+                            StringBuilder sb =new StringBuilder();
+                            StringBuilder sbtable =new StringBuilder();
+                            sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
+
+                            sb.append(String.valueOf(sba));
+                            sb.append("XXX_X_XX_XX_XXXX_");
+                            sb.append("CI");
+                            sb.append(stp.getCode());
+
+                            sbtable.append("JSFW.");
+                            sbtable.append(sb);
+
+                            ProBasicWppoint po=new ProBasicWppoint();
+                            po.setId(StringUtils.getUUID());
+//                            po.setCode(V2Config.getInitialcode());
+                            po.setCode(String.valueOf(sbtable));
+                            sb =new StringBuilder();
+                            sb.append(cs.getName()).append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+
+                            StringBuilder tempsb=new StringBuilder();
+
+                            if(StringUtils.notEmp(cs.getCode()))
+                            {
+                                tempsb.append(cs.getCode()).append("0");
+                            }else
+                            {
+                                tempsb.append("0");
+                            }
+
+                            po.setWindpowerstationId(String.valueOf(tempsb));
+                            po.setUniformCode(stp.getUniformCode());
+
+                            sb =new StringBuilder();
+                            sb.append(cs.getId()).append(".JSFW");
+                            po.setRealtimeId(String.valueOf(sb));
+
+
+                            points.add(po);
+                        }
+
+                        allpoints.addAll(points);
+                        // windPowerstationTestingPointService.insertBatch(points);
+
+/*******************************************区域公司测点*******************************************************/
+/********************************************风电场公司测点**************************************************/
+                        points=new ArrayList<>();
+
+                        sba=new StringBuilder();
+                        sba.append(cs.getId().substring(0,cs.getId().lastIndexOf("_"))).append("_");
+                        for(int i=0;i<fdpointls.size();i++)
+                        {
+
+                            ProEconTestingPoint stp=fdpointls.get(i);
+                            StringBuilder sb =new StringBuilder();
+                            StringBuilder sbtable =new StringBuilder();
+                            sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
+                            sb.append(String.valueOf(sba));
+                            sb.append("XXX_F_XX_XX_XXXX_");
+                            sb.append("CI");
+                            sb.append(stp.getCode());
+
+                            sbtable.append("JSFW.");
+                            sbtable.append(sb);
+
+                            ProBasicWppoint po=new ProBasicWppoint();
+                            po.setId(StringUtils.getUUID());
+//                            po.setCode(V2Config.getInitialcode());
+                            po.setCode(String.valueOf(sbtable));
+                            sb =new StringBuilder();
+                            sb.append(cs.getName()).append("风电").append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+
+                            StringBuilder tempsb=new StringBuilder();
+                            if(StringUtils.notEmp(cs.getCode()))
+                            {
+                                tempsb.append(cs.getCode()).append("-1");
+                            }else
+                            {
+                                tempsb.append("-1");
+                            }
+                            po.setWindpowerstationId(String.valueOf(tempsb));
+                            po.setUniformCode(stp.getUniformCode());
+
+                            sb =new StringBuilder();
+                            sb.append(cs.getId()).append(".JSFW");
+                            po.setRealtimeId(String.valueOf(sb));
+
+
+
+                            points.add(po);
+                        }
+
+                        allpoints.addAll(points);
+                        // windPowerstationTestingPointService.insertBatch(points);
+
+                        /*******************************************风电测点生成*******************************************************/
+
+
+/*********************************************光伏测点生成*****************************************************/
+                        sba=new StringBuilder();
+                        sba.append(cs.getId().substring(0,cs.getId().lastIndexOf("_"))).append("_");
+                        points=new ArrayList<>();
+                        for(int i=0;i<gfpointls.size();i++)
+                        {
+
+                            ProEconTestingPoint stp=gfpointls.get(i);
+                            StringBuilder sb =new StringBuilder();
+                            StringBuilder sbtable =new StringBuilder();
+                            sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
+                            sb.append(String.valueOf(sba));
+                            sb.append("XXX_G_XX_XX_XXXX_");
+                            sb.append("CI");
+                            sb.append(stp.getCode());
+
+                            sbtable.append("JSFW.");
+                            sbtable.append(sb);
+
+                            ProBasicWppoint po=new ProBasicWppoint();
+                            po.setId(StringUtils.getUUID());
+//                            po.setCode(V2Config.getInitialcode());
+                            po.setCode(String.valueOf(sbtable));
+                            sb =new StringBuilder();
+                            sb.append(cs.getName()).append("光伏").append(stp.getName());
+                            po.setName(String.valueOf(sb));
+                            po.setModel(null);
+                            po.setModelId(null);
+                            StringBuilder tempsb=new StringBuilder();
+
+                            if(StringUtils.notEmp(cs.getCode()))
+                            {
+                                tempsb.append(cs.getCode()).append("-2");
+                            }else
+                            {
+                                tempsb.append("-2");
+                            }
+
+                            po.setWindpowerstationId(String.valueOf(tempsb));
+                            po.setUniformCode(stp.getUniformCode());
+
+                            sb =new StringBuilder();
+                            sb.append(cs.getId()).append(".JSFW");
+                            po.setRealtimeId(String.valueOf(sb));
+
+                            points.add(po);
+                        }
+
+                        allpoints.addAll(points);
+                        // windPowerstationTestingPointService.insertBatch(points);
+                    }
+                }
+            }
+        }
+
+
+//        }
+
+
+        /*********************************************场站、项目、线路测点生成*****************************************************/
+
+
+        for (ProBasicWindpowerstation wp : CacheContext.wpls) {
+            List<ProEconTestingPoint> ls=null;
+            if(wp.getId().indexOf("FDC")>=0)
+            {
+                ls=fdpointls;
+
+            }else
+            {
+                ls=gfpointls;
+
+            }
+            createWpPoints(wp, ls, allpoints);
+            createPjPoints(wp, ls, allpoints);
+            createLnPoints(wp, ls, allpoints);
+
+        }
+
+//        if(!allpoints.isEmpty())
+//        {
+//            for(ProBasicWppoint wp:allpoints)
+//            {
+//                windPowerstationTestingPoint2Service.insertSelective(wp);
+//            }
+//        }
+        //创建一个数组用于设置表头
+      //  编号,编码,名称,实时库名称,型号,单位,英文名称,类型编号,所属型号,最大值,最小值,合理最大值,合理最小值,统一编码,短ID,长ID,场站编号,实时配置编号,集团测点编号,具体名称,系数
+        String[] arr = new String[]{"编号", "编码", "名称","实时库名称", "型号", "单位", "英文名称", "类型编号", "所属型号", "最大值", "最小值", "合理最大值",
+                "合理最小值", "统一编码", "短ID", "长ID", "风场编号", "实时配置编号", "集团测点编号", "具体名称", "系数"};
+        String heardName = "场站测点表";
+        //调用Excel导出工具类
+        ExcelExport.exportToPath(allpoints, arr, heardName, 6, "场站测点");
+    }
+
+    @Override
+    public void initalSyz() {
+
+    }
+
+    @Override
+    public void initalDd() throws IOException {
+
+    }
+
+    @Override
+    public void initalFgl() throws IOException {
+
+    }
+
+    private void createWpPoints(ProBasicWindpowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicWppoint> allpoints) {
+        List<ProBasicWppoint> points = new ArrayList<>();
+        for (int i = 0; i < stpointls.size(); i++) {
+
+
+
+            ProEconTestingPoint stp = stpointls.get(i);
+            StringBuilder sb = new StringBuilder();
+//            sb.append(wp.getPhoto());
+            String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+            temp = temp.substring(0, temp.lastIndexOf("_"));
+            temp = temp.substring(temp.lastIndexOf("_")+1);
+            StringBuilder sba = new StringBuilder();
+
+            sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_");
+            if (wp.getId().indexOf("FDC")>=0) {
+
+                String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                temp2=temp2.substring(temp2.indexOf("_")+1);
+                sba.append(temp2).append("FC");
+                sb.append(temp).append("_F").append("_XX_XX_XXXX_");
+            } else if (wp.getId().indexOf("GDC")>=0) {
+                String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                temp2=temp2.substring(temp2.indexOf("_")+1);
+                sba.append(temp2).append("GC");
+                sb.append(temp).append("_G").append("_XX_XX_XXXX_");
+            }
+
+            sb.append("CI");
+            sb.append(stp.getCode());
+            StringBuilder sbtable = new StringBuilder();
+
+
+            sbtable.append(sba).append("JSFW.");
+            sbtable.append(sb);
+
+            ProBasicWppoint po = new ProBasicWppoint();
+            po.setId(StringUtils.getUUID());
+//            po.setCode(V2Config.getInitialcode());
+            po.setCode(String.valueOf(sbtable));
+            sb = new StringBuilder();
+            sb.append(wp.getName()).append(stp.getName());
+            po.setName(String.valueOf(sb));
+            po.setModel(null);
+            po.setModelId(null);
+            po.setWindpowerstationId(wp.getId());
+            po.setUniformCode(stp.getUniformCode());
+
+
+
+            sb = new StringBuilder();
+
+            if (StringUtils.notEmp(wp.getPhoto())) {
+                sb.append(wp.getPhoto().replace("_", "")).append(".JSFW").append(sba);
+            }
+
+            po.setRealtimeId(String.valueOf(sb));
+
+            points.add(po);
+        }
+
+        allpoints.addAll(points);
+        //windPowerstationTestingPointService.insertBatch(points);
+    }
+
+
+    
+
+    private void createPjPoints(ProBasicWindpowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicWppoint> allpoints) {
+
+
+        for (ProBasicProject pj : CacheContext.pjls) {
+            if (pj.getWindpowerstationId().equals(wp.getId())) {
+                List<ProBasicWppoint> points = new ArrayList<>();
+                for (int i = 0; i < stpointls.size(); i++) {
+
+
+                    ProEconTestingPoint stp = stpointls.get(i);
+                    StringBuilder sb = new StringBuilder();
+
+                    String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                    temp = temp.substring(0, temp.lastIndexOf("_"));
+                    temp = temp.substring(temp.lastIndexOf("_")+1);
+                    sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_");
+
+
+                    StringBuilder sba = new StringBuilder();
+
+                    if (wp.getId().indexOf("FDC")>=0) {
+                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                        temp2=temp2.substring(temp2.indexOf("_")+1);
+                        sba.append(temp2).append("FC");
+                        sb.append(temp).append("_F_");
+                        temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                        sb.append("XX_XXXX_");
+                    } else if (wp.getId().indexOf("GDC")>=0) {
+                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                        temp2=temp2.substring(temp2.indexOf("_")+1);
+                        sba.append(temp2).append("GC");
+                        sb.append(temp).append("_G_");
+                        temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                        sb.append("XX_XXXX_");
+                    }
+
+                    sb.append("CI");
+                    sb.append(stp.getCode());
+
+                    StringBuilder sbtable = new StringBuilder();
+
+
+                    sbtable.append(sba).append("JSFW.");
+                    sbtable.append(sb);
+
+                    ProBasicWppoint po = new ProBasicWppoint();
+
+                    po.setId(StringUtils.getUUID());
+
+                    po.setCode(String.valueOf(sbtable));
+                    sb = new StringBuilder();
+                    sb.append(pj.getName()).append(stp.getName());
+                    po.setName(String.valueOf(sb));
+                    po.setModel(null);
+                    po.setModelId(null);
+                    po.setWindpowerstationId(pj.getId());
+                    po.setUniformCode(stp.getUniformCode());
+
+                    sb = new StringBuilder();
+
+                    if (StringUtils.notEmp(wp.getPhoto())) {
+                        sb.append(wp.getPhoto().replace("_", "")).append(".JSFW").append(sba);
+                    }
+
+                    po.setRealtimeId(String.valueOf(sb));
+
+                    points.add(po);
+                }
+                allpoints.addAll(points);
+            }
+        }
+
+    }
+
+    
+
+    private void createLnPoints(ProBasicWindpowerstation wp, List<ProEconTestingPoint> stpointls, List<ProBasicWppoint> allpoints) {
+
+        for (ProBasicLine ln : CacheContext.lnls) {
+            if (CacheContext.pjmap.containsKey(ln.getProjectId())) {
+                ProBasicProject pj = CacheContext.pjmap.get(ln.getProjectId());
+
+                if (pj.getWindpowerstationId().equals(wp.getId())) {
+                    List<ProBasicWppoint> points = new ArrayList<>();
+                    for (int i = 0; i < stpointls.size(); i++) {
+
+
+                        ProEconTestingPoint stp = stpointls.get(i);
+                        StringBuilder sb = new StringBuilder();
+//                        sb.append(wp.getPhoto());
+                        String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_")+1);
+                        sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_");
+
+
+                        StringBuilder sba = new StringBuilder();
+
+                        if (wp.getId().indexOf("FDC")>=0) {
+                            String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                            temp2=temp2.substring(temp2.indexOf("_")+1);
+                            sba.append(temp2).append("FC");
+                            sb.append(temp).append("_F_");
+                            temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                            sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            temp = ln.getId().substring(0, ln.getId().lastIndexOf("_"));
+                            sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            sb.append("XXXX_");
+//                            sb.append(CI);
+                        } else if (wp.getId().indexOf("GDC")>=0) {
+                            String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                            temp2=temp2.substring(temp2.indexOf("_")+1);
+                            sba.append(temp2).append("GC");
+                            sb.append(temp).append("G_");
+                            temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
+                            sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            temp = ln.getId().substring(0, ln.getId().lastIndexOf("_"));
+                            sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                            sb.append("XXXX_");
+//                            sb.append(CI);
+                        }
+
+                        sb.append("CI");
+                        sb.append(stp.getCode());
+
+                        StringBuilder sbtable = new StringBuilder();
+
+                        sbtable.append(sba).append("JSFW.");
+                        sbtable.append(sb);
+
+                        ProBasicWppoint po = new ProBasicWppoint();
+                        po.setId(StringUtils.getUUID());
+
+                        po.setCode(String.valueOf(sbtable));
+                        sb = new StringBuilder();
+                        sb.append(ln.getName()).append(stp.getName());
+                        po.setName(String.valueOf(sb));
+                        po.setModel(null);
+                        po.setModelId(null);
+                        po.setWindpowerstationId(ln.getId());
+                        po.setUniformCode(stp.getUniformCode());
+
+                        sb = new StringBuilder();
+
+                        if (StringUtils.notEmp(wp.getPhoto())) {
+                            sb.append(wp.getPhoto().replace("_", "")).append(".JSFW").append(sba);
+                        }
+
+                        po.setRealtimeId(String.valueOf(sb));
+
+                        
+                        points.add(po);
+                    }
+                    allpoints.addAll(points);
+
+
+                }
+            }
+
+        }
+
+    }
+
+
+
+    public void initalFj() throws IOException {
+
+        // windturbinetestingpointService.deleteAll();
+
+
+
+
+
+        List<ProBasicEquipmentPoint> allpoints = new ArrayList<>();
+
+        List<ProEconTestingPoint>  fdls=proEconTestingPointService.list().stream().filter(i->i.getTypeId().equals("fj") || i.getTypeId().equals("fjjsfw")).collect(Collectors.toList());
+
+        List<ProEconTestingPoint>  gfls=proEconTestingPointService.list().stream().filter(i->i.getTypeId().equals("gf") || i.getTypeId().equals("gfjsfw")).collect(Collectors.toList());
+
+        for (ProBasicWindpowerstation wp : CacheContext.wpls) {
+
+            List<ProEconTestingPoint> ls=null;
+            if(wp.getId().indexOf("FDC")>=0)
+            {
+                ls=fdls;
+
+            }else
+            {
+                ls=gfls;
+
+            }
+            List<ProBasicWindturbine> wtls = CacheContext.wpwtmap.get(wp.getId());
+
+
+            if (!ls.isEmpty() ) {
+                for (ProBasicWindturbine wt : wtls) {
+
+                    List<ProBasicEquipmentPoint> points = new ArrayList<>();
+                    for (int i = 0; i < ls.size(); i++) {
+
+
+                        ProEconTestingPoint stp = ls.get(i);
+                        StringBuilder sb = new StringBuilder();
+//                        sb.append(wp.getPhoto());
+
+                        String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_")+1);
+                        if(wp.getId().indexOf("FDC")>=0)
+                        {
+                            sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_F_");
+                        }else
+                        {
+                            sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_G_");
+                        }
+
+
+                        temp = null;
+                        temp = wt.getProjectId().substring(0, wt.getProjectId().lastIndexOf("_"));
+                        sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+                        temp = wt.getLineId().substring(0, wt.getProjectId().lastIndexOf("_"));
+                        sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
+
+                        temp = wt.getId().substring(wt.getId().lastIndexOf("_")-4,wt.getId().lastIndexOf("_") );
+
+                        if (temp.length() == 1) {
+                            sb.append("000").append(temp).append("_");
+                        } else if (temp.length() == 2) {
+                            sb.append("00").append(temp).append("_");
+                        }else if (temp.length() == 3) {
+                            sb.append("0").append(temp).append("_");
+                        } else {
+                            sb.append(temp).append("_");
+                        }
+
+
+                        sb.append(stp.getCode());
+
+                        sb.append(stp.getCode());
+
+                        StringBuilder sba = new StringBuilder();
+
+                        temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
+                        temp = temp.substring(0, temp.lastIndexOf("_"));
+                        temp = temp.substring(temp.lastIndexOf("_")+1);
+
+                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                        temp2=temp2.substring(temp2.indexOf("_")+1);
+                        if (wp.getId().indexOf("FDC")>=0) {
+                            sba.append(temp2).append("FJ");
+                        } else if (wp.getId().indexOf("GDC")>=0) {
+                            sba.append(temp2).append("GF");
+                        }
+
+                        StringBuilder sbtable = new StringBuilder();
+
+
+                        if (stp.getUniformCode().indexOf("AI")<0 && stp.getUniformCode().indexOf("DI")<0) {
+                            sbtable.append(sba).append("JSFW.");
+                            sbtable.append(sb);
+                        } else {
+                            sbtable.append(sba).append(".");
+                            sbtable.append(sb);
+                        }
+
+                        ProBasicEquipmentPoint po = new ProBasicEquipmentPoint();
+                        po.setId(StringUtils.getUUID());
+//                        po.setCode(V2Config.getInitialcode());
+
+                        if (stp.getUniformCode().indexOf("AI")<0 && stp.getUniformCode().indexOf("DI")<0)
+                        {
+                            po.setCode(String.valueOf(sbtable));
+                        }else
+                        {
+                            po.setCode("INITIAL");
+                        }
+
+                        sb = new StringBuilder();
+                        sb.append(wt.getName()).append(stp.getName());
+                        po.setName(String.valueOf(sb));
+                        po.setModel(wt.getModelId());
+                        po.setModelId(wt.getModelId());
+                        po.setWindturbineId(wt.getId());
+                        po.setUniformCode(stp.getUniformCode());
+                        po.setWindpowerstationId(wt.getWindpowerstationId());
+
+                        if (stp.getUniformCode().indexOf("AI")<0 && stp.getUniformCode().indexOf("DI")<0) {
+                            sb = new StringBuilder();
+
+                            sb.append(wp.getId().substring(0,wp.getId().lastIndexOf("_")).replace("_", "")).append(".JSFW").append(sba);
+
+                            po.setRealtimeId(String.valueOf(sb));
+                        } else {
+                            sb = new StringBuilder();
+
+                            sb.append(wp.getId().substring(0,wp.getId().lastIndexOf("_")).replace("_", "")).append(".").append(sba);
+
+                            po.setRealtimeId(String.valueOf(sb));
+                        }
+
+                        points.add(po);
+
+
+//                               allpoints.addAll(points);
+                    }
+                    allpoints.addAll(points);
+                }
+
+            }
+//            }
+
+
+        }
+
+
+        //创建一个数组用于设置表头
+        String[] arr = new String[]{"编号", "编码", "名称","别名", "型号", "单位", "英文名称", "类型编号", "所属型号", "最大值", "最小值", "合理最大值",
+                "合理最小值", "风机编号", "统一编码", "短ID", "长ID", "风场编号", "实时配置编号"};
+        String heardName = "风机测点表";
+        //调用Excel导出工具类
+        ExcelExport.exportToPath(allpoints, arr, heardName, 6, "风机测点");
+
+    }
+
+
+
+}

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

@@ -81,7 +81,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     StringBuilder sbtable =new StringBuilder();
                     sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
                     sb.append(String.valueOf(sba));
-                    sb.append("XXX_X_XX_XX_XX_XXX_");
+                    sb.append("XXXX_XXX_X_XX_XX_XXXX_");
                     sb.append(CI);
                     sb.append(stp.getOrdernum());
                     if(stp.getCode().equals(CI))
@@ -143,7 +143,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     StringBuilder sbtable =new StringBuilder();
                     sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
                     sb.append(String.valueOf(sba));
-                    sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXX_F_XX_XX_XX_XXX_");
+                    sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_F_XX_XX_XXXX_");
                     sb.append(CI);
                     sb.append(stp.getOrdernum());
                     if(stp.getCode().equals(CI))
@@ -214,7 +214,7 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     StringBuilder sbtable =new StringBuilder();
                     sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
                     sb.append(String.valueOf(sba));
-                    sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXX_G_XX_XX_XX_XXX_");
+                    sb.append(re.getId().substring(0,re.getId().indexOf("_"))).append("_XXXX_XXX_G_XX_XX_XXXX_");
                     sb.append(CI);
                     sb.append(stp.getOrdernum());
                     if(stp.getCode().equals(CI))
@@ -282,10 +282,10 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             ProEconWindpowerStandardPoint stp=stpointls.get(i);
                             StringBuilder sb =new StringBuilder();
                             StringBuilder sbtable =new StringBuilder();
-                            sbtable.append(cs.getId().substring(0,cs.getId().lastIndexOf("_")));
+                            sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
 
                             sb.append(String.valueOf(sba));
-                            sb.append("X_XX_XX_XX_XXX_");
+                            sb.append("XXX_X_XX_XX_XXXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
                             if(stp.getCode().equals(CI))
@@ -348,9 +348,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             ProEconWindpowerStandardPoint stp=stpointls.get(i);
                             StringBuilder sb =new StringBuilder();
                             StringBuilder sbtable =new StringBuilder();
-                            sbtable.append(cs.getId().substring(0,cs.getId().lastIndexOf("_")));
+                            sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
                             sb.append(String.valueOf(sba));
-                            sb.append("F_XX_XX_XX_XXX_");
+                            sb.append("XXX_F_XX_XX_XXXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
                             if(stp.getCode().equals(CI))
@@ -420,9 +420,9 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                             ProEconWindpowerStandardPoint stp=stpointls.get(i);
                             StringBuilder sb =new StringBuilder();
                             StringBuilder sbtable =new StringBuilder();
-                            sbtable.append(cs.getId().substring(0,cs.getId().lastIndexOf("_")));
+                            sbtable.append(re.getId().substring(0,re.getId().indexOf("_")));
                             sb.append(String.valueOf(sba));
-                            sb.append("G_XX_XX_XX_XXX_");
+                            sb.append("XXX_G_XX_XX_XXXX_");
                             sb.append(CI);
                             sb.append(stp.getOrdernum());
                             if(stp.getCode().equals(CI))
@@ -547,11 +547,16 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
             sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_");
             if (wp.getId().indexOf("FDC")>=0) {
-                sba.append(temp);
-                sb.append(temp).append("_F").append("_XX_XX_XXX_");
+
+                String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                temp2=temp2.substring(temp2.indexOf("_")+1);
+                sba.append(temp2).append("FC");
+                sb.append(temp).append("_F").append("_XX_XX_XXXX_");
             } else if (wp.getId().indexOf("GDC")>=0) {
-                sba.append(temp);
-                sb.append(temp).append("_G").append("_XX_XX_XXX_");
+                String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                temp2=temp2.substring(temp2.indexOf("_")+1);
+                sba.append(temp2).append("GC");
+                sb.append(temp).append("_G").append("_XX_XX_XXXX_");
             }
 
             sb.append(CI);
@@ -646,17 +651,21 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                     StringBuilder sba = new StringBuilder();
 
                     if (wp.getId().indexOf("FDC")>=0) {
-                        sba.append(temp);
-                        sb.append(temp).append("_F_").append("JS_");
+                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                        temp2=temp2.substring(temp2.indexOf("_")+1);
+                        sba.append(temp2).append("FC");
+                        sb.append(temp).append("_F_");
                         temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                         sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
-                        sb.append("XX_XXX_");
+                        sb.append("XX_XXXX_");
                     } else if (wp.getId().indexOf("GDC")>=0) {
-                        sba.append(temp);
-                        sb.append(temp).append("_G_").append("JS_");
+                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                        temp2=temp2.substring(temp2.indexOf("_")+1);
+                        sba.append(temp2).append("GC");
+                        sb.append(temp).append("_G_");
                         temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                         sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
-                        sb.append("XX_XXX_");
+                        sb.append("XX_XXXX_");
                     }
 
                     sb.append(CI);
@@ -741,22 +750,26 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         StringBuilder sba = new StringBuilder();
 
                         if (wp.getId().indexOf("FDC")>=0) {
-                            sba.append(temp);
-                            sb.append(temp).append("_F_").append("JS_");
+                            String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                            temp2=temp2.substring(temp2.indexOf("_")+1);
+                            sba.append(temp2).append("FC");
+                            sb.append(temp).append("_F_");
                             temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                             sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
                             temp = ln.getId().substring(0, ln.getId().lastIndexOf("_"));
                             sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
-                            sb.append("XXX_");
+                            sb.append("XXXX_");
 //                            sb.append(CI);
                         } else if (wp.getId().indexOf("GDC")>=0) {
-                            sba.append(temp);
-                            sb.append(temp).append("G_").append("JS_");
+                            String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                            temp2=temp2.substring(temp2.indexOf("_")+1);
+                            sba.append(temp2).append("GC");
+                            sb.append(temp).append("G_");
                             temp = pj.getId().substring(0, pj.getId().lastIndexOf("_"));
                             sb.append("P").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
                             temp = ln.getId().substring(0, ln.getId().lastIndexOf("_"));
                             sb.append("L").append(Integer.valueOf(temp.substring(temp.length() - 2))).append("_");
-                            sb.append("XXX_");
+                            sb.append("XXXX_");
 //                            sb.append(CI);
                         }
 
@@ -821,11 +834,20 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 
         for (ProBasicWindpowerstation wp : CacheContext.wpls) {
 
+            List<ProEconWindturbineStandardPoint> ls=null;
+            if(wp.getId().indexOf("FDC")>=0)
+            {
+                ls=stpointls.stream().filter(i->i.getTypes().equals("FD")).collect(Collectors.toList());
 
+            }else
+            {
+                ls =stpointls.stream().filter(i->i.getTypes().equals("GF")).collect(Collectors.toList());
+
+            }
             List<ProBasicWindturbine> wtls = CacheContext.wpwtmap.get(wp.getId());
 
 
-            if (!stpointls.isEmpty() && wp.getId().indexOf("FDC")>=0) {
+            if (!stpointls.isEmpty() ) {
                 for (ProBasicWindturbine wt : wtls) {
 
 //                    if(wpsmap.containsKey(wt.getModelId()))
@@ -833,17 +855,24 @@ public class InitialPointGoldenXkService implements IinitialPoint {
 //                        List<Windturbinestandardpoints> wpsls=wpsmap.get(wt.getModelId());
 
                     List<ProBasicEquipmentPoint> points = new ArrayList<>();
-                    for (int i = 0; i < stpointls.size(); i++) {
+                    for (int i = 0; i < ls.size(); i++) {
 
 
-                        ProEconWindturbineStandardPoint stp = stpointls.get(i);
+                        ProEconWindturbineStandardPoint stp = ls.get(i);
                         StringBuilder sb = new StringBuilder();
 //                        sb.append(wp.getPhoto());
 
                         String temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
                         temp = temp.substring(0, temp.lastIndexOf("_"));
                         temp = temp.substring(temp.lastIndexOf("_")+1);
-                        sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_F_");
+                        if(wp.getId().indexOf("FDC")>=0)
+                        {
+                            sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_F_");
+                        }else
+                        {
+                            sb.append(wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"))).append("_").append(temp).append("_G_");
+                        }
+
 
                         temp = null;
                         temp = wt.getProjectId().substring(0, wt.getProjectId().lastIndexOf("_"));
@@ -873,10 +902,13 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         temp = wp.getId().substring(0, wp.getId().lastIndexOf("_"));
                         temp = temp.substring(0, temp.lastIndexOf("_"));
                         temp = temp.substring(temp.lastIndexOf("_")+1);
+
+                        String temp2=wp.getCompanyId().substring(0,wp.getCompanyId().lastIndexOf("_"));
+                        temp2=temp2.substring(temp2.indexOf("_")+1);
                         if (wp.getId().indexOf("FDC")>=0) {
-                            sba.append(temp).append("FJ");
+                            sba.append(temp2).append("FJ");
                         } else if (wp.getId().indexOf("GDC")>=0) {
-                            sba.append(temp).append("NBQ");
+                            sba.append(temp2).append("GF");
                         }
 
                         StringBuilder sbtable = new StringBuilder();
@@ -893,7 +925,15 @@ public class InitialPointGoldenXkService implements IinitialPoint {
                         ProBasicEquipmentPoint po = new ProBasicEquipmentPoint();
                         po.setId(StringUtils.getUUID());
 //                        po.setCode(V2Config.getInitialcode());
-                        po.setCode(String.valueOf(sbtable));
+
+                        if(stp.getCode().equals(CI))
+                        {
+                            po.setCode(String.valueOf(sbtable));
+                        }else
+                        {
+                            po.setCode("INITIAL");
+                        }
+
                         sb = new StringBuilder();
                         sb.append(wt.getName()).append(stp.getName());
                         po.setName(String.valueOf(sb));

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

@@ -9,7 +9,7 @@ spring:
     allow-bean-definition-overriding: true #当遇到同样名字的时候，是否允许覆盖注册
   #redis集群
   redis:
-    host: 127.0.0.1
+    host: 120.46.148.180
     port: 6379
     timeout: 100000
     #    集群环境打开下面注释，单机不需要打开