Merge remote-tracking branch 'origin/master'

common/src/main/java/com/gyee/common/contant/Contant.java

@@ -74,7 +74,7 @@ public class Contant {
     public static final String MX012 = "MX012";//离线（光伏关机）
     //判断降出力
     public static final String AI134 = "AI134"; //叶轮转速给定
-//    public static final String AI129 = "AI129"; //转矩给定
+    public static final String AI129 = "AI129"; //转矩给定
     public static final String AI178 = "AI178";//发电状态下的转速给定
     public static final String AI443 = "AI443";//scada有功设定值
 
@@ -251,4 +251,15 @@ public class Contant {
 
 
     public static final String TPOINT_WT_FJZT = "FJZT" ;
+
+    public static final String XDSL = "XDSL" ; //限电受累
+
+    public static final String XDZT = "XDZT" ; //限电状态
+
+    public static final String XCLZT = "XCLZT"; //限出力状态
+
+  //  DI11139 DI10923
+  public static final String DI11139 = "DI11139";
+    public static final String DI10923 = "DI10923";
+
 }

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 与停机事件关联（限电停机时），数据库中无关联，程序控制 前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@RestController
+@RequestMapping("//pro-econ-brownouts-event2")
+public class ProEconBrownoutsEvent2Controller {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-24
+ */
+@RestController
+@RequestMapping("//pro-econ-line-electrical")
+public class ProEconLineElectricalController {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 限电事件主表 前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@RestController
+@RequestMapping("//pro-econ-main-brownouts2")
+public class ProEconMainBrownouts2Controller {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 限电事件主表 前端控制器
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@RestController
+@RequestMapping("//pro-econ-main-brownouts")
+public class ProEconMainBrownoutsController {
+
+}

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

@@ -54,6 +54,8 @@ public class CacheContext implements CommandLineRunner {
     public static List<ProBasicProject> projects = new ArrayList<>();
     public static List<ProBasicLine>  lines = new ArrayList<>();
     public static List<ProBasicWindpowerstation>  wpls = new ArrayList<>();
+
+    public static Map<String,ProBasicWindpowerstation> wpmap = new HashMap<>();
     public static List<ProBasicMeterPoint>  meterpoints = new ArrayList<>();
     public static Map<String,ProBasicMeterPoint>  meterpointMap = new HashMap<>();
     public static Map<String,List<ProBasicProject>> wppromap = new HashMap<>();
@@ -228,6 +230,8 @@ public class CacheContext implements CommandLineRunner {
 
 
         wpls.stream().forEach(wp->{
+
+            wpmap.put(wp.getId(),wp);
             String wpString = redisService.get(wp.getId());
             Map<String, ProBasicWppoint> stringMapMap = JSONObject.parseObject(wpString, new TypeReference<Map<String, ProBasicWppoint>>() {
             });

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProBasicCompany;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 省公司表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+public interface ProBasicCompanyMapper extends BaseMapper<ProBasicCompany> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicEnergyGroupMapper extends BaseMapper<ProBasicEnergyGroup> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicEquipmentPointMapper extends BaseMapper<ProBasicEquipmentPoint> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicLineMapper extends BaseMapper<ProBasicLine> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicProjectMapper extends BaseMapper<ProBasicProject> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicRegionMapper extends BaseMapper<ProBasicRegion> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProBasicSquare;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 方阵 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+public interface ProBasicSquareMapper extends BaseMapper<ProBasicSquare> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicWindpowerstationMapper extends BaseMapper<ProBasicWindpowerstation> {
 

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 变电所 Mapper 接口
+ * 调度场站名称 Mapper 接口
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicWindsubStationMapper extends BaseMapper<ProBasicWindsubStation> {
 

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 风机 Mapper 接口
+ * 风机&光伏 Mapper 接口
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicWindturbineMapper extends BaseMapper<ProBasicWindturbine> {
 

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

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 场站测点 Mapper 接口
+ * 场站测点，期次测点，线路测点，三级公司测点，区域测点
+
+
+
++方阵测点 Mapper 接口
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface ProBasicWppointMapper extends BaseMapper<ProBasicWppoint> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconBrownoutsEvent2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 与停机事件关联（限电停机时），数据库中无关联，程序控制 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface ProEconBrownoutsEvent2Mapper extends BaseMapper<ProEconBrownoutsEvent2> {
+
+}

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
 /**
  * <p>
- * 设备型号 Mapper 接口
+ *  Mapper 接口
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 public interface ProEconEquipmentmodelMapper extends BaseMapper<ProEconEquipmentmodel> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconLineElectrical;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-24
+ */
+public interface ProEconLineElectricalMapper extends BaseMapper<ProEconLineElectrical> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 public interface ProEconLogicalUnitMapper extends BaseMapper<ProEconLogicalUnit> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconMainBrownouts2;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 限电事件主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface ProEconMainBrownouts2Mapper extends BaseMapper<ProEconMainBrownouts2> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.mapper.auto;
+
+import com.gyee.generation.model.auto.ProEconMainBrownouts;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ * 限电事件主表 Mapper 接口
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface ProEconMainBrownoutsMapper extends BaseMapper<ProEconMainBrownouts> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 public interface ProEconTestingPointMapper extends BaseMapper<ProEconTestingPoint> {
 

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

@@ -0,0 +1,167 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 省公司表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicCompany extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 别名
+     */
+    private String aname;
+
+    /**
+     * 风电装机容量
+     */
+    private Double windCapacity;
+
+    /**
+     * 风电容量单位
+     */
+    private String windCapacityUnit;
+
+    /**
+     * 风电装机数量
+     */
+    private Integer windQuantity;
+
+    /**
+     * 光伏装机容量
+     */
+    private Double capacity;
+
+    /**
+     * 光伏容量单位
+     */
+    private String capacityUnit;
+
+    /**
+     * 光伏装机数量集中
+     */
+    private Integer quantityJz;
+
+    /**
+     * 光伏装机数量组串
+     */
+    private Integer quantityZc;
+
+    /**
+     * 接入风电装机容量
+     */
+    private Double jrwindCapacity;
+
+    /**
+     * 接入风电容量单位
+     */
+    private String jrwindCapacityUnit;
+
+    /**
+     * 接入风电装机数量
+     */
+    private Integer jrwindQuantity;
+
+    /**
+     * 接入光伏装机容量
+     */
+    private Double jrCapacity;
+
+    /**
+     * 接入光伏容量单位
+     */
+    private String jrCapacityUnit;
+
+    /**
+     * 接入光伏装机数量集中
+     */
+    private Integer jrquantityJz;
+
+    /**
+     * 接入光伏装机数量组串
+     */
+    private Integer jrquantityZc;
+
+    /**
+     * 顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 风电场站数量
+     */
+    private Integer windNumber;
+
+    /**
+     * 光伏场站数量
+     */
+    private Integer number;
+
+    /**
+     * 接入风电场站数量
+     */
+    private Integer jrWindNumber;
+
+    /**
+     * 接入光伏场站数量
+     */
+    private Integer jrNumber;
+
+    /**
+     * 区域编号
+     */
+    private String regionId;
+
+    /**
+     * 集团编号
+     */
+    private String groupId;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -1,6 +1,5 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -24,6 +23,8 @@ public class ProBasicEnergyGroup extends Model {
      */
     private String id;
 
+    private String parentid;
+
     /**
      * 名称
      */
@@ -129,5 +130,30 @@ public class ProBasicEnergyGroup extends Model {
      */
     private Integer jrNumber;
 
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
 
 }

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

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -108,5 +108,20 @@ public class ProBasicEquipmentPoint extends Model {
      */
     private String realtimeId;
 
+    /**
+     * 部件编号
+     */
+    private String logicalUnitId;
+
+    /**
+     * 集团测点编号
+     */
+    private String groupPointId;
+
+    /**
+     * 具体名称
+     */
+    private String specificName;
+
 
 }

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

@@ -1,6 +1,5 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -64,7 +63,30 @@ public class ProBasicLine extends Model {
      */
     private Integer quantity;
 
+    /**
+     * 是否可用
+     */
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
 
 }

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

@@ -1,18 +1,18 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
+
 /**
  * <p>
  * 工程表
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -68,7 +68,7 @@ public class ProBasicProject extends Model {
     /**
      * 投产日期
      */
-    private Date commissionDate;
+    private LocalDate commissionDate;
 
     /**
      * 主控电话
@@ -95,7 +95,30 @@ public class ProBasicProject extends Model {
      */
     private String windsubStationId;
 
+    /**
+     * 是否可用
+     */
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
 
 }

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

@@ -1,6 +1,5 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -130,11 +129,29 @@ public class ProBasicRegion extends Model {
     private Integer jrNumber;
 
     /**
-     * 集团编号
+     * 是否可用
      */
-    private String groupId;
-
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
 
 }

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

@@ -0,0 +1,82 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 方阵
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProBasicSquare extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    private String id;
+
+    /**
+     * 编码
+     */
+    private String code;
+
+    /**
+     * 风场编号(冗余)
+     */
+    private String windpowerstationId;
+
+    /**
+     * 工程编号(冗余)
+     */
+    private String projectId;
+
+    /**
+     * 风电线编号
+     */
+    private String lineId;
+
+    /**
+     * 名称
+     */
+    private String name;
+
+    /**
+     * 接入类型
+     */
+    private String types;
+
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
+
+}

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

@@ -1,6 +1,5 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -129,7 +128,30 @@ public class ProBasicWindpowerstation extends Model {
      */
     private String groupId;
 
+    /**
+     * 是否可用
+     */
     private Integer isAble;
 
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
 
 }

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

@@ -6,11 +6,11 @@ import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 变电所
+ * 调度场站名称
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -48,5 +48,30 @@ public class ProBasicWindsubStation extends Model {
      */
     private Integer orderNum;
 
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
+
 
 }

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

@@ -1,20 +1,18 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
-
-
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.time.LocalDate;
+
 /**
  * <p>
- * 风机
+ * 风机&光伏
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -70,7 +68,7 @@ public class ProBasicWindturbine extends Model {
     /**
      * 首次并网时间
      */
-    private Date firstIntegratedTime;
+    private LocalDate firstIntegratedTime;
 
     /**
      * 图片
@@ -97,7 +95,39 @@ public class ProBasicWindturbine extends Model {
      */
     private String companyId;
 
-    private Integer isAble;
+    /**
+     * 是否可用
+     */
+    private Integer isable;
+
+    /**
+     * 0：风机；1：集中；2：组串
+     */
+    private Integer equipmentCategory;
+
+    private String parentId;
+
+    private String squareId;
+
+    /**
+     * 备用1
+     */
+    private String spare1;
+
+    /**
+     * 备用2
+     */
+    private String spare2;
+
+    /**
+     * 备用3
+     */
+    private String spare3;
+
+    /**
+     * 备用4
+     */
+    private String spare4;
 
 
 }

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

@@ -1,17 +1,20 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 场站测点
+ * 场站测点，期次测点，线路测点，三级公司测点，区域测点
+
+
+
++方阵测点
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -80,6 +83,11 @@ public class ProBasicWppoint extends Model {
     private Double reasonableMinval;
 
     /**
+     * 风机编号
+     */
+    private String windturbineId;
+
+    /**
      * 统一编码
      */
     private String uniformCode;
@@ -104,5 +112,15 @@ public class ProBasicWppoint extends Model {
      */
     private String realtimeId;
 
+    /**
+     * 集团测点编号
+     */
+    private String groupPointId;
+
+    /**
+     * 具体名称
+     */
+    private String specificName;
+
 
 }

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

@@ -1,11 +1,14 @@
 package com.gyee.generation.model.auto;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 与停机事件关联（限电停机时），数据库中无关联，程序控制
@@ -23,6 +26,7 @@ public class ProEconBrownoutsEvent extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private String id;
 
     /**

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

@@ -0,0 +1,117 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 与停机事件关联（限电停机时），数据库中无关联，程序控制
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconBrownoutsEvent2 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 停机时间
+     */
+    private String windturbineId;
+
+    /**
+     * 停机时间
+     */
+    private Date stopTime;
+
+    /**
+     * 恢复启动时间
+     */
+    private Date startTime;
+
+    /**
+     * 停机小时数
+     */
+    private Double stopHours;
+
+    /**
+     * 损失电量
+     */
+    private Double lossPower;
+
+    /**
+     * 故障停机、维护停机、限电停机、复位停机
+     */
+    private String stopTypeId;
+
+    /**
+     * 是否处理
+     */
+    private Integer isHandle;
+
+    /**
+     * 停机事件编号
+     */
+    private String shutdownEventId;
+
+    /**
+     * 工程编号
+     */
+    private String projectId;
+
+    /**
+     * 主表ID
+     */
+    private String mainId;
+
+    /**
+     * 限电负荷
+     */
+    private Double limitLoad;
+
+    /**
+     * 限电指令
+     */
+    private String brownoutsDirective;
+
+    /**
+     * 当时风速
+     */
+    private Double windSpeed;
+
+    /**
+     * 当时负荷
+     */
+    private Double thisLoad;
+
+    /**
+     * 限电原因
+     */
+    private String stopReason;
+
+    /**
+     * 线路编号
+     */
+    private String lineId;
+
+
+}

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

@@ -1,17 +1,16 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 /**
  * <p>
- * 设备型号
+ * 
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -1,11 +1,14 @@
 package com.gyee.generation.model.auto;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 切入切出风速整合
@@ -23,6 +26,7 @@ public class ProEconInOrOutSpeedTotal extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Integer id;
 
     /**

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

@@ -1,11 +1,14 @@
 package com.gyee.generation.model.auto;
 
 
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.extension.activerecord.Model;
-import java.util.Date;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import java.util.Date;
+
 /**
  * <p>
  * 切入切出风速整合２
@@ -23,6 +26,7 @@ public class ProEconInOrOutSpeedTotal2 extends Model {
     /**
      * 编号
      */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
     private Integer id;
 
     /**

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

@@ -0,0 +1,48 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconLineElectrical extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    private String id;
+
+    private String lineId;
+
+    private String windpowerstationId;
+
+    private String lineCode;
+
+    private String netLowCode;
+
+    private String netHighCode;
+
+    private String netOutCode;
+
+    private String accidentSignal;
+
+    private String ptvoltageCode;
+
+    private Double ptvoltageLow;
+
+    private Double ptvoltageHigh;
+
+    private String ptcurrentCode;
+
+    private Double ptcurrent;
+
+
+}

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

@@ -10,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)

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

@@ -0,0 +1,92 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+
+/**
+ * <p>
+ * 限电事件主表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconMainBrownouts extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 停机时间
+     */
+    private Date stopTime;
+
+    /**
+     * 恢复启动时间
+     */
+    private Date startTime;
+
+    /**
+     * 故障停机、维护停机、限电停机、复位停机
+     */
+    private String stopTypeId;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 限电负荷
+     */
+    private Double limitLoad;
+
+    /**
+     * 限电指令
+     */
+    private String brownoutsDirective;
+
+    /**
+     * 当时风速
+     */
+    private Double windSpeed;
+
+    /**
+     * 当时负荷
+     */
+    private Double thisLoad;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 风场名称
+     */
+    private String wpName;
+
+    /**
+     * 损失电量
+     */
+    private Double lossPower;
+    /**
+     * 停机时长
+     */
+    private Double stopHours;
+
+
+}

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

@@ -0,0 +1,92 @@
+package com.gyee.generation.model.auto;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.extension.activerecord.Model;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
+
+/**
+ * <p>
+ * 限电事件主表
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class ProEconMainBrownouts2 extends Model {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 编号
+     */
+    @TableId(value = "ID",type = IdType.ASSIGN_ID)
+    private String id;
+
+    /**
+     * 停机时间
+     */
+    private Date stopTime;
+
+    /**
+     * 恢复启动时间
+     */
+    private Date startTime;
+
+    /**
+     * 故障停机、维护停机、限电停机、复位停机
+     */
+    private String stopTypeId;
+
+    /**
+     * 描述
+     */
+    private String description;
+
+    /**
+     * 限电负荷
+     */
+    private Double limitLoad;
+
+    /**
+     * 限电指令
+     */
+    private String brownoutsDirective;
+
+    /**
+     * 当时风速
+     */
+    private Double windSpeed;
+
+    /**
+     * 当时负荷
+     */
+    private Double thisLoad;
+
+    /**
+     * 风场编号
+     */
+    private String windpowerstationId;
+
+    /**
+     * 风场名称
+     */
+    private String wpName;
+
+    /**
+     * 损失电量
+     */
+    private Double lossPower;
+
+    /**
+     * 停机时长
+     */
+    private Double stopHours;
+
+
+}

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

@@ -1,6 +1,5 @@
 package com.gyee.generation.model.auto;
 
-
 import com.baomidou.mybatisplus.extension.activerecord.Model;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
@@ -11,7 +10,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -75,14 +74,11 @@ public class ProEconTestingPoint extends Model {
     private Double reasonableMinval;
 
     /**
-     * 型号编号
-     */
-    private String modelId;
-
-    /**
      * 统一编码
      */
     private String uniformCode;
 
+    private String logicalUnitId;
+
 
 }

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProBasicCompany;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 省公司表 服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+public interface IProBasicCompanyService extends IService<ProBasicCompany> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicEnergyGroupService extends IService<ProBasicEnergyGroup> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicEquipmentPointService extends IService<ProBasicEquipmentPoint> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicLineService extends IService<ProBasicLine> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicProjectService extends IService<ProBasicProject> {
 

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicRegionService extends IService<ProBasicRegion> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProBasicSquare;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 方阵 服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+public interface IProBasicSquareService extends IService<ProBasicSquare> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicWindpowerstationService extends IService<ProBasicWindpowerstation> {
 

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 变电所 服务类
+ * 调度场站名称 服务类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicWindsubStationService extends IService<ProBasicWindsubStation> {
 

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 风机 服务类
+ * 风机&光伏 服务类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicWindturbineService extends IService<ProBasicWindturbine> {
 

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

@@ -5,11 +5,15 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 场站测点 服务类
+ * 场站测点，期次测点，线路测点，三级公司测点，区域测点
+
+
+
++方阵测点 服务类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 public interface IProBasicWppointService extends IService<ProBasicWppoint> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconBrownoutsEvent2;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface IProEconBrownoutsEvent2Service extends IService<ProEconBrownoutsEvent2> {
+
+}

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

@@ -5,11 +5,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
 
 /**
  * <p>
- * 设备型号 服务类
+ *  服务类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 public interface IProEconEquipmentmodelService extends IService<ProEconEquipmentmodel> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconLineElectrical;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-24
+ */
+public interface IProEconLineElectricalService extends IService<ProEconLineElectrical> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 public interface IProEconLogicalUnitService extends IService<ProEconLogicalUnit> {
 

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconMainBrownouts2;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 限电事件主表 服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface IProEconMainBrownouts2Service extends IService<ProEconMainBrownouts2> {
+
+}

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

@@ -0,0 +1,16 @@
+package com.gyee.generation.service.auto;
+
+import com.gyee.generation.model.auto.ProEconMainBrownouts;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 限电事件主表 服务类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+public interface IProEconMainBrownoutsService extends IService<ProEconMainBrownouts> {
+
+}

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

@@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 public interface IProEconTestingPointService extends IService<ProEconTestingPoint> {
 

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProBasicCompany;
+import com.gyee.generation.mapper.auto.ProBasicCompanyMapper;
+import com.gyee.generation.service.auto.IProBasicCompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 省公司表 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+@Service
+public class ProBasicCompanyServiceImpl extends ServiceImpl<ProBasicCompanyMapper, ProBasicCompany> implements IProBasicCompanyService {
+
+}

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicEnergyGroupServiceImpl extends ServiceImpl<ProBasicEnergyGroupMapper, ProBasicEnergyGroup> implements IProBasicEnergyGroupService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicEquipmentPointServiceImpl extends ServiceImpl<ProBasicEquipmentPointMapper, ProBasicEquipmentPoint> implements IProBasicEquipmentPointService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicLineServiceImpl extends ServiceImpl<ProBasicLineMapper, ProBasicLine> implements IProBasicLineService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicProjectServiceImpl extends ServiceImpl<ProBasicProjectMapper, ProBasicProject> implements IProBasicProjectService {

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper, ProBasicRegion> implements IProBasicRegionService {

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProBasicSquare;
+import com.gyee.generation.mapper.auto.ProBasicSquareMapper;
+import com.gyee.generation.service.auto.IProBasicSquareService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 方阵 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-26
+ */
+@Service
+public class ProBasicSquareServiceImpl extends ServiceImpl<ProBasicSquareMapper, ProBasicSquare> implements IProBasicSquareService {
+
+}

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicWindpowerstationServiceImpl extends ServiceImpl<ProBasicWindpowerstationMapper, ProBasicWindpowerstation> implements IProBasicWindpowerstationService {

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

@@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 变电所 服务实现类
+ * 调度场站名称 服务实现类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicWindsubStationServiceImpl extends ServiceImpl<ProBasicWindsubStationMapper, ProBasicWindsubStation> implements IProBasicWindsubStationService {

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

@@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 风机 服务实现类
+ * 风机&光伏 服务实现类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturbineMapper, ProBasicWindturbine> implements IProBasicWindturbineService {

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

@@ -8,11 +8,15 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 场站测点 服务实现类
+ * 场站测点，期次测点，线路测点，三级公司测点，区域测点
+
+
+
++方阵测点 服务实现类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-26
  */
 @Service
 public class ProBasicWppointServiceImpl extends ServiceImpl<ProBasicWppointMapper, ProBasicWppoint> implements IProBasicWppointService {

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconBrownoutsEvent2;
+import com.gyee.generation.mapper.auto.ProEconBrownoutsEvent2Mapper;
+import com.gyee.generation.service.auto.IProEconBrownoutsEvent2Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 与停机事件关联（限电停机时），数据库中无关联，程序控制 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@Service
+public class ProEconBrownoutsEvent2ServiceImpl extends ServiceImpl<ProEconBrownoutsEvent2Mapper, ProEconBrownoutsEvent2> implements IProEconBrownoutsEvent2Service {
+
+}

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

@@ -8,11 +8,11 @@ import org.springframework.stereotype.Service;
 
 /**
  * <p>
- * 设备型号 服务实现类
+ *  服务实现类
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 @Service
 public class ProEconEquipmentmodelServiceImpl extends ServiceImpl<ProEconEquipmentmodelMapper, ProEconEquipmentmodel> implements IProEconEquipmentmodelService {

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconLineElectrical;
+import com.gyee.generation.mapper.auto.ProEconLineElectricalMapper;
+import com.gyee.generation.service.auto.IProEconLineElectricalService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-24
+ */
+@Service
+public class ProEconLineElectricalServiceImpl extends ServiceImpl<ProEconLineElectricalMapper, ProEconLineElectrical> implements IProEconLineElectricalService {
+
+}

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 @Service
 public class ProEconLogicalUnitServiceImpl extends ServiceImpl<ProEconLogicalUnitMapper, ProEconLogicalUnit> implements IProEconLogicalUnitService {

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconMainBrownouts2;
+import com.gyee.generation.mapper.auto.ProEconMainBrownouts2Mapper;
+import com.gyee.generation.service.auto.IProEconMainBrownouts2Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 限电事件主表 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@Service
+public class ProEconMainBrownouts2ServiceImpl extends ServiceImpl<ProEconMainBrownouts2Mapper, ProEconMainBrownouts2> implements IProEconMainBrownouts2Service {
+
+}

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

@@ -0,0 +1,20 @@
+package com.gyee.generation.service.auto.impl;
+
+import com.gyee.generation.model.auto.ProEconMainBrownouts;
+import com.gyee.generation.mapper.auto.ProEconMainBrownoutsMapper;
+import com.gyee.generation.service.auto.IProEconMainBrownoutsService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 限电事件主表 服务实现类
+ * </p>
+ *
+ * @author shilin
+ * @since 2022-10-25
+ */
+@Service
+public class ProEconMainBrownoutsServiceImpl extends ServiceImpl<ProEconMainBrownoutsMapper, ProEconMainBrownouts> implements IProEconMainBrownoutsService {
+
+}

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

@@ -12,7 +12,7 @@ import org.springframework.stereotype.Service;
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 @Service
 public class ProEconTestingPointServiceImpl extends ServiceImpl<ProEconTestingPointMapper, ProEconTestingPoint> implements IProEconTestingPointService {

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

@@ -9,6 +9,7 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.vo.RealTimeParameterVo;
 import com.gyee.generation.util.realtimesource.timeseries.ErrorRequest;
 import com.gyee.generation.util.realtimesource.timeseries.JsonObjectHelper;
 import org.springframework.beans.factory.annotation.Value;
@@ -1312,5 +1313,36 @@ public class EdosUtil implements IEdosUtil {
         }
     }
 
+    @Override
+    public void sendMultiRealTimeParamete(List<RealTimeParameterVo> pointls) throws Exception {
+
+        String url = baseURL + "/latest/batch";
+        List<JSONObject> writeList = new ArrayList<>();
+
+        for (RealTimeParameterVo entity : pointls) {
+            writeList.add(convertRealTimeParamete(entity));
+        }
+        try {
+            String result = restTemplate.postForObject(url, writeList, String.class);
+        } catch (HttpClientErrorException exception) {
+            if (exception.getStatusCode() == HttpStatus.NOT_FOUND) {
+                System.out.println("404请求错误");
+            } else {
+                throw exception;
+            }
+        }
+    }
+
+
+    private JSONObject convertRealTimeParamete(RealTimeParameterVo pd) {
+        JSONObject jo = new JSONObject();
+        jo.put("tagName", pd.getPoint());
+        JSONObject joo = new JSONObject();
+        joo.put("ts", pd.getTime().getTime());
+        joo.put("status", 0);
+        joo.put("doubleValue", pd.getInsertValue());
+        jo.put("tsData", joo);
+        return jo;
+    }
 
 }

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

@@ -9,6 +9,7 @@ import com.gyee.common.model.PointData;
 import com.gyee.common.model.StringUtils;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.vo.RealTimeParameterVo;
 import com.gyee.generation.util.realtimesource.timeseries.ErrorRequest;
 import com.gyee.generation.util.realtimesource.timeseries.JsonObjectHelper;
 import org.springframework.beans.factory.annotation.Value;
@@ -1312,5 +1313,10 @@ public class EdosUtilTd implements IEdosUtil {
         }
     }
 
+    @Override
+    public void sendMultiRealTimeParamete(List<RealTimeParameterVo> pointls) throws Exception {
+
+    }
+
 
 }

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

@@ -6,6 +6,7 @@ import com.gyee.common.model.DNAVal;
 import com.gyee.common.model.PointData;
 import com.gyee.generation.model.auto.ProBasicEquipmentPoint;
 import com.gyee.generation.model.auto.ProBasicWppoint;
+import com.gyee.generation.model.vo.RealTimeParameterVo;
 
 import java.util.List;
 import java.util.Map;
@@ -259,4 +260,7 @@ public interface IEdosUtil {
      */
     public DNAVal[] getHistMatrix(String[] nameList, int tTime) throws Exception;
 
+
+    public void sendMultiRealTimeParamete(List<RealTimeParameterVo> pointls) throws Exception ;
+
 }

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/BackConfigService.java

@@ -84,7 +84,7 @@ public class BackConfigService {
             queryWrapper.eq("id", id);
         }
         if (StringUtils.isNotNull(projectid) && !projectid.equals("")) {
-            queryWrapper.eq("projectid", projectid);
+            queryWrapper.like("projectid", projectid);
         }
         if (StringUtils.isNotNull(generatingcapacity) && !generatingcapacity.equals("")) {
             queryWrapper.eq("generatingcapacity", generatingcapacity);
@@ -99,7 +99,7 @@ public class BackConfigService {
             queryWrapper.eq("month", month);
         }
         if (StringUtils.isNotNull(windpower) && !windpower.equals("")) {
-            queryWrapper.eq("windpower", windpower);
+            queryWrapper.like("windpower", windpower);
         }
 
         Page<Projectplan> page1 = ProjectplanService.page(page, queryWrapper);

web/backmanagerconfig/src/main/java/com/gyee/backconfig/service/auto/impl/RegionServiceImpl.java

@@ -33,7 +33,7 @@ public class RegionServiceImpl extends ServiceImpl<RegionMapper, Region> impleme
         }
 
         if (StringUtils.isNotEmpty(name)){
-            qw.eq("name",name);
+            qw.like("name",name);
         }
 
         if (StringUtils.isNotEmpty(companyid)){

web/monitor-web-sxjn/src/main/java/com/gyee/frame/service/websocket/GenreSetPushService.java

@@ -60,6 +60,8 @@ public class GenreSetPushService {
     private final String GF = "-2";
     private final String DEFAULT_FDC = "MHS_FDC";
     private final double YCFDLXS = 1.08;
+    private final double NYCFDLXS = 1.02;
+    private final double RYCFDLXS = 1.03;
     IRealTimeDataBaseUtil realApiUtil = RealTimeDataBaseFactory.createRealTimeDataBase();
 
 
@@ -1804,13 +1806,29 @@ public class GenreSetPushService {
 
                 double fd_r_ycdl=0;
                 double fd_y_ycdl=0;
+                double fd_n_ycdl=0;
                 double gf_r_ycdl=0;
                 double gf_y_ycdl=0;
+                double gf_n_ycdl=0;
 
                 double fd_r_fdl=0;
                 double fd_y_fdl=0;
+                double fd_n_fdl=0;
                 double gf_r_fdl=0;
                 double gf_y_fdl=0;
+                double gf_n_fdl=0;
+
+
+
+                double fd_y_jhfdl=0;
+                double fd_n_jhfdl=0;
+                double gf_y_jhfdl=0;
+                double gf_n_jhfdl=0;
+
+                double jr_fd_sjgl=0;
+                double jr_gf_sjgl=0;
+                double jr_fd_zygl=0;
+                double jr_gf_zygl=0;
 
 
                 List<CompanysPG> compgls= companysPGService.findCompanysPG();
@@ -1819,33 +1837,33 @@ public class GenreSetPushService {
                     CompanysPG pg=compgls.get(0);
 
                     //清洁能源风电装机容量
-                     qjny_fd_zjrl=null!=pg.getWindcapacity()?pg.getWindcapacity():0.0;
+                    qjny_fd_zjrl=null!=pg.getWindcapacity()?pg.getWindcapacity():0.0;
                     //清洁能源光伏装机容量
-                     qjny_gf_zjrl=null!=pg.getCapacity()?pg.getCapacity():0.0;
+                    qjny_gf_zjrl=null!=pg.getCapacity()?pg.getCapacity():0.0;
                     //接入风电装机容量
-                     jr_fd_zjrl=null!=pg.getJrwindcapacity()?pg.getJrwindcapacity():0.0;
+                    jr_fd_zjrl=null!=pg.getJrwindcapacity()?pg.getJrwindcapacity():0.0;
                     //接入光伏装机容量
-                     jr_gf_zjrl=null!=pg.getJrcapacity()?pg.getJrcapacity():0.0;
+                    jr_gf_zjrl=null!=pg.getJrcapacity()?pg.getJrcapacity():0.0;
                     //清洁能源风场数量
-                     qjny_fcts=null!=pg.getWindnumber()?pg.getWindnumber():0.0;
+                    qjny_fcts=null!=pg.getWindnumber()?pg.getWindnumber():0.0;
                     //清洁能源光伏电站数量
-                     qjny_gfts=null!=pg.getNumber()?pg.getNumber():0.0;
+                    qjny_gfts=null!=pg.getNumber()?pg.getNumber():0.0;
                     //接入风场数量
-                     jr_fcts=null!=pg.getJrwindnumber()?pg.getJrwindnumber():0.0;
+                    jr_fcts=null!=pg.getJrwindnumber()?pg.getJrwindnumber():0.0;
                     //接入光伏电站数量
-                     jr_gfts=null!=pg.getJrnumber()?pg.getJrnumber():0.0;
+                    jr_gfts=null!=pg.getJrnumber()?pg.getJrnumber():0.0;
                     //清洁能源风机数量
-                     qjny_fj_ts=null!=pg.getWindquantity()?pg.getWindquantity():0.0;
+                    qjny_fj_ts=null!=pg.getWindquantity()?pg.getWindquantity():0.0;
                     //清洁能源光伏组串数量
-                     qjny_gf_zcts=null!=pg.getQuantityzc()?pg.getQuantityzc():0.0;
+                    qjny_gf_zcts=null!=pg.getQuantityzc()?pg.getQuantityzc():0.0;
                     //清洁能源光伏集中数量
-                     qjny_gf_jzts=null!=pg.getQuantityjz()?pg.getQuantityjz():0.0;
+                    qjny_gf_jzts=null!=pg.getQuantityjz()?pg.getQuantityjz():0.0;
                     //接入风机数量
-                     jr_fj_ts=null!=pg.getJrwindquantity()?pg.getJrwindquantity():0.0;
+                    jr_fj_ts=null!=pg.getJrwindquantity()?pg.getJrwindquantity():0.0;
                     //接入光伏组串数量
-                     jr_gf_zcts=null!=pg.getJrquantityzc()?pg.getJrquantityzc():0.0;
+                    jr_gf_zcts=null!=pg.getJrquantityzc()?pg.getJrquantityzc():0.0;
                     //接入光伏集中数量
-                     jr_gf_jzts=null!=pg.getJrquantityjz()?pg.getJrquantityjz():0.0;
+                    jr_gf_jzts=null!=pg.getJrquantityjz()?pg.getJrquantityjz():0.0;
                 }
 
                 Calendar c = Calendar.getInstance();
@@ -1853,39 +1871,137 @@ public class GenreSetPushService {
                 c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
                 int daynum = c.get(Calendar.DAY_OF_MONTH);
 
+/**********************************************首页电量统计**********************************************************/
+                Calendar cal = Calendar.getInstance();
+                cal.setTime(new Date());
+                int year = cal.get(Calendar.YEAR);
+
+                List<ProjectPlan> pjls = projectPlanService.getProjectPlanList(String.valueOf(year));
+
+                // 获取计划发电量信息
+                Map<String, Map<String, Double>> planmap=new HashMap<>();
+
+                setPlanInfoByType(planmap, pjls, id);
+
+
                 Map<String, Double> sftjmap = new HashMap<>();//省份装机容量和台数统计
                 for (Windpowerstation wp : wplist) {
-                    String rfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL).getCode();
 
-                    String yfdlpoint=windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL).getCode();
 
+                    if(InitialRunner.wpPointmap.containsKey(wp.getId()))
+                    {
+                        List<String> jczbls = new ArrayList<>();
 
-                    PointData rfdldata = realApiUtil.getRealData(rfdlpoint);
-                    PointData yfdldata = realApiUtil.getRealData(yfdlpoint);
+                        jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_SJGL).getCode());
+                        jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_RFDL).getCode());
+                        jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_YFDL).getCode());
+                        jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_NFDL).getCode());
+                        jczbls.add(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(wp.getId(), Constant.TPOINT_WP_ZZYGL).getCode());
 
-                    double rfdl=MathUtil.twoBit(rfdldata.getPointValueInDouble()/10000);
-                    double yfdl=MathUtil.twoBit(yfdldata.getPointValueInDouble()/10000);
 
-                    if(wp.getId().endsWith("FDC"))
-                    {
-                        fd_r_ycdl =fd_r_ycdl+(rfdl * YCFDLXS) ;
-                        fd_r_fdl =fd_r_fdl+rfdl;
-                        c = Calendar.getInstance();
-                        double yycfdl = (yfdl + fd_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
-                        fd_y_ycdl=fd_y_ycdl+yycfdl;
-                        fd_y_fdl=fd_y_fdl+yfdl;
-                    }else
-                    {
-                        gf_r_ycdl =gf_r_ycdl+(rfdl * YCFDLXS) ;
-                        gf_r_fdl =gf_r_fdl+rfdl ;
-                        c = Calendar.getInstance();
-                        double yycfdl = (yfdl + gf_r_ycdl * (daynum - c.get(Calendar.DAY_OF_MONTH))) * YCFDLXS;
-                        gf_y_ycdl=gf_y_ycdl+yycfdl;
-                        gf_y_fdl=gf_y_fdl+yfdl;
+
+                        double rfdl = 0.0;
+                        double yfdl = 0.0;
+                        double nfdl = 0.0;
+                        double zygl = 0.0;
+                        List<PointData> jczblist = realApiUtil.getRealData(jczbls);
+
+                        if (!jczblist.isEmpty() && jczblist.size() == jczbls.size()) {
+                            //实际功率
+                            sjgl = MathUtil.twoBit(jczblist.get(0).getPointValueInDouble()/1000);
+                            //日发电量
+                            rfdl = MathUtil.twoBit(jczblist.get(1).getPointValueInDouble()/10000);
+                            //月发电量
+                            yfdl = MathUtil.twoBit(jczblist.get(2).getPointValueInDouble()/10000);
+                            //年发电量
+                            nfdl = MathUtil.twoBit(jczblist.get(3).getPointValueInDouble()/10000);
+                            //最优功率
+                            zygl = MathUtil.twoBit(jczblist.get(4).getPointValueInDouble()/1000);
+
+
+                            if(wp.getId().endsWith("FDC"))
+                            {
+
+                                fd_r_fdl =fd_r_fdl+rfdl;
+                                fd_y_fdl=fd_y_fdl+yfdl;
+                                fd_n_fdl=fd_n_fdl+nfdl;
+
+
+
+                                jr_fd_sjgl=jr_fd_sjgl+sjgl;
+                                jr_fd_zygl=jr_fd_zygl+zygl;
+                            }else
+                            {
+
+                                gf_r_fdl =gf_r_fdl+rfdl ;
+                                gf_y_fdl=gf_y_fdl+yfdl;
+                                gf_n_fdl=gf_n_fdl+nfdl;
+
+                                jr_gf_sjgl=jr_gf_sjgl+sjgl;
+                                jr_gf_zygl=jr_gf_zygl+zygl;
+                            }
+                            if(planmap.containsKey(wp.getId()))
+                            {
+                                Map<String, Double> valuemap=planmap.get(wp.getId());
+
+                                double yfdljh=0.0;
+                                double nfdljh=0.0;
+                                if(valuemap.containsKey("yfdljh"))
+                                {
+                                    yfdljh=valuemap.get("yfdljh");
+                                }
+                                if(valuemap.containsKey("nfdljh"))
+                                {
+                                    nfdljh=valuemap.get("nfdljh");
+                                }
+
+                                if(wp.getId().endsWith("FDC"))
+                                {
+                                    fd_r_ycdl =fd_r_ycdl+(rfdl * RYCFDLXS) ;
+//                                    fd_r_fdl =fd_r_fdl+rfdl;
+
+                                    double yycfdl = yfdljh * YCFDLXS;
+                                    fd_y_ycdl=fd_y_ycdl+yycfdl;
+//                                    fd_y_fdl=fd_y_fdl+yfdl;
+                                    double nycfdl = nfdljh * NYCFDLXS;
+                                    fd_n_ycdl=fd_n_ycdl+nycfdl;
+//                                    fd_n_fdl=fd_n_fdl+nfdl;
+
+                                    fd_y_jhfdl=fd_y_jhfdl+yfdljh;
+                                    fd_n_jhfdl=fd_n_jhfdl+nfdljh;
+
+
+//                                    jr_fd_sjgl=jr_fd_sjgl+sjgl;
+//                                    jr_fd_zygl=jr_fd_zygl+zygl;
+                                }else
+                                {
+                                    gf_r_ycdl =gf_r_ycdl+(rfdl * RYCFDLXS) ;
+//                                    gf_r_fdl =gf_r_fdl+rfdl ;
+
+                                    double yycfdl = yfdljh * YCFDLXS;
+                                    gf_y_ycdl=gf_y_ycdl+yycfdl;
+//                                    gf_y_fdl=gf_y_fdl+yfdl;
+                                    double nycfdl = nfdljh * NYCFDLXS;
+                                    gf_n_ycdl=gf_n_ycdl+nycfdl;
+//                                    gf_n_fdl=gf_n_fdl+nfdl;
+
+                                    gf_y_jhfdl=fd_y_jhfdl+yfdljh;
+                                    gf_n_jhfdl=fd_n_jhfdl+nfdljh;
+
+
+//                                    jr_gf_sjgl=jr_gf_sjgl+sjgl;
+//                                    jr_gf_zygl=jr_gf_zygl+zygl;
+                                }
+                            }
+
+                        }
                     }
 
 
 
+
+
+
                     if (StringUtils.notEmp(wp.getCompanyid()) && sftjmap.containsKey(wp.getCompanyid() + "_zjrl")) {
 
                         double temp = sftjmap.get(wp.getCompanyid() + "_zjrl");
@@ -1997,13 +2113,19 @@ public class GenreSetPushService {
 
                 Map<String,Double> newpointmap=new HashMap<>();
 
+
                 newpointmap.put("jr_fd_zjrl",StringUtils.round(jr_fd_zjrl,2));
+
                 newpointmap.put("jr_fcts",StringUtils.round(jr_fcts,2));
+
                 newpointmap.put("qjny_fcts",StringUtils.round(qjny_fcts,2));
+
                 newpointmap.put("qjny_fd_zjrl",StringUtils.round(qjny_fd_zjrl,2));
 
                 newpointmap.put("jr_gf_zjrl",StringUtils.round(jr_gf_zjrl,2));
+
                 newpointmap.put("jr_gfts",StringUtils.round(jr_gfts,2));
+
                 newpointmap.put("qjny_gfts",StringUtils.round(qjny_gfts,2));
                 newpointmap.put("qjny_gf_zjrl",StringUtils.round(qjny_gf_zjrl,2));
 
@@ -2014,16 +2136,70 @@ public class GenreSetPushService {
                 newpointmap.put("jr_fj_ts",StringUtils.round(jr_fj_ts,2));
                 newpointmap.put("jr_gf_zcts",StringUtils.round(jr_gf_zcts,2));
                 newpointmap.put("jr_gf_jzts",StringUtils.round(jr_gf_jzts,2));
+
+                //风场日预测发电量
                 newpointmap.put("fd_r_ycdl",StringUtils.round(fd_r_ycdl,2));
+                //风场月预测发电量
                 newpointmap.put("fd_y_ycdl",StringUtils.round(fd_y_ycdl,2));
+                //风场年预测发电量
+                newpointmap.put("fd_n_ycdl",StringUtils.round(fd_n_ycdl,2));
+                //光伏日预测发电量
                 newpointmap.put("gf_r_ycdl",StringUtils.round(gf_r_ycdl,2));
+                //光伏月预测发电量
                 newpointmap.put("gf_y_ycdl",StringUtils.round(gf_y_ycdl,2));
+                //光伏年预测发电量
+                newpointmap.put("gf_n_ycdl",StringUtils.round(gf_n_ycdl,2));
 
-
+                //风场日发电量
                 newpointmap.put("fd_r_fdl",StringUtils.round(fd_r_fdl,2));
+                //风场月发电量
                 newpointmap.put("fd_y_fdl",StringUtils.round(fd_y_fdl,2));
+                //风场年发电量
+                newpointmap.put("fd_n_fdl",StringUtils.round(fd_n_fdl,2));
+                //光伏日发电量
                 newpointmap.put("gf_r_fdl",StringUtils.round(gf_r_fdl,2));
+                //光伏月发电量
                 newpointmap.put("gf_y_fdl",StringUtils.round(gf_y_fdl,2));
+                //光伏年发电量
+                newpointmap.put("gf_n_fdl",StringUtils.round(gf_n_fdl,2));
+
+                //风场月计划发电量
+                newpointmap.put("fd_y_jhfdl",StringUtils.round(fd_y_jhfdl,2));
+                //风场年计划发电量
+                newpointmap.put("fd_n_jhfdl",StringUtils.round(fd_n_jhfdl,2));
+                //光伏月计划发电量
+                newpointmap.put("gf_y_jhfdl",StringUtils.round(gf_y_jhfdl,2));
+                //光伏年计划发电量
+                newpointmap.put("gf_n_jhfdl",StringUtils.round(gf_n_jhfdl,2));
+
+                if(jr_gf_zjrl!=0)
+                {
+                    double gffhl= new BigDecimal(jr_gf_sjgl).divide(new BigDecimal(jr_gf_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    //光伏功率负荷率
+                    newpointmap.put("gf_fhl",StringUtils.round(gffhl*100,2));
+                }else
+                {
+                    newpointmap.put("gf_fhl",0.0);
+                }
+                if(jr_fd_zjrl!=0)
+                {
+                    double fdfhl= new BigDecimal(jr_fd_sjgl).divide(new BigDecimal(jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    //风电功率负荷率
+                    newpointmap.put("fd_fhl",StringUtils.round(fdfhl*100,2));
+                }else
+                {
+                    newpointmap.put("fd_fhl",0.0);
+                }
+
+                if((jr_gf_zjrl+jr_fd_zjrl)!=0)
+                {
+                    double fdfhl= new BigDecimal(jr_gf_sjgl+jr_fd_sjgl).divide(new BigDecimal(jr_gf_zjrl+jr_fd_zjrl), 2, RoundingMode.HALF_EVEN).doubleValue();
+                    //清洁能源功率负荷率
+                    newpointmap.put("qjny_fhl",StringUtils.round(fdfhl*100,2));
+                }else
+                {
+                    newpointmap.put("qjny_fhl",0.0);
+                }
 
                 map.put("newpointmap",newpointmap);
 //                for (Windpowerstation wp : wplist) {
@@ -2497,28 +2673,28 @@ public class GenreSetPushService {
 
 
 //            if (id.equals(QY+QS)) {
-                // 减排二氧化碳
-                Windpowerstationpointnew temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JPEYHT);
-                int jpeyht = (int) (realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
-                // 节约标煤
-                temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JYBM);
-                int jybm = (int) (realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
-                // 减排二氧化硫
-                temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JPEYHL);
-                int jpeyhl = (int) (realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
-                // 节约水
-                temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JYS);
-                int jys = (int) (realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
+            // 减排二氧化碳
+            Windpowerstationpointnew temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JPEYHT);
+            double jpeyht =  (realApiUtil.getRealData(temppoint).getPointValueInDouble() );
+            // 节约标煤
+            temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JYBM);
+            double jybm =  (realApiUtil.getRealData(temppoint).getPointValueInDouble() );
+            // 减排二氧化硫
+            temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JPEYHL);
+            double jpeyhl = (realApiUtil.getRealData(temppoint).getPointValueInDouble() );
+            // 节约水
+            temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JYS);
+            double jys =  (realApiUtil.getRealData(temppoint).getPointValueInDouble() );
 
 //                Double gfsjgl = realApiUtil.getRealData(windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(GF, Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
 //
 //                bzgl = bzgl + gfsjgl;
 //                yfgl = yfgl + gfsjgl;
 
-                jczbmap.put("jpeyht", StringUtils.round(jpeyht, 2));
-                jczbmap.put("jybm", StringUtils.round(jybm, 2));
-                jczbmap.put("jpeyhl", StringUtils.round(jpeyhl, 2));
-                jczbmap.put("jys", StringUtils.round(jys, 2));
+            jczbmap.put("jpeyht", StringUtils.round(jpeyht, 2));
+            jczbmap.put("jybm", StringUtils.round(jybm, 2));
+            jczbmap.put("jpeyhl", StringUtils.round(jpeyhl, 2));
+            jczbmap.put("jys", StringUtils.round(jys, 2));
 
 //            }
 
@@ -4025,6 +4201,62 @@ public class GenreSetPushService {
     }
 
 
+    private void setPlanInfoByType(Map<String, Map<String, Double>> gxkmap, List<ProjectPlan> planls, String id) {
+
+        double yfdljh = 0.0;
+        double nfdljh = 0.0;
+
+        Calendar cal = Calendar.getInstance();
+        cal.setTime(new Date());
+        int month = cal.get(Calendar.MONTH) + 1;
+        int num = 1;
+
+
+        for (ProjectPlan plan : planls) {
+
+            double fdl = null != plan.getGeneratingcapacity() ? Double.valueOf(plan.getGeneratingcapacity()) : 0.0;
+
+
+            if(gxkmap.containsKey(plan.getWindpower()))
+            {
+
+                Map<String, Double> map=gxkmap.get(plan.getWindpower());
+                if (StringUtils.notEmp(plan.getMonth())) {
+                    int planmonth = Integer.valueOf(plan.getMonth());
+                    if (planmonth == month) {
+
+                        yfdljh=map.get("yfdljh");
+                        yfdljh = yfdljh + fdl;
+                        map.put("yfdljh",yfdljh);
+                    }
+
+                    nfdljh=map.get("nfdljh");
+                    nfdljh = nfdljh + fdl;
+                    map.put("nfdljh",nfdljh);
+
+                }
+            }else {
+                Map<String, Double> map=new HashMap<>();
+
+                if (StringUtils.notEmp(plan.getMonth())) {
+                    int planmonth = Integer.valueOf(plan.getMonth());
+                    if (planmonth == month) {
+
+                        map.put("yfdljh",fdl);
+                    }
+
+                    map.put("nfdljh",fdl);
+
+                }
+                gxkmap.put(plan.getWindpower(),map);
+            }
+
+        }
+
+
+    }
+
+
     public Map<String, Object> tooltipAjax() throws Exception {
 
         Map<String, Object> resultmap = new HashMap<String, Object>();