代码调整

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

pqs-event/event-boot/pom.xml

@@ -65,6 +65,12 @@
             <artifactId>common-echarts</artifactId>
             <version>1.0.0</version>
         </dependency>
+
+        <dependency>
+            <groupId>com.njcn</groupId>
+            <artifactId>pms-device-api</artifactId>
+            <version>1.0.0</version>
+        </dependency>
     </dependencies>
 
     <build>

pqs-event/event-boot/src/main/java/com/njcn/event/controller/distribution/PwEventCategoryDetailsController.java

@@ -0,0 +1,102 @@
+package com.njcn.event.controller.distribution;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.vo.EventDistributionStatisticsTableVO;
+import com.njcn.event.pojo.vo.EventFeatureAmplitudeCurveVO;
+import com.njcn.event.pojo.vo.SimpleVO;
+import com.njcn.event.service.distribution.PwEventCategoryDetailsService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 配网-暂态事件分布统计
+ *
+ * @author yzh
+ * @date 2022/10/27
+ */
+@RestController
+@RequestMapping("/pwEventCategoryDetails")
+@Api(tags = "配网-暂态事件分布统计")
+@RequiredArgsConstructor
+public class PwEventCategoryDetailsController extends BaseController {
+
+    private final PwEventCategoryDetailsService pwEventCategoryDetailsService;
+
+    /**
+     * 获取配网区域暂态指标统计
+     *
+     * @param param 前端传入参数
+     * @return 配网区域暂态指标统计
+     */
+    @PostMapping("/getPwEventCategoryDetails")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取配网暂态事件分布统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<EventDistributionStatisticsTableVO>> getPwEventCategoryDetails(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwEventCategoryDetails");
+        List<EventDistributionStatisticsTableVO> list = pwEventCategoryDetailsService.getPwEventCategoryDetails(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取配网持续时间概率分布函数
+     *
+     * @param param 前端传入参数
+     * @return 配网持续时间概率分布函数
+     */
+    @PostMapping("/getPwDurationLineChart")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取配网持续时间概率分布函数")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<SimpleVO>> getPwDurationLineChart(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwDurationLineChart");
+        List<SimpleVO> list = pwEventCategoryDetailsService.getPwDurationLineChart(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取配网暂降幅值概率分布函数
+     *
+     * @param param 前端传入参数
+     * @return 配网持续时间概率分布函数
+     */
+    @PostMapping("/getPwFeatureAmplitudeLineChart")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取配网暂降幅值概率分布函数")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<SimpleVO>> getPwFeatureAmplitudeLineChart(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwFeatureAmplitudeLineChart");
+        List<SimpleVO> list = pwEventCategoryDetailsService.getPwFeatureAmplitudeLineChart(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取配网暂态指标分布统计曲线图
+     *
+     * @param param 前端传入参数
+     * @return 配网持续时间概率分布函数
+     */
+    @PostMapping("/getPwEventFeatureAmplitudeCurve")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取配网暂态指标分布统计曲线图")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<EventFeatureAmplitudeCurveVO> getPwEventFeatureAmplitudeCurve(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwEventFeatureAmplitudeCurve");
+        EventFeatureAmplitudeCurveVO vo = pwEventCategoryDetailsService.getPwEventFeatureAmplitudeCurve(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, vo, methodDescribe);
+    }
+}

pqs-event/event-boot/src/main/java/com/njcn/event/controller/distribution/PwRStatEventController.java

@@ -0,0 +1,88 @@
+package com.njcn.event.controller.distribution;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.param.REventMParam;
+import com.njcn.event.pojo.vo.RArrayVO;
+import com.njcn.event.pojo.vo.REventPolylineVO;
+import com.njcn.event.service.majornetwork.RStatEventMService;
+import com.njcn.event.service.majornetwork.RStatEventQService;
+import com.njcn.event.service.majornetwork.RStatEventYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "配网指标分类概览-监测点分类总览")
+@RequestMapping("/event/pwRStatHarmonic")
+public class PwRStatEventController extends BaseController {
+
+    private final RStatEventYService rStatEventYService;
+    private final RStatEventQService rStatEventQService;
+    private final RStatEventMService rStatEventMService;
+
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @PostMapping("/getPwAllRStatEvent")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询暂态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getPwAllRStatEvent(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwAllRStatEvent");
+        List<RArrayVO> rStatHarmonicMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicMAll = rStatEventYService.getPwRStatEventYAll(param);
+                break;
+            //查询超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicMAll = rStatEventQService.getPwRStatEventQAll(param);
+                break;
+            //查询超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicMAll = rStatEventMService.getPwRStatEventMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicMAll, methodDescribe);
+    }
+
+
+    /**
+     * 暂态监测点-频率偏差-电压统计图
+     */
+    @PostMapping("/getPwRStatHarmonicIconDate")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("暂态监测点-频率偏差-越线日期统计图")
+    public HttpResult<List<REventPolylineVO>> getPwRStatHarmonicIconDate(@RequestBody REventMParam param) {
+        String methodDescribe = getMethodDescribe("getPwRStatHarmonicIconDate");
+        List<REventPolylineVO> rStatHarmonicIcon = rStatEventMService.getPwRStatHarmonicIcon2(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
+    }
+
+
+}
+

pqs-event/event-boot/src/main/java/com/njcn/event/controller/distribution/PwRStatEventOrgController.java

@@ -0,0 +1,103 @@
+package com.njcn.event.controller.distribution;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.param.REventMParam;
+import com.njcn.event.pojo.vo.RArrayVO;
+import com.njcn.event.pojo.vo.RStatEventMVO;
+import com.njcn.event.service.majornetwork.RStatEventOrgMService;
+import com.njcn.event.service.majornetwork.RStatEventOrgQService;
+import com.njcn.event.service.majornetwork.RStatEventOrgYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "配网指标分类概览-各单位分类总览")
+@RequestMapping("/event/pwRStatHarmonic")
+public class PwRStatEventOrgController extends BaseController {
+
+    private final RStatEventOrgYService rStatEventOrgYService;
+    private final RStatEventOrgQService rStatEventOrgQService;
+    private final RStatEventOrgMService rStatEventOrgMService;
+
+
+    /**
+     * 查询查询监测点暂态指标 日/月点数
+     */
+    @PostMapping("/getPwAllRStatEventOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询暂态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getPwAllRStatEventOrg(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getPwAllRStatEventOrg");
+        List<RArrayVO> rStatHarmonicOrgAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicOrgAll = rStatEventOrgYService.getPwRStatEventOrgYAll(param);
+                break;
+            //查询超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicOrgAll = rStatEventOrgQService.getPwRStatEventOrgQAll(param);
+                break;
+            //查询超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicOrgAll = rStatEventOrgMService.getPwRStatEventOrgMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgAll, methodDescribe);
+    }
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @PostMapping("/getPwAllRStatEventOrgIcon")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询暂态各单位超标监测统计图")
+    public HttpResult<List<RStatEventMVO>> getPwAllRStatEventOrgIcon(@RequestBody REventMParam param) {
+        String methodDescribe = getMethodDescribe("getPwAllRStatEventOrgIcon");
+        List<RStatEventMVO> orgList = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询各单位累计超标监测点数统计图-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                orgList = rStatEventOrgYService.getPwRStatHarmonicOrgYIcon(param);
+                break;
+            //查询各单位累计超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                orgList = rStatEventOrgQService.getPwRStatHarmonicOrgQIcon(param);
+                break;
+            //查询各单位累计超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                orgList = rStatEventOrgMService.getPwRStatHarmonicOrgMIcon(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, orgList, methodDescribe);
+    }
+
+}
+

pqs-event/event-boot/src/main/java/com/njcn/event/controller/distribution/PwRStatOrgController.java

@@ -0,0 +1,70 @@
+package com.njcn.event.controller.distribution;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.param.PwUniversalFrontEndParam;
+import com.njcn.event.pojo.vo.RStatEventOrgVO;
+import com.njcn.event.pojo.vo.RStatOrgVO;
+import com.njcn.event.service.distribution.PwRStatOrgService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 配网-暂态事件统计
+ *
+ * @author yzh
+ * @date 2022/10/24
+ */
+@RestController
+@RequestMapping("/pwRStatOrg")
+@Api(tags = "配网-暂态事件统计")
+@RequiredArgsConstructor
+public class PwRStatOrgController extends BaseController {
+
+    private final PwRStatOrgService pwRStatOrgService;
+
+    /**
+     * 获取配网区域暂态事件统计
+     *
+     * @param param 前端传入参数
+     * @return 配网区域暂态指标统计
+     */
+    @PostMapping("/getPwRStatOrg")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取配网区域暂态事件统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatOrgVO>> getPwRStatOrg(@RequestBody PwUniversalFrontEndParam param) {
+        String methodDescribe = getMethodDescribe("getPwRStatOrg");
+        List<RStatOrgVO> list = pwRStatOrgService.getPwRStatOrg(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取配网区域暂态事件分类统计
+     *
+     * @param param 前端传入参数
+     * @return 配网区域暂态指标统计
+     */
+    @PostMapping("/getPwRStatOrgClassified")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取配网区域暂态事件分类统计")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<RStatEventOrgVO>> getPwRStatOrgClassified(@RequestBody PwUniversalFrontEndParam param) {
+        String methodDescribe = getMethodDescribe("getPwRStatOrgClassified");
+        List<RStatEventOrgVO> list = pwRStatOrgService.getPwRStatOrgClassified(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/controller/distribution/PwRmpEventDetailController.java

@@ -0,0 +1,52 @@
+package com.njcn.event.controller.distribution;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.param.UniversalFrontEndParam;
+import com.njcn.event.pojo.vo.PwRmpEventDetailVO;
+import com.njcn.event.service.distribution.PwRmpEventDetailService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 配网-暂态事件明细
+ *
+ * @author yzh
+ * @date 2022/10/31
+ */
+@RestController
+@RequestMapping("/pwEventCategoryDetails")
+@Api(tags = "配网-暂态事件明细")
+@RequiredArgsConstructor
+public class PwRmpEventDetailController extends BaseController {
+
+    private final PwRmpEventDetailService pwRmpEventDetailService;
+
+    /**
+     * 获取配网暂态事件明细
+     *
+     * @param param 前端传入参数
+     * @return 暂态事件明细
+     */
+    @PostMapping("/getPwRmpEventDetail")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取暂态事件明细")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<PwRmpEventDetailVO>> getPwRmpEventDetail(@RequestBody UniversalFrontEndParam param) {
+        String methodDescribe = getMethodDescribe("getPwRmpEventDetail");
+        List<PwRmpEventDetailVO> list = pwRmpEventDetailService.getPwRmpEventDetail(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+}

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/AdvancedAnalysisController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import io.swagger.annotations.Api;
 import lombok.AllArgsConstructor;

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/AreaAnalysisController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -8,7 +8,7 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.AreaAnalysisVO;
 import com.njcn.event.pojo.vo.VoltageToleranceCurveVO;
-import com.njcn.event.service.AreaAnalysisService;
+import com.njcn.event.service.majornetwork.AreaAnalysisService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/AreaController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -11,7 +11,7 @@ import com.njcn.event.pojo.vo.AreaLineVO;
 import com.njcn.event.pojo.vo.EventHeatMapVO;
 import com.njcn.event.pojo.vo.EventSeverityVO;
 import com.njcn.event.pojo.vo.TerminalRunningStatisticsVO;
-import com.njcn.event.service.AreaLineService;
+import com.njcn.event.service.majornetwork.AreaLineService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/AreaStatisticalController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -7,7 +7,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.vo.AreaStatisticalVO;
-import com.njcn.event.service.AreaStatisticalService;
+import com.njcn.event.service.majornetwork.AreaStatisticalService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventDetailController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -7,7 +7,7 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.common.utils.LogUtil;
 import com.njcn.event.pojo.po.EventDetail;
-import com.njcn.event.service.EventDetailService;
+import com.njcn.event.service.majornetwork.EventDetailService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -18,6 +18,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.ArrayList;
 import java.util.List;
 
 /**
@@ -95,7 +96,7 @@ public class EventDetailController extends BaseController {
     public HttpResult<List<EventDetail>> getEventDetail(@RequestBody List<String> lineIndexes, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime) {
         String methodDescribe = getMethodDescribe("getEventDetail");
         LogUtil.njcnDebug(log, "{}，监测点id为：{}", methodDescribe, lineIndexes);
-        List<EventDetail> result = eventDetailService.getEventDetail(lineIndexes, startTime, endTime);
+        List<EventDetail> result = eventDetailService.getEventDetail(lineIndexes, startTime, endTime, new ArrayList<>());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 
@@ -119,7 +120,7 @@ public class EventDetailController extends BaseController {
     public HttpResult<List<EventDetail>> getEventDetailLimit(@RequestBody List<String> lineIndexes, @RequestParam("startTime") String startTime, @RequestParam("endTime") String endTime, @RequestParam("pageSize") Integer pageSize, @RequestParam("pageNum") Integer pageNum) {
         String methodDescribe = getMethodDescribe("getEventDetailLimit");
         LogUtil.njcnDebug(log, "{}，监测点id为：{}", methodDescribe, lineIndexes);
-        List<EventDetail> result = eventDetailService.getEventDetailLimit(lineIndexes, startTime, endTime, pageSize, pageNum);
+        List<EventDetail> result = eventDetailService.getEventDetailLimit(lineIndexes, startTime, endTime, pageSize, pageNum, new ArrayList<>());
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, result, methodDescribe);
     }
 

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventDistributionStatisticsController.java

@@ -0,0 +1,103 @@
+package com.njcn.event.controller.majornetwork;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.vo.EventDistributionStatisticsTableVO;
+import com.njcn.event.pojo.vo.EventFeatureAmplitudeCurveVO;
+import com.njcn.event.pojo.vo.SimpleVO;
+import com.njcn.event.service.majornetwork.EventDistributionStatisticsService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 主网-暂态指标分布统计
+ *
+ * @author yzh
+ * @date 2022/10/20
+ */
+
+@RestController
+@RequestMapping("/eventDistributionStatistics")
+@Api(tags = "主网-暂态指标分布统计")
+@RequiredArgsConstructor
+public class EventDistributionStatisticsController extends BaseController {
+
+    private final EventDistributionStatisticsService eventDistributionStatisticsService;
+
+    /**
+     * 获取暂态指标分布统计表格
+     *
+     * @param param 前端传入参数
+     * @return 暂态指标分布统计
+     */
+    @PostMapping("/getEventDistributionStatisticsTable")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取暂态指标分布统计表格")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<EventDistributionStatisticsTableVO>> getEventDistributionStatisticsTable(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getEventDistributionStatisticsTable");
+        List<EventDistributionStatisticsTableVO> eventDistributionStatisticsVO = eventDistributionStatisticsService.getEventDistributionStatisticsTable(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventDistributionStatisticsVO, methodDescribe);
+    }
+
+    /**
+     * 获取持续时间折线图
+     *
+     * @param param 前端传入参数
+     * @return 持续时间折线图
+     */
+    @PostMapping("/getEventDurationLineChart")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取持续时间折线图")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<SimpleVO>> getEventDurationLineChart(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getEventDurationLineChart");
+        List<SimpleVO> list = eventDistributionStatisticsService.getEventDurationLineChart(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取特征幅值折线图
+     *
+     * @param param 前端传入参数
+     * @return 特征幅值折线图
+     */
+    @PostMapping("/getEventFeatureAmplitudeLineChart")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取特征幅值折线图")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<List<SimpleVO>> getEventFeatureAmplitudeLineChart(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getEventFeatureAmplitudeLineChart");
+        List<SimpleVO> list = eventDistributionStatisticsService.getEventFeatureAmplitudeLineChart(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    /**
+     * 获取暂态指标分布统计曲线图
+     *
+     * @param param 前端传入参数
+     * @return 暂态指标分布统计曲线图
+     */
+    @PostMapping("/getEventFeatureAmplitudeCurve")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取暂态指标分布统计曲线图")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
+    public HttpResult<EventFeatureAmplitudeCurveVO> getEventFeatureAmplitudeCurve(@RequestBody StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getEventFeatureAmplitudeCurve");
+        EventFeatureAmplitudeCurveVO curve = eventDistributionStatisticsService.getEventFeatureAmplitudeCurve(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, curve, methodDescribe);
+    }
+}

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/EventMonitorReportController.java

@@ -0,0 +1,66 @@
+package com.njcn.event.controller.majornetwork;
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.param.EventMonitorReportParam;
+import com.njcn.event.pojo.vo.EventDipShortDistributionVO;
+import com.njcn.event.pojo.vo.EventMonitorReportVO;
+import com.njcn.event.pojo.vo.EventRiseDistributionVO;
+import com.njcn.event.service.majornetwork.EventMonitorReportService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 暂态指标监测点统计报表
+ * @Title EventMonitorDailyReportController
+ * @Package com.njcn.event.controller
+ * @Author jianghaifei
+ * @Date 2022-10-25 09:36
+ * @Version V1.0
+ */
+@RestController
+@RequestMapping("/eventMonitorReport")
+@Api(tags = "主网-暂态指标统计报表")
+@RequiredArgsConstructor
+public class EventMonitorReportController extends BaseController {
+
+    private final EventMonitorReportService eventMonitorReportService;
+
+    @PostMapping("getDailyReport")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("暂态指标监测点日报")
+    public HttpResult<List<EventMonitorReportVO>> getDailyReport(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
+        String methodDescribe = getMethodDescribe("getDailyReport");
+        List<EventMonitorReportVO> list = eventMonitorReportService.getDailyReport(eventMonitorReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+    }
+
+    @PostMapping("getEventDipShortDistribution")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("暂态指标监测点电压暂降和短时中断分布情况")
+    public HttpResult<EventDipShortDistributionVO> getEventDipShortDistribution(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
+        String methodDescribe = getMethodDescribe("getEventDipShortDistribution");
+        EventDipShortDistributionVO eventDipShortDistributionVO = eventMonitorReportService.getEventDipShortDistributionByCond(eventMonitorReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventDipShortDistributionVO, methodDescribe);
+    }
+
+    @PostMapping("getEventRiseDistribution")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("暂态指标监测点电压暂升分布情况")
+    public HttpResult<EventRiseDistributionVO> getEventRiseDistribution(@RequestBody EventMonitorReportParam eventMonitorReportParam) {
+        String methodDescribe = getMethodDescribe("getEventRiseDistribution");
+        EventRiseDistributionVO eventRiseDistributionVO = eventMonitorReportService.getEventRiseDistributionByCond(eventMonitorReportParam);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, eventRiseDistributionVO, methodDescribe);
+    }
+}

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/MonitorPointController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -11,10 +11,9 @@ import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.event.pojo.param.*;
 import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.vo.*;
-import com.njcn.event.service.EventAnalysisService;
+import com.njcn.event.service.majornetwork.EventAnalysisService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.*;
-import lombok.AllArgsConstructor;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.validation.annotation.Validated;

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventMController.java

@@ -0,0 +1,101 @@
+package com.njcn.event.controller.majornetwork;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.param.REventMParam;
+import com.njcn.event.pojo.vo.*;
+import com.njcn.event.service.majornetwork.RStatEventMService;
+import com.njcn.event.service.majornetwork.RStatEventQService;
+import com.njcn.event.service.majornetwork.RStatEventYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-监测点分类总览")
+@RequestMapping("/event/rStatHarmonic")
+public class RStatEventMController extends BaseController {
+
+    private final RStatEventYService rStatEventYService;
+    private final RStatEventQService rStatEventQService;
+    private final RStatEventMService rStatEventMService;
+
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatEvent")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询暂态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getAllRStatEventM(StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getAllRStatHarmonic");
+        List<RArrayVO> rStatHarmonicMAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicMAll = rStatEventYService.getRStatEventYAll(param);
+                break;
+            //查询超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicMAll = rStatEventQService.getRStatEventQAll(param);
+                break;
+            //查询超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicMAll = rStatEventMService.getRStatEventMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicMAll, methodDescribe);
+    }
+
+    /**
+     * 暂态按电压等级统计图
+     */
+    @GetMapping("/getRStatHarmonicIconVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("暂态电铁-频率偏差-电压统计图")
+    public HttpResult<List<RStatEventMVO>> getRStatEventIcon1(REventMParam param) {
+        String methodDescribe = getMethodDescribe("getRStatHarmonicIconVoltage");
+        List<RStatEventMVO> rStatHarmonicIcon = rStatEventMService.getRStatHarmonicIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
+    }
+
+
+    /**
+     * 暂态电铁-频率偏差-电压统计图
+     */
+    @GetMapping("/getRStatHarmonicIconDate")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("暂态电铁-频率偏差-越线日期统计图")
+    public HttpResult<List<REventPolylineVO>> getRStatEventIcon2(REventMParam param) {
+        String methodDescribe = getMethodDescribe("getRStatHarmonicIconDate");
+        List<REventPolylineVO> rStatHarmonicIcon = rStatEventMService.getRStatHarmonicIcon2(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicIcon, methodDescribe);
+    }
+
+
+}
+

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatEventOrgMController.java

@@ -0,0 +1,106 @@
+package com.njcn.event.controller.majornetwork;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.constant.BizParamConstant;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.param.REventMParam;
+import com.njcn.event.pojo.vo.RArrayVO;
+import com.njcn.event.pojo.vo.RStatEventMVO;
+import com.njcn.event.service.majornetwork.RStatEventOrgMService;
+import com.njcn.event.service.majornetwork.RStatEventOrgQService;
+import com.njcn.event.service.majornetwork.RStatEventOrgYService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-09
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-各单位分类总览")
+@RequestMapping("/event/rStatHarmonic")
+public class RStatEventOrgMController extends BaseController {
+
+    private final RStatEventOrgYService rStatEventOrgYService;
+    private final RStatEventOrgQService rStatEventOrgQService;
+    private final RStatEventOrgMService rStatEventOrgMService;
+
+
+    /**
+     * 查询查询监测点暂态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatEventOrg")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询暂态累计超标监测点数")
+    public HttpResult<List<RArrayVO>> getAllRStatEventOrg(StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getAllRStatEventOrg");
+        List<RArrayVO> rStatHarmonicOrgAll = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询超标监测点数-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                rStatHarmonicOrgAll = rStatEventOrgYService.getRStatEventOrgYAll(param);
+                break;
+            //查询超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                rStatHarmonicOrgAll = rStatEventOrgQService.getRStatEventOrgQAll(param);
+                break;
+            //查询超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                rStatHarmonicOrgAll = rStatEventOrgMService.getRStatEventOrgMAll(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, rStatHarmonicOrgAll, methodDescribe);
+    }
+
+    /**
+     * 查询查询监测点稳态指标 日/月点数
+     */
+    @GetMapping("/getAllRStatEventOrgIcon")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("查询暂态各单位超标监测统计图")
+    public HttpResult<List<RStatEventMVO>> getAllRStatEventOrgIcon(REventMParam param) {
+        String methodDescribe = getMethodDescribe("getAllRStatEventOrgIcon");
+        List<RStatEventMVO> getAllRStatEventOrgIcon = null;
+        String string = param.getType().toString();
+        switch (string) {
+            //查询各单位累计超标监测点数统计图-年数据
+            case BizParamConstant.STAT_BIZ_YEAR:
+                getAllRStatEventOrgIcon = rStatEventOrgYService.getRStatHarmonicOrgYIcon(param);
+                break;
+            //查询各单位累计超标监测点数-季数据
+            case BizParamConstant.STAT_BIZ_QUARTER:
+                getAllRStatEventOrgIcon = rStatEventOrgQService.getRStatHarmonicOrgQIcon(param);
+                break;
+            //查询各单位累计超标监测点数-月数据
+            case BizParamConstant.STAT_BIZ_MONTH:
+                getAllRStatEventOrgIcon = rStatEventOrgMService.getRStatHarmonicOrgMIcon(param);
+                break;
+            default:
+                break;
+        }
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, getAllRStatEventOrgIcon, methodDescribe);
+    }
+
+
+}
+

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RStatSubstationMController.java

@@ -0,0 +1,80 @@
+package com.njcn.event.controller.majornetwork;
+
+
+import com.njcn.common.pojo.annotation.OperateInfo;
+import com.njcn.common.pojo.enums.common.LogEnum;
+import com.njcn.common.pojo.enums.response.CommonResponseEnum;
+import com.njcn.common.pojo.param.StatisticsBizBaseParam;
+import com.njcn.common.pojo.response.HttpResult;
+import com.njcn.common.utils.HttpResultUtil;
+import com.njcn.event.pojo.vo.RSubstationIcon2VO;
+import com.njcn.event.pojo.vo.RSubstationIconVO;
+import com.njcn.event.pojo.vo.RVoltageIconVO;
+import com.njcn.event.service.majornetwork.RStatSubstationMService;
+import com.njcn.event.service.majornetwork.RStatSubstationVoltageMService;
+import com.njcn.web.controller.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+
+/**
+ * <p>
+ * 前端控制器
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+@RestController
+@RequiredArgsConstructor
+@Api(tags = "主网指标分类概览-变电站分类总览")
+@RequestMapping("/event/rStatSubstation")
+public class RStatSubstationMController extends BaseController {
+
+    private final RStatSubstationMService rStatSubstationMService;
+    private final RStatSubstationVoltageMService rStatSubstationVoltageMService;
+
+    /**
+     * 变电站暂态指标超标分布（按发生频次）
+     */
+    @GetMapping("/getStatSubstationIconDistributed")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站暂态分布（按发生频次）")
+    public HttpResult<RSubstationIconVO> getAllRStatSubstation(StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getStatSubstationIconDistributed");
+        RSubstationIconVO statSubstationIcon = rStatSubstationMService.getStatSubstationIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+    /**
+     * 变电站暂态分布（按电压等级）
+     */
+    @GetMapping("/getStatSubstationIconVoltage")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站暂态分布（按电压等级）")
+    public HttpResult<List<RVoltageIconVO>> getAllRStatSubstationIcon2(StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getStatSubstationIconVoltage");
+        List<RVoltageIconVO> statSubstationIcon = rStatSubstationVoltageMService.getStatSubstationIcon(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+
+
+    /**
+     * 变电站暂态指标发生频次
+     */
+    @GetMapping("/getStatSubstationIconIndex")
+    @OperateInfo(info = LogEnum.BUSINESS_COMMON)
+    @ApiOperation("变电站暂态指标发生频次")
+    public HttpResult<List<RSubstationIcon2VO>> getAllRStatSubstationIcon3(StatisticsBizBaseParam param) {
+        String methodDescribe = getMethodDescribe("getStatSubstationIconIndex");
+        List<RSubstationIcon2VO> statSubstationIcon = rStatSubstationMService.getStatSubstationIcon2(param);
+        return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, statSubstationIcon, methodDescribe);
+    }
+}
+

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/ReportController.java

@@ -1,21 +1,18 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
-import com.njcn.common.pojo.dto.SimpleDTO;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
 import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
-import com.njcn.device.pq.api.GeneralDeviceInfoClient;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.event.pojo.param.*;
 import com.njcn.event.pojo.vo.DetailVO;
 import com.njcn.event.pojo.vo.GeneralVO;
 import com.njcn.event.pojo.vo.ReasonsVO;
 import com.njcn.event.pojo.vo.WaveTypeVO;
-import com.njcn.event.service.ReportService;
-import com.njcn.poi.util.PoiUtil;
+import com.njcn.event.service.majornetwork.ReportService;
 import com.njcn.web.controller.BaseController;
 import freemarker.template.TemplateException;
 import io.swagger.annotations.Api;
@@ -23,22 +20,13 @@ import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.hssf.usermodel.*;
 import org.apache.poi.openxml4j.exceptions.InvalidFormatException;
-import org.apache.poi.ss.usermodel.ClientAnchor;
-import org.apache.poi.ss.usermodel.HorizontalAlignment;
-import org.apache.poi.ss.usermodel.VerticalAlignment;
-import org.apache.poi.ss.util.CellRangeAddress;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.awt.*;
-import java.io.ByteArrayOutputStream;
-import java.io.FileOutputStream;
 import java.io.IOException;
 import java.text.ParseException;
-import java.util.*;
 import java.util.List;
 
 /**

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/RmpEventDetailController.java

@@ -1,6 +1,6 @@
-package com.njcn.event.controller;
-
+package com.njcn.event.controller.majornetwork;
 
+import cn.hutool.core.collection.CollectionUtil;
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
 import com.njcn.common.pojo.enums.response.CommonResponseEnum;
@@ -8,20 +8,19 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.event.pojo.param.UniversalFrontEndParam;
 import com.njcn.event.pojo.vo.RmpEventDetailVO;
-import com.njcn.event.service.RmpEventDetailService;
+import com.njcn.event.service.majornetwork.RmpEventDetailService;
+import com.njcn.system.pojo.po.DictData;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
 
 /**
- * 暂态事件明细
+ * 主网-暂态事件明细
  *
  * @author yzh
  * @date 2022/10/12
@@ -29,7 +28,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/rmpEventDetail")
-@Api(tags = "暂态事件明细")
+@Api(tags = "主网-暂态事件明细")
 @RequiredArgsConstructor
 public class RmpEventDetailController extends BaseController {
 
@@ -43,11 +42,31 @@ public class RmpEventDetailController extends BaseController {
      */
     @PostMapping("/getDetailsOfTransientEvents")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
-    @ApiOperation("获取区域暂态指标统计")
-//    @ApiImplicitParam(name = "UniversalFrontEndParam", value = "前端参数", required = true)
+    @ApiOperation("获取暂态事件明细")
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
     public HttpResult<List<RmpEventDetailVO>> getRmpEventDetail(@RequestBody UniversalFrontEndParam param) {
         String methodDescribe = getMethodDescribe("getRmpEventDetail");
         List<RmpEventDetailVO> list = rmpEventDetailService.getRmpEventDetail(param);
         return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
     }
+
+
+    /**
+     * 获取暂态指标类型列表
+     *
+     * @return 暂态指标类型列表
+     */
+    @GetMapping("/getEventStatisList")
+    @OperateInfo(info = LogEnum.SYSTEM_COMMON)
+    @ApiOperation("获取暂态指标类型列表")
+    public HttpResult<List<DictData>> getEventStatisList() {
+        String methodDescribe = getMethodDescribe("getEventStatisList");
+        List<DictData> list = rmpEventDetailService.getEventStatisList();
+        if (CollectionUtil.isEmpty(list)) {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.NO_DATA, null, methodDescribe);
+        } else {
+            return HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, list, methodDescribe);
+        }
+    }
+
 }

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/StatisticsOfTransientIndicatorsController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -9,9 +9,10 @@ import com.njcn.event.pojo.param.UniversalFrontEndParam;
 import com.njcn.event.pojo.vo.RStatEventOrgVO;
 import com.njcn.event.pojo.vo.RStatOrgVO;
 import com.njcn.event.pojo.vo.RStatSubstationVO;
-import com.njcn.event.service.StatisticsOfTransientIndicatorssService;
+import com.njcn.event.service.majornetwork.StatisticsOfTransientIndicatorssService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiOperation;
 import lombok.RequiredArgsConstructor;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +23,7 @@ import org.springframework.web.bind.annotation.RestController;
 import java.util.List;
 
 /**
- * 暂态指标统计
+ * 主网-暂态指标统计
  *
  * @author yzh
  * @date 2022/10/10
@@ -30,7 +31,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping("/statisticsOfTransientIndicators")
-@Api(tags = "暂态指标统计")
+@Api(tags = "主网-暂态指标统计")
 @RequiredArgsConstructor
 public class StatisticsOfTransientIndicatorsController extends BaseController {
 
@@ -45,7 +46,7 @@ public class StatisticsOfTransientIndicatorsController extends BaseController {
     @PostMapping("/getRStatOrg")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("获取区域暂态指标统计")
-//    @ApiImplicitParam(name = "UniversalFrontEndParam", value = "前端参数", required = true)
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
     public HttpResult<List<RStatOrgVO>> getRStatOrg(@RequestBody UniversalFrontEndParam param) {
         String methodDescribe = getMethodDescribe("getRStatOrg");
         List<RStatOrgVO> list = statisticsOfTransientIndicatorssService.getRStatOrg(param);
@@ -61,7 +62,7 @@ public class StatisticsOfTransientIndicatorsController extends BaseController {
     @PostMapping("/getRStatEventOrg")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("获取区域暂态指标分类统计表")
-//    @ApiImplicitParam(name = "UniversalFrontEndParam", value = "前端参数", required = true)
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
     public HttpResult<List<RStatEventOrgVO>> getRStatEventOrg(@RequestBody UniversalFrontEndParam param) {
         String methodDescribe = getMethodDescribe("getRStatEventOrg");
         List<RStatEventOrgVO> list = statisticsOfTransientIndicatorssService.getRStatEventOrg(param);
@@ -78,7 +79,7 @@ public class StatisticsOfTransientIndicatorsController extends BaseController {
     @PostMapping("/getRStatSubstation")
     @OperateInfo(info = LogEnum.SYSTEM_COMMON)
     @ApiOperation("获取变电站暂态指标分类统计表")
-//    @ApiImplicitParam(name = "UniversalFrontEndParam", value = "前端参数", required = true)
+    @ApiImplicitParam(name = "param", value = "条件参数", required = true)
     public HttpResult<List<RStatSubstationVO>> getRStatSubstation(@RequestBody UniversalFrontEndParam param) {
         String methodDescribe = getMethodDescribe("getRStatSubstation");
         List<RStatSubstationVO> list = statisticsOfTransientIndicatorssService.getRStatSubstation(param);

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/TransientController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller;
+package com.njcn.event.controller.majornetwork;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.njcn.common.pojo.annotation.OperateInfo;
@@ -12,7 +12,7 @@ import com.njcn.event.pojo.param.TransientParam;
 import com.njcn.event.pojo.param.WaveFileParam;
 import com.njcn.event.pojo.po.EventDetailNew;
 import com.njcn.event.pojo.vo.TransientVO;
-import com.njcn.event.service.TransientService;
+import com.njcn.event.service.majornetwork.TransientService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

pqs-event/event-boot/src/main/java/com/njcn/event/controller/majornetwork/area/AreaInfoController.java

@@ -1,4 +1,4 @@
-package com.njcn.event.controller.area;
+package com.njcn.event.controller.majornetwork.area;
 
 import com.njcn.common.pojo.annotation.OperateInfo;
 import com.njcn.common.pojo.enums.common.LogEnum;
@@ -7,10 +7,9 @@ import com.njcn.common.pojo.response.HttpResult;
 import com.njcn.common.utils.HttpResultUtil;
 import com.njcn.device.pq.pojo.param.DeviceInfoParam;
 import com.njcn.device.pq.pojo.vo.TerminalBaseVO;
-import com.njcn.event.pojo.po.EventDetail;
 import com.njcn.event.pojo.po.EventDetailNew;
 import com.njcn.event.pojo.vo.AreaSubLineVO;
-import com.njcn.event.service.AreaInfoService;
+import com.njcn.event.service.majornetwork.AreaInfoService;
 import com.njcn.web.controller.BaseController;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/RStatOrgMapper.java

@@ -1,56 +0,0 @@
-package com.njcn.event.mapper;
-
-
-import com.njcn.event.pojo.vo.RStatOrgVO;
-import org.apache.ibatis.annotations.Mapper;
-import org.apache.ibatis.annotations.Param;
-
-import java.util.List;
-
-/**
- * 暂态指标统计
- *
- * @author yzh
- * @date 2022/10/10
- */
-
-@Mapper
-public interface RStatOrgMapper {
-
-    /**
-     * 获取年区域暂态指标统计
-     *
-     * @param deptIds   单位id
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return 年区域暂态指标统计
-     */
-    List<RStatOrgVO> getYearRStatOrgInfo(@Param("deptIds") List<String> deptIds,
-                                         @Param("startTime") String startTime,
-                                         @Param("endTime") String endTime);
-
-    /**
-     * 获取季区域暂态指标统计
-     *
-     * @param deptIds   单位id
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return 季区域暂态指标统计
-     */
-    List<RStatOrgVO> getQuarterRStatOrgInfo(@Param("deptIds") List<String> deptIds,
-                                    @Param("startTime") String startTime,
-                                    @Param("endTime") String endTime);
-
-    /**
-     * 获取月区域暂态指标统计
-     *
-     * @param deptIds   单位id
-     * @param startTime 开始时间
-     * @param endTime   结束时间
-     * @return 月区域暂态指标统计
-     */
-    List<RStatOrgVO> getMonthRStatOrgInfo(@Param("deptIds") List<String> deptIds,
-                                  @Param("startTime") String startTime,
-                                  @Param("endTime") String endTime);
-
-}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/RmpEventDetailMapper.java

@@ -1,16 +0,0 @@
-package com.njcn.event.mapper;
-
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.njcn.event.pojo.vo.RmpEventDetailVO;
-import org.apache.ibatis.annotations.Mapper;
-
-/**
- * 暂态事件明细
- *
- * @author yzh
- * @date 2022/10/12
- */
-@Mapper
-public interface RmpEventDetailMapper extends BaseMapper<RmpEventDetailVO> {
-}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwEventCategoryDetailsMapper.java

@@ -0,0 +1,76 @@
+package com.njcn.event.mapper.distribution;
+
+import com.njcn.event.pojo.po.EventDistributionStatisticsPO;
+import com.njcn.event.pojo.po.EventDurationLineChartPO;
+import com.njcn.event.pojo.po.EventFeatureAmplitudeLineChartPO;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 配网-暂态事件分布统计
+ *
+ * @author yzh
+ * @date 2022/10/28
+ */
+@Mapper
+public interface PwEventCategoryDetailsMapper {
+
+    /**
+     * 获取配网暂态指标分布统计
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return com.njcn.event.pojo.po.EventDistributionStatisticsPO
+     * @author yzh
+     * @date 2022/10/31
+     */
+    EventDistributionStatisticsPO getPwEventCategoryDetailsMapper(@Param("monitorIdList") List<String> monitorIdList,
+                                                                  @Param("startTime") String startTime,
+                                                                  @Param("endTime") String endTime);
+
+    /**
+     * 获取配网持续时间折线图
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return 持续时间折线图
+     * @author yzh
+     * @date 2022/10/31
+     */
+    EventDurationLineChartPO getPwEventDurationLineChart(@Param("monitorIdList") List<String> monitorIdList,
+                                                         @Param("startTime") String startTime,
+                                                         @Param("endTime") String endTime);
+
+    /**
+     * 获取配网特征幅值折线图
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return com.njcn.event.pojo.po.EventFeatureAmplitudeLineChartPO
+     * @author yzh
+     * @date 2022/10/31
+     */
+    EventFeatureAmplitudeLineChartPO getPwEventFeatureAmplitudeLineChart(@Param("monitorIdList") List<String> monitorIdList,
+                                                                         @Param("startTime") String startTime,
+                                                                         @Param("endTime") String endTime);
+
+    /**
+     * 获取配网监测点暂态事件明细数据
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return java.util.List<com.njcn.event.pojo.po.RmpEventDetailPO>
+     * @author yzh
+     * @date 2022/10/31
+     */
+    List<RmpEventDetailPO> getPwRmpEventDetail(@Param("monitorIdList") List<String> monitorIdList,
+                                               @Param("startTime") String startTime,
+                                               @Param("endTime") String endTime);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRStatOrgClassifiedMapper.java

@@ -0,0 +1,60 @@
+package com.njcn.event.mapper.distribution;
+
+import com.njcn.event.pojo.po.RStatEventOrgPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 配网-暂态事件统计
+ *
+ * @author yzh
+ * @date 2022/10/25
+ */
+
+@Mapper
+public interface PwRStatOrgClassifiedMapper {
+    /**
+     * 获取配网区域暂态事件分类统计（年）
+     * <p>
+     *
+     * @param deptIdList  单位id
+     * @param startTime   开始时间
+     * @param endTime     结束时间
+     * @param monitorSort 监测点类别
+     * @return 配网区域暂态事件分类统计（年）
+     */
+    List<RStatEventOrgPO> getYearInfo(@Param("deptIdList") List<String> deptIdList,
+                                      @Param("startTime") String startTime,
+                                      @Param("endTime") String endTime,
+                                      @Param("monitorSort") List<String> monitorSort);
+
+    /**
+     * 获取配网区域暂态事件分类统计（月）
+     *
+     * @param deptIdList  单位id
+     * @param startTime   开始时间
+     * @param endTime     结束时间
+     * @param monitorSort 监测点类别
+     * @return 配网区域暂态事件分类统计（月）
+     */
+    List<RStatEventOrgPO> getQuarterInfo(@Param("deptIdList") List<String> deptIdList,
+                                         @Param("startTime") String startTime,
+                                         @Param("endTime") String endTime,
+                                         @Param("monitorSort") List<String> monitorSort);
+
+    /**
+     * 获取配网区域暂态事件分类统计（月）
+     *
+     * @param deptIdList  单位id
+     * @param startTime   开始时间
+     * @param endTime     结束时间
+     * @param monitorSort 监测点类别
+     * @return 配网区域暂态事件分类统计（月）
+     */
+    List<RStatEventOrgPO> getMonthInfo(@Param("deptIdList") List<String> deptIdList,
+                                       @Param("startTime") String startTime,
+                                       @Param("endTime") String endTime,
+                                       @Param("monitorSort") List<String> monitorSort);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRStatOrgMapper.java

@@ -0,0 +1,59 @@
+package com.njcn.event.mapper.distribution;
+
+import com.njcn.event.pojo.po.RStatOrgPO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 配网-暂态事件统计
+ *
+ * @author yzh
+ * @date 2022/10/24
+ */
+
+@Mapper
+public interface PwRStatOrgMapper {
+    /**
+     * 获取配网区域暂态指标统计（年）
+     *
+     * @param deptIdList  单位id
+     * @param startTime   开始时间
+     * @param endTime     结束时间
+     * @param monitorSort 监测点类别
+     * @return 配网区域暂态指标统计（年）
+     */
+    List<RStatOrgPO> getYearInfo(@Param("deptIdList") List<String> deptIdList,
+                                 @Param("startTime") String startTime,
+                                 @Param("endTime") String endTime,
+                                 @Param("monitorSort") List<String> monitorSort);
+
+    /**
+     * 获取配网区域暂态指标统计（季）
+     *
+     * @param deptIdList  单位id
+     * @param startTime   开始时间
+     * @param endTime     结束时间
+     * @param monitorSort 监测点类别
+     * @return 配网区域暂态指标统计（季）
+     */
+    List<RStatOrgPO> getQuarterInfo(@Param("deptIdList") List<String> deptIdList,
+                                    @Param("startTime") String startTime,
+                                    @Param("endTime") String endTime,
+                                    @Param("monitorSort") List<String> monitorSort);
+
+    /**
+     * 获取配网区域暂态指标统计（月）
+     *
+     * @param deptIdList  单位id
+     * @param startTime   开始时间
+     * @param endTime     结束时间
+     * @param monitorSort 监测点类别
+     * @return 配网区域暂态指标统计（月）
+     */
+    List<RStatOrgPO> getMonthInfo(@Param("deptIdList") List<String> deptIdList,
+                                  @Param("startTime") String startTime,
+                                  @Param("endTime") String endTime,
+                                  @Param("monitorSort") List<String> monitorSort);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/PwRmpEventDetailMapper.java

@@ -0,0 +1,26 @@
+package com.njcn.event.mapper.distribution;
+
+import com.njcn.event.pojo.param.UniversalFrontEndParam;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
+
+import java.util.List;
+
+/**
+ * 配网-暂态事件明细
+ *
+ * @author yzh
+ * @date 2022/10/31
+ */
+
+public interface PwRmpEventDetailMapper {
+
+    /**
+     * 获取配网暂态事件明细
+     *
+     * @param param 条件参数
+     * @return java.util.List<com.njcn.event.pojo.po.RmpEventDetailPO>
+     * @author yzh
+     * @date 2022/10/31
+     */
+    List<RmpEventDetailPO> getPwRmpEventDetail(UniversalFrontEndParam param);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwEventCategoryDetailsMapper.xml

@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.distribution.PwEventCategoryDetailsMapper">
+
+    <!--获取暂态指标分布统计-->
+    <select id="getPwEventCategoryDetailsMapper"
+            resultType="com.njcn.event.pojo.po.EventDistributionStatisticsPO">
+        SELECT
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 60000 AND
+        duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with180000s"
+        FROM
+        (
+        SELECT
+        duration,
+        feature_amplitude
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        )
+        r
+    </select>
+
+    <!--获取持续时间折线图-->
+    <select id="getPwEventDurationLineChart" resultType="com.njcn.event.pojo.po.EventDurationLineChartPO">
+        SELECT COALESCE
+        (
+        round(sum(CASE WHEN duration &gt; 0 AND duration &lt;= 100 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration100",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 100 AND duration &lt;= 250 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration250",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 250 AND duration &lt;= 500 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration500",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 500 AND duration &lt;= 1000 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration1000",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 1000 AND duration &lt;= 1100 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration1100"
+        FROM
+        (
+        SELECT
+        measurement_point_id,
+        duration
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        )
+        r
+    </select>
+
+    <!--获取特征幅值折线图-->
+    <select id="getPwEventFeatureAmplitudeLineChart"
+            resultType="com.njcn.event.pojo.po.EventFeatureAmplitudeLineChartPO"> SELECT
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 0 AND feature_amplitude &lt;= 10 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude10",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 10 AND feature_amplitude &lt;= 20 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude20",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 20 AND feature_amplitude &lt;= 30 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude30",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 30 AND feature_amplitude &lt;= 40 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude40",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 40 AND feature_amplitude &lt;= 50 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude50",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 50 AND feature_amplitude &lt;= 60 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude60",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 60 AND feature_amplitude &lt;= 70 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude70",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 70 AND feature_amplitude &lt;= 80 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude80",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 80 AND feature_amplitude &lt;= 90 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude90"
+        FROM
+        (
+        SELECT
+        measurement_point_id,
+        feature_amplitude
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        ) AS r</select>
+
+    <!--获取配网监测点暂态事件明细数据-->
+    <select id="getPwRmpEventDetail" resultType="com.njcn.event.pojo.po.RmpEventDetailPO">
+        SELECT
+            measurement_point_id as measurementPointId,
+            start_time AS startTime,
+            duration AS duration,
+            feature_amplitude AS featureAmplitude
+        FROM
+            `r_mp_event_detail`
+    </select>
+
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgClassifiedMapper.xml

@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.distribution.PwRStatOrgClassifiedMapper">
+
+    <sql id="query_field">
+        rso.org_no AS orgNo,
+	    rso.data_date AS dataDate,
+        rso.measurement_type_class AS measurementTypeClass,
+	    rso.effective_measurement_average AS effectiveMeasurementAverage,
+	    rso.effective_measurement_accrued AS effectiveMeasurementAccrued,
+	    rso.event_measurement_average AS eventMeasurementAverage,
+	    rso.event_measurement_accrued AS eventMeasurementAccrued,
+        rso.event_freq AS eventFreq,
+        rso.event_count AS eventCount,
+	    rseo.event_type,
+	    rseo.event_measurement_average AS eEventMeasurementAverage,
+	    rseo.event_measurement_accrued AS eEventMeasurementAccrued,
+	    rseo.event_measurement_ratio_average AS eEventMeasurementRatioAverage,
+	    rseo.event_measurement_ratio_accrued AS eEventMeasurementRatioAccrued,
+	    rseo.event_freq AS eEventFreq,
+	    rseo.event_count AS eEventCount,
+	    rseo.data_type AS dataType
+    </sql>
+    <sql id="query_where">
+        rso.data_type = 02
+        AND rseo.data_type = 02
+        AND rso.org_no IN
+        <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="monitorSort != null and monitorSort.size() >0">
+
+        </if>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(rso.data_date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(rso.data_date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+    </sql>
+
+
+    <!--获取配网区域暂态事件分类统计（年）-->
+    <select id="getYearInfo" resultType="com.njcn.event.pojo.po.RStatEventOrgPO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_org_y AS rso
+        LEFT JOIN r_stat_event_org_y AS rseo ON rso.org_no = rseo.org_no
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网区域暂态事件分类统计（月）-->
+    <select id="getQuarterInfo" resultType="com.njcn.event.pojo.po.RStatEventOrgPO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_org_q AS rso
+        LEFT JOIN r_stat_event_org_q AS rseo ON rso.org_no = rseo.org_no
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网区域暂态事件分类统计（月）-->
+    <select id="getMonthInfo" resultType="com.njcn.event.pojo.po.RStatEventOrgPO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        r_stat_org_m AS rso
+        LEFT JOIN r_stat_event_org_m AS rseo ON rso.org_no = rseo.org_no
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRStatOrgMapper.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.distribution.PwRStatOrgMapper">
+
+    <sql id="query_field">
+        org_no AS orgNo,
+        Data_Date AS dataDate,
+        measurement_type_class AS measurementTypeClass,
+        effective_measurement_average AS effectiveMeasurementAverage,
+        effective_measurement_accrued AS effectiveMeasurementAccrued,
+        event_measurement_average AS eventMeasurementAverage,
+        event_measurement_accrued AS eventMeasurementAccrued,
+        event_count AS eventCount,
+        event_freq AS eventFreq,
+        data_Type AS dataType
+    </sql>
+    <sql id="query_where">
+        data_type = 02
+        AND org_no IN
+        <foreach collection="deptIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(Data_Date, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(Data_Date, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        <if test="monitorSort != null and monitorSort.size() != 0">
+            AND measurement_type_class IN
+            <foreach collection="monitorSort" item="item" open="(" close=")" separator=",">
+                #{item}
+            </foreach>
+        </if>
+    </sql>
+
+
+    <!--配网区域暂态指标统计（年）-->
+    <select id="getYearInfo" resultType="com.njcn.event.pojo.po.RStatOrgPO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        `r_stat_org_y`
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网区域暂态指标统计（季）-->
+    <select id="getQuarterInfo" resultType="com.njcn.event.pojo.po.RStatOrgPO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        `r_stat_org_q`
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+
+    <!--获取配网区域暂态指标统计（月）-->
+    <select id="getMonthInfo" resultType="com.njcn.event.pojo.po.RStatOrgPO">
+        SELECT
+        <include refid="query_field"></include>
+        FROM
+        `r_stat_org_m`
+        WHERE
+        <include refid="query_where"></include>
+    </select>
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/distribution/mapping/PwRmpEventDetailMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.distribution.PwRmpEventDetailMapper">
+
+    <!--获取配网暂态事件明细-->
+    <select id="getPwRmpEventDetail" resultType="com.njcn.event.pojo.po.RmpEventDetailPO">
+        SELECT
+            event_id AS eventId,
+            measurement_point_id AS measurementPointId,
+            event_type AS eventType,
+            start_time AS startTime,
+            duration AS duration,
+            feature_amplitude AS featureAmplitude,
+            phase AS phase,
+            event_describe AS eventDescribe,
+            wave_path AS wavePath
+        FROM
+            r_mp_event_detail
+    </select>
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/EventDistributionStatisticsMapper.java

@@ -0,0 +1,89 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.njcn.event.pojo.po.EventDistributionStatisticsPO;
+import com.njcn.event.pojo.po.EventDurationLineChartPO;
+import com.njcn.event.pojo.po.EventFeatureAmplitudeLineChartPO;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
+import com.njcn.event.pojo.vo.EventDipShortDistributionVO;
+import com.njcn.event.pojo.vo.EventRiseDistributionVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author yzh
+ * @date 2022/10/20
+ */
+
+@Mapper
+public interface EventDistributionStatisticsMapper {
+
+    /**
+     * 获取暂态指标分布统计
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return 暂态指标分布统计
+     */
+    EventDistributionStatisticsPO getEventDistributionStatistics(@Param("monitorIdList") List<String> monitorIdList,
+                                                                 @Param("startTime") String startTime,
+                                                                 @Param("endTime") String endTime);
+
+    /**
+     * 获取持续时间折线图
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return 持续时间折线图
+     */
+    EventDurationLineChartPO getEventDurationLineChart(@Param("monitorIdList") List<String> monitorIdList,
+                                                       @Param("startTime") String startTime,
+                                                       @Param("endTime") String endTime);
+
+    /**
+     * 获取特征幅值折线图
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return 特征幅值折线图
+     */
+    EventFeatureAmplitudeLineChartPO getEventFeatureAmplitudeLineChart(@Param("monitorIdList") List<String> monitorIdList,
+                                                                       @Param("startTime") String startTime,
+                                                                       @Param("endTime") String endTime);
+
+    /**
+     * 获取监测点暂态事件明细数据
+     *
+     * @param monitorIdList 监测点id
+     * @param startTime     开始时间
+     * @param endTime       结束时间
+     * @return 监测点暂态事件明细数据
+     */
+    List<RmpEventDetailPO> getRmpEventDetail(@Param("monitorIdList") List<String> monitorIdList,
+                                             @Param("startTime") String startTime,
+                                             @Param("endTime") String endTime);
+
+
+    /***
+     * 获取监测点电压暂降和短时中断分布情况
+     * @author jianghaifei
+     * @date 2022-10-27 10:46
+     * @param map
+     * @return com.njcn.event.pojo.vo.EventDipShortDistributionVO
+     */
+    EventDipShortDistributionVO getEventDipShortDistributionByCond(Map<String, Object> map);
+
+    /***
+     * 获取监测点电压暂升分布情况
+     * @author jianghaifei
+     * @date 2022-10-27 10:46
+     * @param map
+     * @return com.njcn.event.pojo.vo.EventRiseDistributionVO
+     */
+    EventRiseDistributionVO getEventRiseDistributionByCond(Map<String, Object> map);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/PmsMonitorMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.event.mapper;
+package com.njcn.event.mapper.majornetwork;
 
 import com.njcn.event.pojo.po.PmsMonitorPO;
 import org.apache.ibatis.annotations.Mapper;

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/PqDeviceMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.event.mapper;
+package com.njcn.event.mapper.majornetwork;
 
 import com.njcn.event.pojo.po.PqDevice;
 import org.apache.ibatis.annotations.Param;

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventDMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.po.RStatEventD;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatEventDMapper extends BaseMapper<RStatEventD> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventMMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.po.RStatEventM;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-11
+ */
+public interface RStatEventMMapper extends BaseMapper<RStatEventM> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventOrgMMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.po.RStatEventOrgM;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-11
+ */
+public interface RStatEventOrgMMapper extends BaseMapper<RStatEventOrgM> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventOrgMapper.java

@@ -1,7 +1,6 @@
-package com.njcn.event.mapper;
+package com.njcn.event.mapper.majornetwork;
 
-
-import com.njcn.event.pojo.vo.RStatEventOrgVO;
+import com.njcn.event.pojo.po.RStatEventOrgPO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -19,37 +18,43 @@ public interface RStatEventOrgMapper {
     /**
      * 获取年区域暂态指标分类统计表
      *
-     * @param deptIds   部门id
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param deptIds        部门id
+     * @param startTime      开始时间
+     * @param endTime        结束时间
+     * @param mainnetPointId 主网字典id
      * @return 年区域暂态指标分类统计表
      */
-    List<RStatEventOrgVO> getYearRStatEventOrgInfo(@Param("deptIds") List<String> deptIds,
+    List<RStatEventOrgPO> getYearRStatEventOrgInfo(@Param("deptIds") List<String> deptIds,
                                                    @Param("startTime") String startTime,
-                                                   @Param("endTime") String endTime);
+                                                   @Param("endTime") String endTime,
+                                                   @Param("mainnetPointId") String mainnetPointId);
 
     /**
      * 获取季区域暂态指标分类统计表
      *
-     * @param deptIds   部门id
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param deptIds        部门id
+     * @param startTime      开始时间
+     * @param endTime        结束时间
+     * @param mainnetPointId 主网字典id
      * @return 季区域暂态指标分类统计表
      */
-    List<RStatEventOrgVO> getQuarterRStatEventOrgInfo(@Param("deptIds") List<String> deptIds,
+    List<RStatEventOrgPO> getQuarterRStatEventOrgInfo(@Param("deptIds") List<String> deptIds,
                                                       @Param("startTime") String startTime,
-                                                      @Param("endTime") String endTime);
+                                                      @Param("endTime") String endTime,
+                                                      @Param("mainnetPointId") String mainnetPointId);
 
     /**
      * 获取月区域暂态指标分类统计表
      *
-     * @param deptIds   部门id
-     * @param startTime 开始时间
-     * @param endTime   结束时间
+     * @param deptIds        部门id
+     * @param startTime      开始时间
+     * @param endTime        结束时间
+     * @param mainnetPointId 主网字典id
      * @return 月区域暂态指标分类统计表
      */
-    List<RStatEventOrgVO> getMonthRStatEventOrgInfoInfo(@Param("deptIds") List<String> deptIds,
+    List<RStatEventOrgPO> getMonthRStatEventOrgInfoInfo(@Param("deptIds") List<String> deptIds,
                                                         @Param("startTime") String startTime,
-                                                        @Param("endTime") String endTime);
+                                                        @Param("endTime") String endTime,
+                                                        @Param("mainnetPointId") String mainnetPointId);
 
 }

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventOrgQMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.njcn.event.pojo.po.RStatEventOrgQ;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatEventOrgQMapper extends BaseMapper<RStatEventOrgQ> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventOrgYMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.njcn.event.pojo.po.RStatEventOrgY;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-17
+ */
+public interface RStatEventOrgYMapper extends BaseMapper<RStatEventOrgY> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventQMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.po.RStatEventQ;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatEventQMapper extends BaseMapper<RStatEventQ> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventVoltageMMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.po.RStatEventVoltageM;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-14
+ */
+public interface RStatEventVoltageMMapper extends BaseMapper<RStatEventVoltageM> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatEventYMapper.java

@@ -0,0 +1,16 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.po.RStatEventY;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-12
+ */
+public interface RStatEventYMapper extends BaseMapper<RStatEventY> {
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatOrgMapper.java

@@ -0,0 +1,61 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.njcn.event.pojo.vo.RStatOrgVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 暂态指标统计
+ *
+ * @author yzh
+ * @date 2022/10/10
+ */
+
+@Mapper
+public interface RStatOrgMapper {
+
+    /**
+     * 获取年区域暂态指标统计
+     *
+     * @param deptIds        单位id
+     * @param startTime      开始时间
+     * @param endTime        结束时间
+     * @param mainnetPointId 主网字典id
+     * @return 年区域暂态指标统计
+     */
+    List<RStatOrgVO> getYearRStatOrgInfo(@Param("deptIds") List<String> deptIds,
+                                         @Param("startTime") String startTime,
+                                         @Param("endTime") String endTime,
+                                         @Param("mainnetPointId") String mainnetPointId);
+
+    /**
+     * 获取季区域暂态指标统计
+     *
+     * @param deptIds        单位id
+     * @param startTime      开始时间
+     * @param endTime        结束时间
+     * @param mainnetPointId 主网字典id
+     * @return 季区域暂态指标统计
+     */
+    List<RStatOrgVO> getQuarterRStatOrgInfo(@Param("deptIds") List<String> deptIds,
+                                            @Param("startTime") String startTime,
+                                            @Param("endTime") String endTime,
+                                            @Param("mainnetPointId") String mainnetPointId);
+
+    /**
+     * 获取月区域暂态指标统计
+     *
+     * @param deptIds        单位id
+     * @param startTime      开始时间
+     * @param endTime        结束时间
+     * @param mainnetPointId 主网字典id
+     * @return 月区域暂态指标统计
+     */
+    List<RStatOrgVO> getMonthRStatOrgInfo(@Param("deptIds") List<String> deptIds,
+                                          @Param("startTime") String startTime,
+                                          @Param("endTime") String endTime,
+                                          @Param("mainnetPointId") String mainnetPointId);
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatSubstationMMapper.java

@@ -0,0 +1,35 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.event.pojo.po.RStatSubstationM;
+import com.njcn.event.pojo.vo.RSubstationIcon2VO;
+import com.njcn.event.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationMMapper extends BaseMapper<RStatSubstationM> {
+
+    /**
+     * 变电站暂态指标超标分布（按发生频次）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconM(@Param("param") StatSubstationBizBaseParam param);
+
+    /**
+     * 变电站暂态指标发生频次
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2M(@Param("param") StatSubstationBizBaseParam param);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatSubstationMapper.java

@@ -1,7 +1,6 @@
-package com.njcn.event.mapper;
+package com.njcn.event.mapper.majornetwork;
 
 
-import com.njcn.event.pojo.po.PmsMonitorPO;
 import com.njcn.event.pojo.vo.RStatSubstationVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatSubstationQMapper.java

@@ -0,0 +1,35 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.event.pojo.po.RStatSubstationQ;
+import com.njcn.event.pojo.vo.RSubstationIcon2VO;
+import com.njcn.event.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationQMapper extends BaseMapper<RStatSubstationQ> {
+
+    /**
+     * 变电站暂态指标超标分布（按发生频次）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconQ(@Param("param") StatSubstationBizBaseParam param);
+
+    /**
+     * 变电站暂态指标发生频次
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2Q(@Param("param") StatSubstationBizBaseParam param);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatSubstationVoltageMMapper.java

@@ -0,0 +1,28 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.event.pojo.po.RStatSubstationVoltageM;
+import com.njcn.event.pojo.vo.RVoltageIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationVoltageMMapper extends BaseMapper<RStatSubstationVoltageM> {
+
+    /**
+     * 变电站暂态分布（按电压等级）
+     * @param param
+     * @return
+     */
+    List<RVoltageIconVO> getStatSubstationIcon(@Param("param") StatSubstationBizBaseParam param);
+
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RStatSubstationYMapper.java

@@ -0,0 +1,36 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.param.StatSubstationBizBaseParam;
+import com.njcn.event.pojo.po.RStatSubstationY;
+import com.njcn.event.pojo.vo.RSubstationIcon2VO;
+import com.njcn.event.pojo.vo.RSubstationIconVO;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author rui.wu
+ * @since 2022-10-18
+ */
+public interface RStatSubstationYMapper extends BaseMapper<RStatSubstationY> {
+
+    /**
+     * 变电站暂态分布（按发生频次）
+     * @param param
+     * @return
+     */
+    RSubstationIconVO getStatSubstationIconY(@Param("param") StatSubstationBizBaseParam param);
+
+
+    /**
+     * 变电站暂态指标发生频次
+     * @param param
+     * @return
+     */
+    List<RSubstationIcon2VO> getStatSubstationIcon2Y(@Param("param") StatSubstationBizBaseParam param);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RmpEventDetailMapper.java

@@ -0,0 +1,33 @@
+package com.njcn.event.mapper.majornetwork;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.njcn.event.pojo.po.RmpEventDetailPO;
+import com.njcn.event.pojo.vo.RmpEventDetailVO;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * 暂态事件明细
+ *
+ * @author yzh
+ * @date 2022/10/12
+ */
+@Mapper
+public interface RmpEventDetailMapper extends BaseMapper<RmpEventDetailVO> {
+
+    /**
+     * 获取暂态事件明细
+     *
+     * @param monitorIds 监测点id
+     * @param eventType  暂态指标类型
+     * @param startTime  开始时间
+     * @param endTime    结束时间
+     * @return 暂态事件明细
+     */
+    List<RmpEventDetailPO> getDetailsOfTransientEvents(@Param("monitorIds") List<String> monitorIds,
+                                                       @Param("eventType") List<String> eventType,
+                                                       @Param("startTime") String startTime,
+                                                       @Param("endTime") String endTime);
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/RmpEventReportDayMapper.java

@@ -0,0 +1,11 @@
+package com.njcn.event.mapper.majornetwork;
+
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @author yzh
+ * @date 2022/10/19
+ */
+@Mapper
+public interface RmpEventReportDayMapper {
+}

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/TransientMapper.java

@@ -1,4 +1,4 @@
-package com.njcn.event.mapper;
+package com.njcn.event.mapper.majornetwork;
 
 import com.njcn.event.pojo.vo.TransientVO;
 import org.apache.ibatis.annotations.Param;

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/EventDistributionStatisticsMapper.xml

@@ -0,0 +1,438 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.majornetwork.EventDistributionStatisticsMapper">
+
+    <!--获取暂态指标分布统计-->
+    <select id="getEventDistributionStatistics"
+            resultType="com.njcn.event.pojo.po.EventDistributionStatisticsPO">
+        SELECT
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 0 AND r.feature_amplitude &lt;= 10 AND duration &gt; 60000 AND
+        duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude10with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 10 AND r.feature_amplitude &lt;= 40 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude40with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 40 AND r.feature_amplitude &lt;= 70 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude70with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 70 AND r.feature_amplitude &lt;= 85 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude85with180000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 0 AND
+        duration &lt;= 20 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with20s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 20 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with100s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 100 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with500s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with1000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with3000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 3000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with20000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 20000
+        AND duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with60000s",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt; 85 AND r.feature_amplitude &lt;= 90 AND duration &gt; 60000
+        AND duration &lt;= 180000 THEN 1 ELSE 0 END ), 0 ) "featureAmplitude90with180000s"
+        FROM
+        (
+        SELECT
+        duration,
+        feature_amplitude
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        )
+        r
+    </select>
+
+    <!--获取持续时间折线图-->
+    <select id="getEventDurationLineChart" resultType="com.njcn.event.pojo.po.EventDurationLineChartPO">
+        SELECT COALESCE
+        (
+        round(sum(CASE WHEN duration &gt; 0 AND duration &lt;= 100 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration100",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 100 AND duration &lt;= 250 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration250",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 250 AND duration &lt;= 500 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration500",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 500 AND duration &lt;= 1000 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration1000",
+        COALESCE(
+        round(sum(CASE WHEN duration &gt; 1000 AND duration &lt;= 1100 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100,
+        0
+        ) "duration1100"
+        FROM
+        (
+        SELECT
+        measurement_point_id,
+        duration
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        )
+        r
+    </select>
+
+    <!--获取特征幅值折线图-->
+    <select id="getEventFeatureAmplitudeLineChart"
+            resultType="com.njcn.event.pojo.po.EventFeatureAmplitudeLineChartPO">
+        SELECT
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 0 AND feature_amplitude &lt;= 10 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude10",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 10 AND feature_amplitude &lt;= 20 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude20",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 20 AND feature_amplitude &lt;= 30 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude30",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 30 AND feature_amplitude &lt;= 40 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude40",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 40 AND feature_amplitude &lt;= 50 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude50",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 50 AND feature_amplitude &lt;= 60 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude60",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 60 AND feature_amplitude &lt;= 70 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude70",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 70 AND feature_amplitude &lt;= 80 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude80",
+        COALESCE(round(sum(CASE WHEN feature_amplitude &gt; 80 AND feature_amplitude &lt;= 90 THEN 1 ELSE 0 END) /
+        COUNT(r.measurement_point_id), 2) * 100, 0) "featureAmplitude90"
+        FROM
+        (
+        SELECT
+        measurement_point_id,
+        feature_amplitude
+        FROM
+        r_mp_event_detail
+        WHERE
+        measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        ) AS r
+    </select>
+
+    <!--获取监测点暂态事件明细数据-->
+    <select id="getRmpEventDetail" resultType="com.njcn.event.pojo.po.RmpEventDetailPO">
+        SELECT
+            measurement_point_id as measurementPointId,
+            start_time AS startTime,
+            duration AS duration,
+            feature_amplitude AS featureAmplitude
+        FROM
+            `r_mp_event_detail`
+    </select>
+
+    <!--获取监测点电压暂降和短时中断分布情况-->
+    <select id="getEventDipShortDistributionByCond"
+            resultType="com.njcn.event.pojo.vo.EventDipShortDistributionVO">
+        SELECT
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 80 AND r.feature_amplitude &lt;= 90 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp90with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 70 AND r.feature_amplitude &lt; 80 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp80with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 60 AND r.feature_amplitude &lt; 70 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp70with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 50 AND r.feature_amplitude &lt; 60 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp60with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 40 AND r.feature_amplitude &lt; 50 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp50with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 30 AND r.feature_amplitude &lt; 40 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp40with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 20 AND r.feature_amplitude &lt; 30 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp30with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 10 AND r.feature_amplitude &lt; 20 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp20with60000ms",
+
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 10 AND
+        duration &lt;= 100 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with100ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 100 AND
+        duration &lt;= 250 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with250ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 250 AND
+        duration &lt;= 500 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with500ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 500 AND
+        duration &lt;= 1000 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with1000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 1000 AND
+        duration &lt;= 3000 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with3000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 3000 AND
+        duration &lt;= 10000 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with10000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 10000 AND
+        duration &lt;= 20000 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with20000ms",
+        COALESCE( sum( CASE WHEN r.feature_amplitude &gt;= 0 AND r.feature_amplitude &lt; 10 AND duration &gt; 20000 AND
+        duration &lt;= 60000 THEN 1 ELSE 0 END ), 0 ) "featureAmp10with60000ms"
+
+        FROM
+        (
+        SELECT
+        duration,
+        feature_amplitude
+        FROM
+        r_mp_event_detail
+        WHERE 1 = 1
+        AND measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+
+        AND event_type IN
+        <foreach collection="eventTypeList" item="type" open="(" close=")" separator=",">
+            #{type}
+        </foreach>
+
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        )
+        r
+    </select>
+
+    <!--获取监测点电压暂升分布情况-->
+    <select id="getEventRiseDistributionByCond" resultType="com.njcn.event.pojo.vo.EventRiseDistributionVO">
+        SELECT
+        COALESCE(sum(CASE WHEN r.feature_amplitude &gt;= 120 AND duration &gt; 10 AND duration &lt;= 500 THEN 1 ELSE 0 END), 0) "featureAmp120with500ms",
+        COALESCE(sum(CASE WHEN r.feature_amplitude &gt;= 120 AND duration &gt; 500 AND duration &lt;= 5000 THEN 1 ELSE 0 END), 0) "featureAmp120with5000ms",
+        COALESCE(sum(CASE WHEN r.feature_amplitude &gt;= 120 AND duration &gt; 5000 AND duration &lt;= 60000 THEN 1 ELSE 0 END), 0) "featureAmp120with60000ms",
+
+        COALESCE(sum(CASE WHEN r.feature_amplitude &gt;= -120 AND r.feature_amplitude &lt;= 110 AND duration &gt; 10 AND duration &lt;= 500 THEN 1 ELSE 0 END), 0) "featureAmp110with500ms",
+        COALESCE(sum(CASE WHEN r.feature_amplitude &gt;= -120 AND r.feature_amplitude &lt;= 110 AND duration &gt; 500 AND duration &lt;= 5000 THEN 1 ELSE 0 END), 0) "featureAmp110with5000ms",
+        COALESCE(sum(CASE WHEN r.feature_amplitude &gt;= -120 AND r.feature_amplitude &lt;= 110 AND duration &gt; 5000 AND duration &lt;= 60000 THEN 1 ELSE 0 END), 0) "featureAmp110with60000ms"
+
+        FROM
+        (
+        SELECT
+        duration,
+        feature_amplitude
+        FROM
+        r_mp_event_detail
+        WHERE 1 = 1
+        AND measurement_point_id IN
+        <foreach collection="monitorIdList" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+
+        AND event_type IN
+        <foreach collection="eventTypeList" item="type" open="(" close=")" separator=",">
+            #{type}
+        </foreach>
+
+        <if test="startTime != null and startTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &gt;= DATE_FORMAT(#{startTime}, '%Y-%m-%d')
+        </if>
+        <if test="endTime != null and endTime != ''">
+            AND DATE_FORMAT(start_time, '%Y-%m-%d') &lt;= DATE_FORMAT(#{endTime}, '%Y-%m-%d')
+        </if>
+        )
+        r
+    </select>
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/PmsMonitorMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.event.mapper.PmsMonitorMapper">
+<mapper namespace="com.njcn.event.mapper.majornetwork.PmsMonitorMapper">
 
     <!--根据部门id查询监测点id-->
     <select id="getMonitorInfo" resultType="com.njcn.event.pojo.po.PmsMonitorPO">

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/PqDeviceMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.event.mapper.PqDeviceMapper">
+<mapper namespace="com.njcn.event.mapper.majornetwork.PqDeviceMapper">
 
     <resultMap type="com.njcn.event.pojo.po.PqDevice" id="PqDeviceMap">
         <result property="id" column="Id" jdbcType="VARCHAR"/>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventDMapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.majornetwork.RStatEventDMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.event.pojo.po.RStatEventD">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="event_type" property="eventType" />
+        <result column="event_measurement" property="eventMeasurement" />
+        <result column="event_measurement_ratio" property="eventMeasurementRatio" />
+        <result column="event_count" property="eventCount" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventMMapper.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.majornetwork.RStatEventMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.event.pojo.po.RStatEventM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="measurement_type_class" property="measurementTypeClass" />
+        <result column="event_type" property="eventType" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_measurement_ratio_accrued" property="eventMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventOrgMMapper.xml

@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.njcn.event.mapper.majornetwork.RStatEventOrgMMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.njcn.event.pojo.po.RStatEventOrgM">
+        <id column="org_no" property="orgNo" />
+        <result column="data_date" property="dataDate" />
+        <result column="event_type" property="eventType" />
+        <result column="event_measurement_average" property="eventMeasurementAverage" />
+        <result column="event_measurement_accrued" property="eventMeasurementAccrued" />
+        <result column="event_freq" property="eventFreq" />
+        <result column="event_count" property="eventCount" />
+        <result column="event_measurement_ratio_average" property="eventMeasurementRatioAverage" />
+        <result column="event_measurement_ratio_accrued" property="eventMeasurementRatioAccrued" />
+        <result column="data_type" property="dataType" />
+    </resultMap>
+
+</mapper>

pqs-event/event-boot/src/main/java/com/njcn/event/mapper/majornetwork/mapping/RStatEventOrgMapper.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="com.njcn.event.mapper.RStatEventOrgMapper">
+<mapper namespace="com.njcn.event.mapper.majornetwork.RStatEventOrgMapper">
 
 
     <sql id="query_rStatEventOrg_field">
@@ -16,10 +16,13 @@
 	    rseo.event_measurement_ratio_average AS eEventMeasurementRatioAverage,
 	    rseo.event_measurement_ratio_accrued AS eEventMeasurementRatioAccrued,
 	    rseo.event_freq AS eventFreq,
-	    rseo.event_count as eventCount
+	    rseo.event_count AS eventCount,
+        rseo.data_type AS dataType
     </sql>
     <sql id="query_rStatEventOrg_where">
-        rso.org_no IN
+        rso.data_type = "01"
+        AND rseo.data_type = "01"
+        AND rso.org_no IN
         <foreach collection="deptIds" item="item" open="(" close=")" separator=",">
             #{item}
         </foreach>
@@ -32,7 +35,7 @@
     </sql>
 
     <!--指标分类统计表-->
-    <select id="getYearRStatEventOrgInfo" resultType="com.njcn.event.pojo.vo.RStatEventOrgVO">
+    <select id="getYearRStatEventOrgInfo" resultType="com.njcn.event.pojo.po.RStatEventOrgPO">
         SELECT
         <include refid="query_rStatEventOrg_field"></include>
         FROM
@@ -44,7 +47,7 @@
 
 
     <!--获取季区域暂态指标分类统计表-->
-    <select id="getQuarterRStatEventOrgInfo" resultType="com.njcn.event.pojo.vo.RStatEventOrgVO">
+    <select id="getQuarterRStatEventOrgInfo" resultType="com.njcn.event.pojo.po.RStatEventOrgPO">
         SELECT
         <include refid="query_rStatEventOrg_field"></include>
         FROM
@@ -56,7 +59,7 @@
 
 
     <!--获取月区域暂态指标分类统计表-->
-    <select id="getMonthRStatEventOrgInfoInfo" resultType="com.njcn.event.pojo.vo.RStatEventOrgVO">
+    <select id="getMonthRStatEventOrgInfoInfo" resultType="com.njcn.event.pojo.po.RStatEventOrgPO">
         SELECT
         <include refid="query_rStatEventOrg_field"></include>
         FROM