增加切入切出算法算法和限电算法

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-24
+ */
+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-24
  */
 public interface ProBasicEnergyGroupMapper extends BaseMapper<ProBasicEnergyGroup> {
 

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-24
  */
 public interface ProBasicRegionMapper extends BaseMapper<ProBasicRegion> {
 

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-24
  */
 public interface ProBasicWindturbineMapper extends BaseMapper<ProBasicWindturbine> {
 

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,147 @@
+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 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;
+
+
+}

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-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -24,6 +23,8 @@ public class ProBasicEnergyGroup extends Model {
      */
     private String id;
 
+    private String parentid;
+
     /**
      * 名称
      */
@@ -129,5 +130,10 @@ public class ProBasicEnergyGroup extends Model {
      */
     private Integer jrNumber;
 
+    /**
+     * 是否可用
+     */
+    private Integer isAble;
+
 
 }

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-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -130,10 +129,8 @@ public class ProBasicRegion extends Model {
     private Integer jrNumber;
 
     /**
-     * 集团编号
+     * 是否可用
      */
-    private String groupId;
-
     private Integer isAble;
 
 

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.util.Date;
+
 /**
  * <p>
- * 风机
+ * 风机&光伏
  * </p>
  *
  * @author shilin
- * @since 2022-10-21
+ * @since 2022-10-24
  */
 @Data
 @EqualsAndHashCode(callSuper = true)
@@ -97,7 +95,19 @@ 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;
 
 
 }

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-24
+ */
+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-24
  */
 public interface IProBasicEnergyGroupService extends IService<ProBasicEnergyGroup> {
 

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-24
  */
 public interface IProBasicRegionService extends IService<ProBasicRegion> {
 

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-24
  */
 public interface IProBasicWindturbineService extends IService<ProBasicWindturbine> {
 

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-24
+ */
+@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-24
  */
 @Service
 public class ProBasicEnergyGroupServiceImpl extends ServiceImpl<ProBasicEnergyGroupMapper, ProBasicEnergyGroup> implements IProBasicEnergyGroupService {

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-24
  */
 @Service
 public class ProBasicRegionServiceImpl extends ServiceImpl<ProBasicRegionMapper, ProBasicRegion> implements IProBasicRegionService {

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-24
  */
 @Service
 public class ProBasicWindturbineServiceImpl extends ServiceImpl<ProBasicWindturbineMapper, ProBasicWindturbine> implements IProBasicWindturbineService {

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 ;
+
 }