代码调整

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/EventMonitorReportParam.java

@@ -0,0 +1,22 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * @Title EventMonitorReportParam
+ * @Package com.njcn.event.pojo.param
+ * @Author jianghaifei
+ * @Date 2022-10-25 09:48
+ * @Version V1.0
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class EventMonitorReportParam extends StatisticsBizBaseParam {
+
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName; //监测点名称
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/PwUniversalFrontEndParam.java

@@ -0,0 +1,26 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author yzh
+ * @date 2022/10/28
+ */
+@Data
+@EqualsAndHashCode(callSuper = true)
+public class PwUniversalFrontEndParam extends StatisticsBizBaseParam implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+    private List<String> monitorSort;
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/REventMParam.java

@@ -0,0 +1,28 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-11
+ */
+@Data
+public class REventMParam extends StatisticsBizBaseParam {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "干扰源名称",required = true)
+    @NotBlank(message = "干扰源类型名称不为空")
+    private String monitorID;
+
+    @ApiModelProperty(value = "指标类型名称",required = true)
+    @NotBlank(message = "指标类型名称不为空")
+    private String stasisID;
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/StatSubstationBizBaseParam.java

@@ -0,0 +1,20 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-18
+ */
+@Data
+public class StatSubstationBizBaseParam extends StatisticsBizBaseParam {
+
+    @ApiModelProperty(value = "变电站id",required = true)
+    List<String> ids;
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/param/UniversalFrontEndParam.java

@@ -9,7 +9,7 @@ import java.io.Serializable;
 import java.util.List;
 
 /**
- * 拓展前端参数
+ * 拓展条件参数
  *
  * @author yzh
  * @date 2022/10/8
@@ -21,29 +21,17 @@ public class UniversalFrontEndParam extends StatisticsBizBaseParam implements Se
 
     private static final long serialVersionUID = 1L;
 
-    /**
-     * 电压等级
-     */
-    @ApiModelProperty(name = "voltageLevel", value = "电压等级", required = true)
-    private List<String> voltageLevel;
-
-    /**
-     * 监测点名称
-     */
-    @ApiModelProperty(name = "measurementPointId", value = "监测点名称")
-    private String measurementPointId;
-
     /**
      * 暂态指标类型
      */
-    @ApiModelProperty(name = "typeOfTransientIndicators", value = "暂态指标类型")
-    private String typeOfTransientIndicators;
+    @ApiModelProperty(name = "eventType", value = "暂态指标类型")
+    private List<String> eventType;
 
     /**
      * 监测点类别
      */
-    @ApiModelProperty(name = "measurementPointCategory", value = "监测点类别")
-    private String measurementPointCategory;
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+    private List<String> monitorSort;
 
     /**
      * 变电站名称
@@ -51,5 +39,17 @@ public class UniversalFrontEndParam extends StatisticsBizBaseParam implements Se
     @ApiModelProperty(name = "subName", value = "变电站名称")
     private String subName;
 
+    /**
+     * 电压等级
+     */
+    @ApiModelProperty(name = "voltageLevel", value = "电压等级")
+    private List<String> voltageLevel;
+
+    /**
+     * 监测点名称"
+     */
+    @ApiModelProperty(name = "monitorName",value = "监测点名称")
+    private String monitorName;
+
 
 }

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDistributionStatisticsPO.java

@@ -0,0 +1,59 @@
+package com.njcn.event.pojo.po;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 暂态指标分布统计实体类
+ *
+ * @author yzh
+ * @date 2022/10/20
+ */
+
+@Data
+public class EventDistributionStatisticsPO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private int featureAmplitude10with20s;
+    private int featureAmplitude10with100s;
+    private int featureAmplitude10with500s;
+    private int featureAmplitude10with1000s;
+    private int featureAmplitude10with3000s;
+    private int featureAmplitude10with20000s;
+    private int featureAmplitude10with60000s;
+    private int featureAmplitude10with180000s;
+    private int featureAmplitude40with20s;
+    private int featureAmplitude40with100s;
+    private int featureAmplitude40with500s;
+    private int featureAmplitude40with1000s;
+    private int featureAmplitude40with3000s;
+    private int featureAmplitude40with20000s;
+    private int featureAmplitude40with60000s;
+    private int featureAmplitude40with180000s;
+    private int featureAmplitude70with20s;
+    private int featureAmplitude70with100s;
+    private int featureAmplitude70with500s;
+    private int featureAmplitude70with1000s;
+    private int featureAmplitude70with3000s;
+    private int featureAmplitude70with20000s;
+    private int featureAmplitude70with60000s;
+    private int featureAmplitude70with180000s;
+    private int featureAmplitude85with20s;
+    private int featureAmplitude85with100s;
+    private int featureAmplitude85with500s;
+    private int featureAmplitude85with1000s;
+    private int featureAmplitude85with3000s;
+    private int featureAmplitude85with20000s;
+    private int featureAmplitude85with60000s;
+    private int featureAmplitude85with180000s;
+    private int featureAmplitude90with20s;
+    private int featureAmplitude90with100s;
+    private int featureAmplitude90with500s;
+    private int featureAmplitude90with1000s;
+    private int featureAmplitude90with3000s;
+    private int featureAmplitude90with20000s;
+    private int featureAmplitude90with60000s;
+    private int featureAmplitude90with180000s;
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventDurationLineChartPO.java

@@ -0,0 +1,51 @@
+package com.njcn.event.pojo.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 持续时间折线图返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/10/21
+ */
+
+@Data
+@ApiModel("暂态持续时间折线图实体类")
+public class EventDurationLineChartPO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 持续时间100s
+     */
+    @ApiModelProperty(name = "duration100", value = "持续时间100s")
+    private Double duration100;
+
+    /**
+     * 持续时间250s
+     */
+    @ApiModelProperty(name = "duration250", value = "持续时间250s")
+    private Double duration250;
+
+    /**
+     * 持续时间500s
+     */
+    @ApiModelProperty(name = "duration500", value = "持续时间500s")
+    private Double duration500;
+
+    /**
+     * 持续时间1000s
+     */
+    @ApiModelProperty(name = "duration1000", value = "持续时间1000s")
+    private Double duration1000;
+
+    /**
+     * 持续时间1100s
+     */
+    @ApiModelProperty(name = "duration1100", value = "持续时间1100s")
+    private Double duration1100;
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/EventFeatureAmplitudeLineChartPO.java

@@ -0,0 +1,76 @@
+package com.njcn.event.pojo.po;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 暂态特征幅值折线图实体类
+ *
+ * @author yzh
+ * @date 2022/10/21
+ */
+
+@Data
+@ApiModel("暂态特征幅值折线图实体类")
+public class EventFeatureAmplitudeLineChartPO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 特征幅值10
+     */
+    @ApiModelProperty(name = "featureAmplitude10",value = "特征幅值10")
+    private Double featureAmplitude10;
+
+    /**
+     * 特征幅值20
+     */
+    @ApiModelProperty(name = "featureAmplitude20",value = "特征幅值20")
+    private Double featureAmplitude20;
+
+    /**
+     * 特征幅值30
+     */
+    @ApiModelProperty(name = "featureAmplitude30",value = "特征幅值30")
+    private Double featureAmplitude30;
+
+    /**
+     * 特征幅值40
+     */
+    @ApiModelProperty(name = "featureAmplitude40",value = "特征幅值40")
+    private Double featureAmplitude40;
+
+    /**
+     * 特征幅值50
+     */
+    @ApiModelProperty(name = "featureAmplitude50",value = "特征幅值50")
+    private Double featureAmplitude50;
+
+    /**
+     * 特征幅值60
+     */
+    @ApiModelProperty(name = "featureAmplitude60",value = "特征幅值60")
+    private Double featureAmplitude60;
+
+    /**
+     * 特征幅值70
+     */
+    @ApiModelProperty(name = "featureAmplitude70",value = "特征幅值70")
+    private Double featureAmplitude70;
+
+    /**
+     * 特征幅值80
+     */
+    @ApiModelProperty(name = "featureAmplitude80",value = "特征幅值80")
+    private Double featureAmplitude80;
+
+    /**
+     * 特征幅值90
+     */
+    @ApiModelProperty(name = "featureAmplitude90",value = "特征幅值90")
+    private Double featureAmplitude90;
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventD.java

@@ -0,0 +1,56 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_d")
+@ApiModel(value="RStatEventD对象", description="")
+public class RStatEventD implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "发生暂态监测点数（监测点暂态指标超标明细日表）")
+    private Integer eventMeasurement;
+
+    @ApiModelProperty(value = "发生暂态监测点数占比（此表的发生暂态监测点数/区域统计表中的区域分类统计日表中的发生暂态的监测点数）")
+    private Float eventMeasurementRatio;
+
+    @ApiModelProperty(value = "暂态指标发生次数（监测点暂态指标超标明细日表）")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventM.java

@@ -0,0 +1,65 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_m")
+@ApiModel(value="RStatEventM对象", description="")
+public class RStatEventM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Float eventMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgM.java

@@ -0,0 +1,62 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_org_m")
+@ApiModel(value="RStatEventOrgM对象", description="")
+public class RStatEventOrgM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "稳态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Float eventMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgPO.java

@@ -21,61 +21,101 @@ public class RStatEventOrgPO implements Serializable {
     /**
      * 单位ID
      */
-    @ApiModelProperty(name = "orgNo",value = "单位ID")
+    @ApiModelProperty(name = "orgNo", value = "单位ID")
     private String orgNo;
 
     /**
      * 生成数据的时间,每年统计一次
      */
-    @ApiModelProperty(name = "dataDate",value = "生成数据的时间,每年统计一次")
+    @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
     private Date dataDate;
 
     /**
-     * 稳态指标类型Id，字典表ID
+     * 监测点类别
      */
-    @ApiModelProperty(name = "eventType",value = "稳态指标类型Id，字典表ID")
+    @ApiModelProperty(name = "measurementTypeClass",value = "监测点类别")
+    private String measurementTypeClass;
+
+    /**
+     * 日均有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    /**
+     * 累计有效接入监测点数
+     */
+    @ApiModelProperty(name = "effectiveMeasurementAccrued", value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    /**
+     * 日均监测到暂态指标的监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
+    private Integer eventMeasurementAverage;
+
+    /**
+     * 累计监测到暂态指标的监测点数
+     */
+    @ApiModelProperty(name = "eventMeasurementAccrued", value = "累计监测到暂态指标的监测点数")
+    private Integer eventMeasurementAccrued;
+
+    /**
+     * 暂态指标发生次数
+     */
+    @ApiModelProperty(name = "eventCount",value = "暂态指标发生次数")
+    private Integer eventCount;
+    /**
+     * 暂态指标发生频次
+     */
+    @ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次")
+    private Double eventFreq;
+
+    /**
+     * 暂态指标类型Id，字典表ID
+     */
+    @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID")
     private String eventType;
 
     /**
      * 日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)
      */
-    @ApiModelProperty(name = "eventMeasurementAverage",value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)")
-    private Integer eventMeasurementAverage;
+    @ApiModelProperty(name = "eEventMeasurementAverage", value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)")
+    private Integer eEventMeasurementAverage;
 
     /**
      * 累计发生暂态监测点数（监测点暂态指标超标明细日表
      */
-    @ApiModelProperty(name = "eventMeasurementAccrued",value = "累计发生暂态监测点数（监测点暂态指标超标明细日表)")
-    private Integer eventMeasurementAccrued;
-
-    /**
-     * 暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）
-     */
-    @ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
-    private Double eventFreq;
-
-    /**
-     * 暂态指标发生次数（日表的暂态指标发生次数之和）
-     */
-    @ApiModelProperty(name = "eventCount",value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
-    private Integer eventCount;
+    @ApiModelProperty(name = "eEventMeasurementAccrued", value = "累计发生暂态监测点数（监测点暂态指标超标明细日表)")
+    private Integer eEventMeasurementAccrued;
 
     /**
      * 日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）
      */
-    @ApiModelProperty(name = "eventMeasurementRatioAverage",value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
-    private Double eventMeasurementRatioAverage;
+    @ApiModelProperty(name = "eEventMeasurementRatioAverage", value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Double eEventMeasurementRatioAverage;
 
     /**
      * 累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）
      */
-    @ApiModelProperty(name = "eventMeasurementRatioAccrued",value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
-    private Double eventMeasurementRatioAccrued;
+    @ApiModelProperty(name = "eEventMeasurementRatioAccrued", value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Double eEventMeasurementRatioAccrued;
+
+    /**
+     * 暂态指标发生频次
+     */
+    @ApiModelProperty(name = "eEventFreq", value = "暂态指标发生频次")
+    private Double eEventFreq;
+    /**
+     * 暂态指标发生次数
+     */
+    @ApiModelProperty(name = "eEventCount", value = "暂态指标发生次数")
+    private Integer eEventCount;
 
     /**
      * 数据类型,字典表（01：主网测点  02：配网测点）
      */
-    @ApiModelProperty(name = "dataType",value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    @ApiModelProperty(name = "dataType", value = "数据类型,字典表（01：主网测点  02：配网测点）")
     private String dataType;
 
 }

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgQ.java

@@ -0,0 +1,61 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_org_q")
+@ApiModel(value="RStatEventOrgQ对象", description="")
+public class RStatEventOrgQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Float eventMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventOrgY.java

@@ -0,0 +1,61 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import java.time.LocalDate;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_org_y")
+@ApiModel(value="RStatEventOrgY对象", description="")
+public class RStatEventOrgY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Float eventMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventQ.java

@@ -0,0 +1,65 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_q")
+@ApiModel(value="RStatEventQ对象", description="")
+public class RStatEventQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每季度统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Float eventMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventVoltageM.java

@@ -0,0 +1,68 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_voltage_m")
+@ApiModel(value="RStatEventVoltageM对象", description="")
+public class RStatEventVoltageM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每日统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "电压等级Id，字典表ID")
+    private String voltageType;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比")
+    private Float eventMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatEventY.java

@@ -0,0 +1,65 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_event_y")
+@ApiModel(value="RStatEventY对象", description="")
+public class RStatEventY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "监测点类别ID、监测对象类型ID")
+    private String measurementTypeClass;
+
+    @ApiModelProperty(value = "暂态指标类型Id，字典表ID")
+    private String eventType;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值）")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数（监测点暂态指标超标明细日表）")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
+    private Float eventMeasurementRatioAccrued;
+
+    @ApiModelProperty(value = "数据类型,字典表（01：主网测点  02：配网测点）")
+    private String dataType;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatOrgPO.java

@@ -2,11 +2,11 @@ package com.njcn.event.pojo.po;
 
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
+import java.util.Date;
 
 /**
- * 区域分类统计年表(RStatOrgY)实体类
+ * 区域分类统计表(RStatOrgY)实体类
  *
  * @author yzh
  * @since 2022-10-12 18:37:24

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationM.java

@@ -0,0 +1,122 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_m")
+@ApiModel(value="RStatSubstationM对象", description="")
+public class RStatSubstationM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    @TableId(value = "data_date", type = IdType.ASSIGN_ID)
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "稳态累计超标天数")
+    private Float harmonicOverDay;
+
+    @ApiModelProperty(value = "稳态累计超标监测点数")
+    private Integer harmonicCount;
+
+    @ApiModelProperty(value = "频率偏差累计超标天数")
+    private Float freqOverDay;
+
+    @ApiModelProperty(value = "频率偏差累计超标监测点数")
+    private Integer freqCount;
+
+    @ApiModelProperty(value = "电压偏差累计超标天数")
+    private Float vDevOverDay;
+
+    @ApiModelProperty(value = "电压偏差累计超标监测点数")
+    private Integer vDevCount;
+
+    @ApiModelProperty(value = "谐波电压累计超标天数")
+    private Float vOverDay;
+
+    @ApiModelProperty(value = "谐波电压累计超标监测点数")
+    private Integer vCount;
+
+    @ApiModelProperty(value = "谐波电流累计超标天数")
+    private Float iOverDay;
+
+    @ApiModelProperty(value = "谐波电流累计超标监测点数")
+    private Integer iCount;
+
+    @ApiModelProperty(value = "三相电压不平衡累计超标天数")
+    private Float unbalanceOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡累计超标监测点数")
+    private Integer unbalanceCount;
+
+    @ApiModelProperty(value = "负序电流累计超标天数")
+    private Float iNegOverDay;
+
+    @ApiModelProperty(value = "负序电流累计超标监测点数")
+    private Integer iNegCount;
+
+    @ApiModelProperty(value = "闪变累计超标天数")
+    private Float flickerOverDay;
+
+    @ApiModelProperty(value = "闪变累计超标监测点数")
+    private Integer flickerCount;
+
+    @ApiModelProperty(value = "间谐波电压累计超标天数")
+    private Float inuharmOverDay;
+
+    @ApiModelProperty(value = "间谐波电压累计超标监测点数")
+    private Integer inuharmCount;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "电压暂降发生次数")
+    private Integer sagCount;
+
+    @ApiModelProperty(value = "电压暂降发生频次")
+    private Float sagFreq;
+
+    @ApiModelProperty(value = "电压暂升发生次数")
+    private Integer swellCount;
+
+    @ApiModelProperty(value = "电压暂升发生频次")
+    private Float swellFreq;
+
+    @ApiModelProperty(value = "短时中断发生次数")
+    private Integer interruptCount;
+
+    @ApiModelProperty(value = "短时中断发生频次")
+    private Float interruptFreq;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationQ.java

@@ -0,0 +1,95 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_q")
+@ApiModel(value="RStatSubstationQ对象", description="")
+public class RStatSubstationQ implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "生成数据的时间,每季统计一次")
+    @TableId(value = "data_date", type = IdType.ASSIGN_ID)
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "稳态平均超标天数")
+    private Float harmonicAverageOverDay;
+
+    @ApiModelProperty(value = "频率偏差平均超标天数")
+    private Float freqAverageOverDay;
+
+    @ApiModelProperty(value = "电压偏差平均超标天数")
+    private Float vDevAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电压平均超标天数")
+    private Float vAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电流平均超标天数")
+    private Float iAverageOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡平均超标天数")
+    private Float unbalanceAverageOverDay;
+
+    @ApiModelProperty(value = "负序电流平均超标天数")
+    private Float iNegAverageOverDay;
+
+    @ApiModelProperty(value = "闪变平均超标天数")
+    private Float flickerAverageOverDay;
+
+    @ApiModelProperty(value = "间谐波电压平均超标天数")
+    private Float inuharmAverageOverDay;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "电压暂降发生次数")
+    private Integer sagCount;
+
+    @ApiModelProperty(value = "电压暂降发生频次")
+    private Float sagFreq;
+
+    @ApiModelProperty(value = "电压暂升发生次数")
+    private Integer swellCount;
+
+    @ApiModelProperty(value = "电压暂升发生频次")
+    private Float swellFreq;
+
+    @ApiModelProperty(value = "短时中断发生次数")
+    private Integer interruptCount;
+
+    @ApiModelProperty(value = "短时中断发生频次")
+    private Float interruptFreq;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationVoltageM.java

@@ -0,0 +1,50 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_voltage_m")
+@ApiModel(value="RStatSubstationVoltageM对象", description="")
+public class RStatSubstationVoltageM implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "单位ID")
+    @TableId(value = "org_no", type = IdType.ASSIGN_ID)
+    private String orgNo;
+
+    @ApiModelProperty(value = "生成数据的时间,每月统计一次")
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "电压等级")
+    private String substationVoltage;
+
+    @ApiModelProperty(value = "变电站数量")
+    private Integer substationCount;
+
+    @ApiModelProperty(value = "稳态超标变电站数量")
+    private Integer harmonicCount;
+
+    @ApiModelProperty(value = "暂态变电站数量")
+    private Integer eventCount;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RStatSubstationY.java

@@ -0,0 +1,95 @@
+package com.njcn.event.pojo.po;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDate;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("r_stat_substation_y")
+@ApiModel(value="RStatSubstationY对象", description="")
+public class RStatSubstationY implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "生成数据的时间,每年统计一次")
+    @TableId(value = "data_date", type = IdType.ASSIGN_ID)
+    private LocalDate dataDate;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "日均有效接入监测点数")
+    private Integer effectiveMeasurementAverage;
+
+    @ApiModelProperty(value = "累计有效接入监测点数")
+    private Integer effectiveMeasurementAccrued;
+
+    @ApiModelProperty(value = "稳态平均超标天数")
+    private Float harmonicOverDay;
+
+    @ApiModelProperty(value = "频率偏差平均超标天数")
+    private Float freqAverageOverDay;
+
+    @ApiModelProperty(value = "电压偏差平均超标天数")
+    private Float vDevAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电压平均超标天数")
+    private Float vAverageOverDay;
+
+    @ApiModelProperty(value = "谐波电流平均超标天数")
+    private Float iAverageOverDay;
+
+    @ApiModelProperty(value = "三相电压不平衡平均超标天数")
+    private Float unbalanceAverageOverDay;
+
+    @ApiModelProperty(value = "负序电流平均超标天数")
+    private Float iNegAverageOverDay;
+
+    @ApiModelProperty(value = "闪变平均超标天数")
+    private Float flickerAverageOverDay;
+
+    @ApiModelProperty(value = "间谐波电压平均超标天数")
+    private Float inuharmAverageOverDay;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "电压暂降发生次数")
+    private Integer sagCount;
+
+    @ApiModelProperty(value = "电压暂降发生频次")
+    private Float sagFreq;
+
+    @ApiModelProperty(value = "电压暂升发生次数")
+    private Integer swellCount;
+
+    @ApiModelProperty(value = "电压暂升发生频次")
+    private Float swellFreq;
+
+    @ApiModelProperty(value = "短时中断发生次数")
+    private Integer interruptCount;
+
+    @ApiModelProperty(value = "短时中断发生频次")
+    private Float interruptFreq;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventDetailPO.java

@@ -1,9 +1,10 @@
-package com.njcn.device.pms.pojo.po;
+package com.njcn.event.pojo.po;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * (RMpEventDetail)实体类
@@ -13,7 +14,7 @@ import java.io.Serializable;
  */
 @Data
 public class RmpEventDetailPO implements Serializable {
-    private static final long serialVersionUID = 717547299960041571L;
+    private static final long serialVersionUID = 1L;
     /**
      * 暂时事件ID
      */
@@ -24,6 +25,7 @@ public class RmpEventDetailPO implements Serializable {
      */
     @ApiModelProperty(name = "measurementPointId",value = "监测点ID")
     private String measurementPointId;
+
     /**
      * 事件类型
      */
@@ -33,7 +35,7 @@ public class RmpEventDetailPO implements Serializable {
      * 开始时间
      */
     @ApiModelProperty(name = "startTime",value = "开始时间")
-    private Long startTime;
+    private Date startTime;
     /**
      * 持续时间
      */

pqs-event/event-api/src/main/java/com/njcn/event/pojo/po/RmpEventReportDayPO.java

@@ -0,0 +1,39 @@
+package com.njcn.event.pojo.po;
+
+import lombok.Data;
+
+import java.util.Date;
+import java.io.Serializable;
+
+/**
+ * 监测点暂态事件统计日报实体类
+ *
+ * @author yzh
+ * @since 2022-10-19 10:36:37
+ */
+@Data
+public class RmpEventReportDayPO implements Serializable {
+    private static final long serialVersionUID = -31002744007070997L;
+    /**
+     * 监测点ID
+     */
+    private String measurementPointId;
+    /**
+     * 生成数据的时间,每日统计一次
+     */
+    private Date dataDate;
+    /**
+     * 持续时间
+     */
+    private Double durationTag;
+    /**
+     * 特征幅值
+     */
+    private Double featureAmplitudeTag;
+    /**
+     * 发生次数
+     */
+    private String frequency;
+
+}
+

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventDipShortDistributionVO.java

@@ -0,0 +1,100 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 监测点电压暂降和短时中断分布情况
+ * @Title EventDistributionStatisticsVO
+ * @Package com.njcn.event.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-26 11:19
+ * @Version V1.0
+ */
+@Data
+public class EventDipShortDistributionVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private int featureAmp90with100ms;
+    private int featureAmp90with250ms;
+    private int featureAmp90with500ms;
+    private int featureAmp90with1000ms;
+    private int featureAmp90with3000ms;
+    private int featureAmp90with10000ms;
+    private int featureAmp90with20000ms;
+    private int featureAmp90with60000ms;
+
+    private int featureAmp80with100ms;
+    private int featureAmp80with250ms;
+    private int featureAmp80with500ms;
+    private int featureAmp80with1000ms;
+    private int featureAmp80with3000ms;
+    private int featureAmp80with10000ms;
+    private int featureAmp80with20000ms;
+    private int featureAmp80with60000ms;
+
+    private int featureAmp70with100ms;
+    private int featureAmp70with250ms;
+    private int featureAmp70with500ms;
+    private int featureAmp70with1000ms;
+    private int featureAmp70with3000ms;
+    private int featureAmp70with10000ms;
+    private int featureAmp70with20000ms;
+    private int featureAmp70with60000ms;
+
+    private int featureAmp60with100ms;
+    private int featureAmp60with250ms;
+    private int featureAmp60with500ms;
+    private int featureAmp60with1000ms;
+    private int featureAmp60with3000ms;
+    private int featureAmp60with10000ms;
+    private int featureAmp60with20000ms;
+    private int featureAmp60with60000ms;
+
+    private int featureAmp50with100ms;
+    private int featureAmp50with250ms;
+    private int featureAmp50with500ms;
+    private int featureAmp50with1000ms;
+    private int featureAmp50with3000ms;
+    private int featureAmp50with10000ms;
+    private int featureAmp50with20000ms;
+    private int featureAmp50with60000ms;
+
+    private int featureAmp40with100ms;
+    private int featureAmp40with250ms;
+    private int featureAmp40with500ms;
+    private int featureAmp40with1000ms;
+    private int featureAmp40with3000ms;
+    private int featureAmp40with10000ms;
+    private int featureAmp40with20000ms;
+    private int featureAmp40with60000ms;
+
+    private int featureAmp30with100ms;
+    private int featureAmp30with250ms;
+    private int featureAmp30with500ms;
+    private int featureAmp30with1000ms;
+    private int featureAmp30with3000ms;
+    private int featureAmp30with10000ms;
+    private int featureAmp30with20000ms;
+    private int featureAmp30with60000ms;
+
+    private int featureAmp20with100ms;
+    private int featureAmp20with250ms;
+    private int featureAmp20with500ms;
+    private int featureAmp20with1000ms;
+    private int featureAmp20with3000ms;
+    private int featureAmp20with10000ms;
+    private int featureAmp20with20000ms;
+    private int featureAmp20with60000ms;
+
+    private int featureAmp10with100ms;
+    private int featureAmp10with250ms;
+    private int featureAmp10with500ms;
+    private int featureAmp10with1000ms;
+    private int featureAmp10with3000ms;
+    private int featureAmp10with10000ms;
+    private int featureAmp10with20000ms;
+    private int featureAmp10with60000ms;
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventDistributionStatisticsTableVO.java

@@ -0,0 +1,68 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 暂态指标分布统计返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/10/20
+ */
+
+@Data
+@ApiModel("暂态指标分布统计实体类")
+public class EventDistributionStatisticsTableVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 特征幅值
+     */
+    @ApiModelProperty(name = "featureAmplitude",value = "特征幅值")
+    private String featureAmplitude;
+
+    /**
+     * 持续时间20s
+     */
+    @ApiModelProperty(name = "duration20",value = "持续时间20s")
+    private Integer duration20;
+    /**
+     * 持续时间100s
+     */
+    @ApiModelProperty(name = "duration100",value = "持续时间100s")
+    private Integer duration100;
+    /**
+     * 持续时间500s
+     */
+    @ApiModelProperty(name = "duration500",value = "持续时间500s")
+    private Integer duration500;
+    /**
+     * 持续时间1000s
+     */
+    @ApiModelProperty(name = "duration1000",value = "持续时间1000s")
+    private Integer duration1000;
+    /**
+     * 持续时间3000s
+     */
+    @ApiModelProperty(name = "duration3000",value = "持续时间3000s")
+    private Integer duration3000;
+    /**
+     * 持续时间20000s
+     */
+    @ApiModelProperty(name = "duration20000",value = "持续时间20000s")
+    private Integer duration20000;
+    /**
+     * 持续时间60000s
+     */
+    @ApiModelProperty(name = "duration60000",value = "持续时间60000s")
+    private Integer duration60000;
+    /**
+     * 持续时间180000s
+     */
+    @ApiModelProperty(name = "duration180000",value = "持续时间180000s")
+    private Integer duration180000;
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventFeatureAmplitudeCurveVO.java

@@ -0,0 +1,74 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Builder;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+
+/**
+ * 获取暂态指标分布统计曲线图实体类
+ *
+ * @author yzh
+ * @date 2022/10/24
+ */
+@Data
+@Builder
+@ApiModel("获取暂态指标分布统计曲线图实体类")
+public class EventFeatureAmplitudeCurveVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(name = "totalNumberOfEvents", value = "事件总数")
+    private Integer totalNumberOfEvents;
+
+    @ApiModelProperty(name = "eventFeatureAmplitudeCurveDataList", value = "图表数据")
+    private List<EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList> eventFeatureAmplitudeCurveDataList;
+
+    /**
+     * 构建默认对象
+     *
+     * @return 默认对象
+     */
+    public static EventFeatureAmplitudeCurveVO empty() {
+        return EventFeatureAmplitudeCurveVO.buildVO(0, Collections.emptyList());
+    }
+
+    /**
+     * 构建默认对象
+     *
+     * @param numberEvents 事件总数
+     * @param dataList     图表数据
+     * @return 默认对象
+     */
+    public static EventFeatureAmplitudeCurveVO buildVO(int numberEvents, List<EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList> dataList) {
+        return EventFeatureAmplitudeCurveVO.builder().totalNumberOfEvents(numberEvents).eventFeatureAmplitudeCurveDataList(dataList).build();
+
+    }
+
+    @Data
+    public static class EventFeatureAmplitudeCurveDataList implements Serializable {
+        private static final long serialVersionUID = 2693688079727369565L;
+
+        @ApiModelProperty(name = "measurementPointId", value = "监测点id")
+        private String measurementPointId;
+
+        @ApiModelProperty(name = "duration", value = "持续时间（ms）")
+        private Double duration;
+
+        @ApiModelProperty(name = "featureAmplitude", value = "特征幅值")
+        private Double featureAmplitude;
+
+        @ApiModelProperty(name = "startTime", value = "开始时间")
+        private LocalDateTime startTime;
+
+        public static Comparator<EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList> sortAscTime() {
+            return Comparator.comparing(EventFeatureAmplitudeCurveVO.EventFeatureAmplitudeCurveDataList::getStartTime);
+        }
+    }
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventMonitorReportVO.java

@@ -0,0 +1,43 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @Title EventMonitorReportVO
+ * @Package com.njcn.event.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-25 09:51
+ * @Version V1.0
+ */
+@Data
+public class EventMonitorReportVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String date; //时间
+
+    private String orgId; // 单位id
+
+    private String OrgName; //单位名称
+
+    private String monitorId; //监测点id
+
+    private String monitorName; //监测点名称
+
+    private String voltageLevel; //监测点电压等级id
+
+    private String voltageLevelName; //监测点电压等级名称
+
+    private Integer voltageRiseCount; //电压暂升次数
+
+    private Integer voltageDipCount; //电压暂降次数
+
+    private Integer shortInterruptionCount; //短时中断
+
+//    private EventDipShortDistributionVO dipShortStatisticsVO; //暂降和短时中断分部情况
+
+//    private EventRiseDistributionVO riseStatisticsVO; //暂升分部情况
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/EventRiseDistributionVO.java

@@ -0,0 +1,26 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * 监测点电压暂升分布情况
+ * @Title EventRiseDistributionStatisticsVO
+ * @Package com.njcn.event.pojo.vo
+ * @Author jianghaifei
+ * @Date 2022-10-26 11:33
+ * @Version V1.0
+ */
+@Data
+public class EventRiseDistributionVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private int featureAmp120with500ms;
+    private int featureAmp120with5000ms;
+    private int featureAmp120with60000ms;
+
+    private int featureAmp110with500ms;
+    private int featureAmp110with5000ms;
+    private int featureAmp110with60000ms;
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/PwRmpEventDetailVO.java

@@ -0,0 +1,98 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 配网暂态明细返回前端实体类
+ *
+ * @author yzh
+ * @date 2022/10/31
+ */
+@Data
+@ApiModel("配网暂态明细返回前端实体类")
+public class PwRmpEventDetailVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 单位id
+     */
+    @ApiModelProperty(name = "orgId", value = "单位id")
+    private String orgId;
+    /**
+     * 单位名称
+     */
+    @ApiModelProperty(name = "orgName", value = "单位名称")
+    private String orgName;
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(name = "monitorId", value = "监测点id")
+    private String monitorId;
+    /**
+     * 监测点名称
+     */
+    @ApiModelProperty(name = "monitorName", value = "监测点名称")
+    private String monitorName;
+    /**
+     * 所属变电站
+     */
+    @ApiModelProperty(name = "subName", value = "所属变电站")
+    private String subName;
+    /**
+     * 所属台区
+     */
+    @ApiModelProperty(name = "powerDistributionArea", value = "所属台区")
+    private String powerDistributionArea;
+    /**
+     * 用户名称
+     */
+    @ApiModelProperty(name = "powerClient", value = "用户名称")
+    private String powerClient;
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+    private String monitorSort;
+
+    /**
+     * 监测点电压等级
+     */
+    @ApiModelProperty(name = "monitorVoltageLevel",value = "监测点电压等级")
+    private String monitorVoltageLevel;
+
+    /**
+     * 暂态事件类型
+     */
+    @ApiModelProperty(name = "eventType", value = "暂态事件类型")
+    private String eventType;
+
+    /**
+     * 开始时间
+     */
+    @ApiModelProperty(name = "startTime", value = "开始时间")
+    private Date startTime;
+
+    /**
+     * 持续时间
+     */
+    @ApiModelProperty(name = "duration", value = "持续时间")
+    private Double duration;
+
+    /**
+     * 特征幅值
+     */
+    @ApiModelProperty(name = "featureAmplitude", value = "特征幅值")
+    private Double featureAmplitude;
+
+    /**
+     * 波形路径
+     */
+    @ApiModelProperty(name = "wavePath", value = "波形路径")
+    private String wavePath;
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RArrayVO.java

@@ -0,0 +1,27 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-10
+ */
+@Data
+public class RArrayVO {
+
+    @ApiModelProperty(value = "指标名称")
+    String rowName;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "检测点类型")
+    List<?> columns;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/REventPolylineVO.java

@@ -0,0 +1,33 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+@Data
+public class REventPolylineVO  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "时间")
+    private String date;
+
+    @ApiModelProperty(value = "发生暂态监测点数")
+    private Integer eventMeasurement;
+
+    @ApiModelProperty(value = "发生暂态监测点数占比")
+    private Float eventMeasurementRatio;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Integer eventFreq;
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventMVO.java

@@ -0,0 +1,44 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-11
+ */
+@Data
+public class RStatEventMVO  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty("排序")
+    private Integer sort;
+
+    @ApiModelProperty(value = "暂态指标类型名称")
+    private String eventName;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数")
+    private Integer eventMeasurementAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数")
+    private Integer eventMeasurementAccrued;
+
+    @ApiModelProperty(value = "暂态指标发生频次")
+    private Float eventFreq;
+
+    @ApiModelProperty(value = "暂态指标发生次数")
+    private Integer eventCount;
+
+    @ApiModelProperty(value = "日均发生暂态监测点数占比")
+    private Float eventMeasurementRatioAverage;
+
+    @ApiModelProperty(value = "累计发生暂态监测点数占比")
+    private Float eventMeasurementRatioAccrued;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatEventOrgVO.java

@@ -4,9 +4,8 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
-import java.util.Date;
 import java.io.Serializable;
-import java.util.List;
+import java.util.Date;
 
 /**
  * 监测点暂态指标数据统计表(RStatEventOrg)实体类
@@ -42,6 +41,12 @@ public class RStatEventOrgVO implements Serializable {
     @ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
     private Date dataDate;
 
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(name = "measurementTypeClass",value = "监测点类别")
+    private String measurementTypeClass;
+
     /**
      * 日均有效接入监测点数
      */
@@ -70,107 +75,55 @@ public class RStatEventOrgVO implements Serializable {
      * 日均暂态超标监测点数占比
      */
     @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
-    private Integer eventMeasurementRatioAverage;
+    private Double eventMeasurementRatioAverage;
 
     /**
      * 累计暂态超标监测点数占比
      */
     @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
-    private Integer eventMeasurementRatioAccrued;
+    private Double eventMeasurementRatioAccrued;
 
     /**
-     * 暂态指标类型Id，字典表ID
+     * 暂态指标发生次数
      */
-    @ApiModelProperty(name = "eventType", value = "暂态指标类型Id，字典表ID")
-    private String eventType;
-
+    @ApiModelProperty(name = "eventCount",value = "暂态指标发生次数")
+    private Integer eventCount;
     /**
-     * 日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)
+     * 暂态指标发生频次
      */
-    @ApiModelProperty(name = "eEventMeasurementAverage",value = "日均发生暂态监测点数（根据 发生暂态监测点数 取平均值)")
-    private Integer eEventMeasurementAverage;
-
-    /**
-     * 累计发生暂态监测点数（监测点暂态指标超标明细日表
-     */
-    @ApiModelProperty(name = "eEventMeasurementAccrued",value = "累计发生暂态监测点数（监测点暂态指标超标明细日表)")
-    private Integer eEventMeasurementAccrued;
-    /**
-     * 日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）
-     */
-    @ApiModelProperty(name = "eEventMeasurementRatioAverage",value = "日均发生暂态监测点数占比（根据 日均发生暂态监测点数占比 取平均值）")
-    private Double eEventMeasurementRatioAverage;
-
-    /**
-     * 累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）
-     */
-    @ApiModelProperty(name = "eEventMeasurementRatioAccrued",value = "累计发生暂态监测点数占比（此表的累计发生暂态监测点数/区域统计表中的区域分类统计月表中的发生暂态的监测点数）")
-    private Double eEventMeasurementRatioAccrued;
-
-    /**
-     * 暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）
-     */
-    @ApiModelProperty(name = "eEventFreq",value = "暂态指标发生频次（日表的暂态指标发生次数之和/日表的发生暂态监测点数之和）")
-    private Double eEventFreq;
-
-    /**
-     * 暂态指标发生次数（日表的暂态指标发生次数之和）
-     */
-    @ApiModelProperty(name = "eEventCount",value = "暂态指标发生次数（日表的暂态指标发生次数之和）")
-    private Integer eEventCount;
-
-
-
-
+    @ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次")
+    private Double eventFreq;
 
     /**
      * 日均短时中断
      */
     @ApiModelProperty(name = "dayShortInterruptions", value = "日均短时中断")
     private Integer dayShortInterruptions;
-
     /**
      * 累计短时中断
      */
     @ApiModelProperty(name = "cumulativeShortInterruptions", value = "累计短时中断")
     private Integer cumulativeShortInterruptions;
-
     /**
      * 日均短时中断占比
      */
     @ApiModelProperty(name = "dayShortInterruptionsProportion", value = "日均短时中断占比")
     private Double dayShortInterruptionsProportion;
-
     /**
      * 累计短时中断占比
      */
     @ApiModelProperty(name = "cumulativeShortInterruptionsProportion", value = "累计暂态指标占比")
     private Double cumulativeShortInterruptionsProportion;
-
-    /**
-     * 短时中断监测点数
-     */
-    @ApiModelProperty(name = "shortInterruptionsMonitor", value = "短时中断监测点数")
-    private Integer shortInterruptionsMonitor;
-
-    /**
-     * 短时中断占比
-     */
-    @ApiModelProperty(name = "shortInterruptionsProportion",value = "短时中断占比")
-    private Double shortInterruptionsProportion;
-
-    /**
-     * 短时中断次数
-     */
-    @ApiModelProperty(name = "shortInterruptionsCount", value = "短时中断次数")
-    private Integer shortInterruptionsCount;
-
     /**
      * 短时中断频次
      */
-    @ApiModelProperty(name = "shortInterruptionsFrequency", value = "短时中断频次")
-    private Double shortInterruptionsFrequency;
-
+    @ApiModelProperty(name = "shortInterruptionsFreq",value = "短时中断频次")
+    private Double shortInterruptionsFreq;
+    /**
+     * 短时中断次数
+     */
+    @ApiModelProperty(name = "shortInterruptionsCount",value = "短时中断次数")
+    private Integer shortInterruptionsCount;
 
 
 
@@ -180,42 +133,31 @@ public class RStatEventOrgVO implements Serializable {
      */
     @ApiModelProperty(name = "dayVoltageRise", value = "日均电压暂升")
     private Integer dayVoltageRise;
-
     /**
      * 累计电压暂升
      */
     @ApiModelProperty(name = "cumulativeVoltageRise", value = "累计电压暂升")
     private Integer cumulativeVoltageRise;
-
     /**
      * 日均电压暂升占比
      */
     @ApiModelProperty(name = "dayVoltageRiseProportion", value = "日均电压暂升占比")
     private Double dayVoltageRiseProportion;
-
     /**
      * 累计电压暂升占比
      */
     @ApiModelProperty(name = "cumulativeVoltageRiseProportion", value = "累计电压暂升占比")
     private Double cumulativeVoltageRiseProportion;
-
-    /**
-     * 电压暂升占比
-     */
-    @ApiModelProperty(name = "voltageRiseProportion",value = "电压暂升占比")
-    private Double voltageRiseProportion;
-
-    /**
-     * 电压暂升次数
-     */
-    @ApiModelProperty(name = "voltageRiseCount", value = "电压暂升次数")
-    private Integer voltageRiseCount;
-
     /**
      * 电压暂升频次
      */
-    @ApiModelProperty(name = "voltageRiseFrequency", value = "电压暂升频次")
-    private Double voltageRiseFrequency;
+    @ApiModelProperty(name = "voltageRiseFreq",value = "电压暂升频次")
+    private Double voltageRiseFreq;
+    /**
+     * 电压暂升次数
+     */
+    @ApiModelProperty(name = "voltageRiseCount",value = "电压暂升次数")
+    private Integer voltageRiseCount;
 
 
 
@@ -226,43 +168,38 @@ public class RStatEventOrgVO implements Serializable {
      */
     @ApiModelProperty(name = "dayVoltageDip", value = "日均电压暂降")
     private Integer dayVoltageDip;
-
     /**
      * 累计电压暂降
      */
     @ApiModelProperty(name = "cumulativeVoltageDip", value = "累计电压暂降")
     private Integer cumulativeVoltageDip;
-
     /**
      * 日均电压暂降占比
      */
     @ApiModelProperty(name = "dayVoltageDipProportion", value = "日均电压暂降占比")
     private Double dayVoltageDipProportion;
-
     /**
      * 累计电压暂降占比
      */
     @ApiModelProperty(name = "cumulativeVoltageDipProportion", value = "累计电压暂降占比")
     private Double cumulativeVoltageDipProportion;
-
     /**
-     * 电压暂降占比
+     * 电压暂降频次
      */
-    @ApiModelProperty(name = "voltageDipProportion",value = "电压暂降占比")
-    private Double voltageDipProportion;
-
+    @ApiModelProperty(name = "voltageDipFreq",value = "电压暂降频次")
+    private Double voltageDipFreq;
     /**
      * 电压暂降次数
      */
-    @ApiModelProperty(name = "voltageDipCount", value = "电压暂降次数")
+    @ApiModelProperty(name = "voltageDipCount",value = "电压暂降次数")
     private Integer voltageDipCount;
 
 
     /**
-     * 电压暂降频次
+     * 数据类型（01：主网测点  02：配网测点）
      */
-    @ApiModelProperty(name = "voltageDipFrequency", value = "电压暂降频次")
-    private Double voltageDipFrequency;
+    @ApiModelProperty(name = "dataType",value = "数据类型（01：主网测点  02：配网测点）")
+    private String dataType;
 
 
 }

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RStatOrgVO.java

@@ -18,6 +18,7 @@ import java.util.Date;
 @ApiModel(value = "区域分类统计表(RStatOrgY)实体类")
 public class RStatOrgVO implements Serializable {
     private static final long serialVersionUID = 642166320324597986L;
+
     /**
      * 单位ID
      */
@@ -30,11 +31,23 @@ public class RStatOrgVO implements Serializable {
     @ApiModelProperty(name = "orgName", value = "单位名称")
     private String orgName;
 
+    /**
+     * 监测点id
+     */
+    @ApiModelProperty(name = "monitorId", value = "监测点id")
+    private String monitorId;
+
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+    private String monitorSort;
+
     /**
      * 生成数据的时间
      */
     @ApiModelProperty(name = "dataDate", value = "生成数据的时间")
-    private String dataDate;
+    private Date dataDate;
 
     /**
      * 日均有效接入监测点数
@@ -64,13 +77,13 @@ public class RStatOrgVO implements Serializable {
      * 日均暂态超标监测点数占比
      */
     @ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
-    private Integer eventMeasurementRatioAverage;
+    private Double eventMeasurementRatioAverage;
 
     /**
      * 累计暂态超标监测点数占比
      */
     @ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
-    private Integer eventMeasurementRatioAccrued;
+    private Double eventMeasurementRatioAccrued;
 
     /**
      * 暂态指标发生频次
@@ -84,4 +97,10 @@ public class RStatOrgVO implements Serializable {
     @ApiModelProperty(name = "eventCount", value = "暂态指标发生次数")
     private Integer eventCount;
 
+    /**
+     * 数据类型（01：主网测点  02：配网测点）
+     */
+    @ApiModelProperty(name = "dataType",value = "数据类型（01：主网测点  02：配网测点）")
+    private String dataType;
+
 }

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RSubstationIcon2VO.java

@@ -0,0 +1,37 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@Data
+public class RSubstationIcon2VO  {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "变电站id")
+    private String substationId;
+
+    @ApiModelProperty(value = "变电站名称")
+    private String substationName;
+
+    @ApiModelProperty(value = "短时中断发生频次")
+    private Float interruptFreq;
+
+    @ApiModelProperty(value = "电压暂降发生频次")
+    private Float sagFreq;
+
+    @ApiModelProperty(value = "电压暂升发生频次")
+    private Float swellFreq;
+
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RSubstationIconVO.java

@@ -0,0 +1,37 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-18
+ */
+@Data
+public class RSubstationIconVO {
+    private static final long serialVersionUID = 1L;
+
+    private String num1;
+    private String num2;
+    private String num3;
+    private String num4;
+    private String num5;
+    private String num6;
+    private String num7;
+    private String num8;
+    private String num9;
+    private String num10;
+
+    private String upRatio1;
+    private String upRatio2;
+    private String upRatio3;
+    private String upRatio4;
+    private String upRatio5;
+    private String upRatio6;
+    private String upRatio7;
+    private String upRatio8;
+    private String upRatio9;
+    private String upRatio10;
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RVoltageIconVO.java

@@ -0,0 +1,26 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * <功能描述>
+ *
+ * @author 1754607820@qq.com
+ * @createTime: 2022-10-18
+ */
+@Data
+public class RVoltageIconVO {
+
+    private static final long serialVersionUID = 1L;
+
+    @ApiModelProperty(value = "电压等级")
+    private String substationVoltage;
+
+    @ApiModelProperty(value = "变电站数量")
+    private Integer substationCount;
+
+    @ApiModelProperty(value = "稳态超标变电站数量")
+    private Integer harmonicCount;
+
+}

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/RmpEventDetailVO.java

@@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
+import java.util.Date;
 
 /**
  * 监测点暂态事件明细数据(RMpEventDetail)实体类
@@ -48,6 +49,12 @@ public class RmpEventDetailVO implements Serializable {
     @ApiModelProperty(name = "measurementPointName",value = "监测点名称")
     private String measurementPointName;
 
+    /**
+     * 监测点类别
+     */
+    @ApiModelProperty(name = "monitorSort", value = "监测点类别")
+    private String monitorSort;
+
     /**
      * 事件类型
      */
@@ -64,7 +71,7 @@ public class RmpEventDetailVO implements Serializable {
      * 开始时间
      */
     @ApiModelProperty(name = "startTime",value = "开始时间")
-    private Long startTime;
+    private Date startTime;
 
     /**
      * 持续时间

pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/SimpleVO.java

@@ -0,0 +1,18 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author yzh
+ * @date 2022/10/24
+ */
+@Data
+public class SimpleVO implements Serializable {
+    private static final long serialVersionUID = 1L;
+
+    private String name;
+
+    private Double value;
+}