暂降模块代码合并

终端运行管理接口调整

pqs-event/event-api/src/main/java/com/njcn/event/enums/EventResponseEnum.java

@@ -16,7 +16,18 @@ public enum EventResponseEnum {
      */
     EVENT_COMMON_ERROR("A00650","暂降模块异常"),
     EVENT_NOT_FOUND("A00651","暂降事件或监测点不存在"),
-    ANALYSEWAVE_NOT_FOUND("A00652","波形文件找不到")
+    ANALYSEWAVE_NOT_FOUND("A00652","波形文件找不到"),
+
+
+    /**
+     * zbj
+     * 2022/8/4
+     */
+    EVENT_REASON_NOT_FOUND("A00653","暂态原因不存在"),
+    EVENT_TYPE_NOT_FOUND("A00654","暂态类型不存在"),
+    INDEX_OUT_OF_BOUNDS("A00655","集合索引越界异常"),
+
+    NOT_FOUND("A00656","没有查到数据"),
     ;
 
     private final String code;

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

@@ -0,0 +1,17 @@
+package com.njcn.event.pojo.param;
+
+import lombok.Data;
+
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月23日
+ */
+@Data
+public class AmplitudeCountParam {
+
+    private String xName;
+
+    private String yValue;
+
+}

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

@@ -0,0 +1,31 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.event.pojo.po.EventDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.time.Instant;
+import java.util.List;
+
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月18日
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AreaEventMonthParam implements Serializable {
+
+    @ApiModelProperty(name = "time", value = "对应月份或者时间")
+    private String dayOrMonth;
+
+
+    @ApiModelProperty(name = "eventAssIndex", value = "关联处理事件时间")
+    private String eventAssIndex;
+
+
+}

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

@@ -0,0 +1,20 @@
+package com.njcn.event.pojo.param;
+
+import lombok.Data;
+
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月25日
+ */
+@Data
+public class AreaOnlineOrUnlinetParam {
+
+    private String name;
+
+    private Integer sumCont;
+
+    private Integer onlineCount;
+
+    private Integer unlineCount;
+}

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

@@ -0,0 +1,76 @@
+package com.njcn.event.pojo.param;
+
+
+import com.njcn.device.pojo.param.DeviceInfoParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+import java.util.List;
+
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2022/08/04
+ */
+@Data
+@ApiModel
+@EqualsAndHashCode(callSuper = true)
+public class AreaReportParam extends DeviceInfoParam.BusinessParam {
+
+    @ApiModelProperty("监测网分布图形")
+    private boolean monitorDistributeChart = false;
+
+    @ApiModelProperty("暂降事件统计表格")
+    private boolean eventCountTable = false;
+
+    @ApiModelProperty("暂降事件统计图形")
+    private boolean eventCountChart = false;
+
+    @ApiModelProperty("暂降密度表格")
+    private boolean densityTable = false;
+
+    @ApiModelProperty("暂降密度图形")
+    private boolean densityChart = false;
+
+    @ApiModelProperty("暂降事件点ITIC")
+    private boolean itic = false;
+
+    @ApiModelProperty("暂降事件点F47")
+    private boolean f47 = false;
+
+    @ApiModelProperty("概率分布暂降幅值")
+    private boolean sagAmplitude = false;
+
+    @ApiModelProperty("概率分布持续时间")
+    private boolean duration = false;
+
+    @ApiModelProperty("事件关联统计表格")
+    private boolean eventRelevanceCountTable = false;
+
+    @ApiModelProperty("暂降原因表格")
+    private boolean eventReasonTable = false;
+
+    @ApiModelProperty("暂降原因图形")
+    private boolean eventReasonChart = false;
+
+    @ApiModelProperty("暂降类型表格")
+    private boolean eventTypeTable = false;
+
+    @ApiModelProperty("暂降类型图形")
+    private boolean eventTypeChart = false;
+
+    @ApiModelProperty("暂降热力图")
+    private boolean thermodynamicChart = false;
+
+    @ApiModelProperty("触发类型")
+    private Integer waveType;
+
+    @NotNull
+    @ApiModelProperty("日期下拉框 0:月 , 1:天")
+    private String interval;
+}

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

@@ -0,0 +1,42 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.event.pojo.po.EventDetail;
+import com.njcn.event.pojo.po.EventDetailNew;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月18日
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class AreaTableParam implements Serializable {
+
+
+    @ApiModelProperty(name = "StringBuilder", value = "监测点拼接的字符串")
+    private StringBuilder stringBuilder;
+
+
+    @ApiModelProperty(name = "startTime", value = "开始时间")
+    private String startTime;
+
+
+    @ApiModelProperty(name = "endTime", value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(name = "info", value = "sql结果集")
+    private List<EventDetailNew> info;
+
+    @ApiModelProperty(name = "waveType", value = "暂态类型")
+        private Integer waveType;
+}
+
+

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

@@ -0,0 +1,41 @@
+package com.njcn.event.pojo.param;
+
+import lombok.Data;
+
+/**
+ * pqs-event
+ *
+ * @author zbj
+ * @date 2022/8/15
+ */
+@Data
+public class DISDIPCountParam {
+
+    //剩余电压名称
+    private String name;
+
+    //20ms
+    private int twentyMS = 0;
+
+    //100
+    private int oneHundredMS = 0;
+
+    //500
+    private int fiveHundredMS = 0;
+
+    //1
+    private int one = 0;
+
+    //3
+    private int three = 0;
+
+    //20
+    private int twenty = 0;
+
+    //60
+    private int sixty = 0;
+
+    //180
+    private int oneHundredAndEighty = 0;
+
+}

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

@@ -0,0 +1,37 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.event.pojo.po.EventDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月24日
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class EventassCountParam implements Serializable {
+
+
+    @ApiModelProperty(name = "assTime", value = "ass时间")
+    private String assTime;
+
+
+    @ApiModelProperty(name = "eventTime", value = "event时间")
+    private String eventTime;
+
+
+    @ApiModelProperty(name = "describe", value = "事件关联描述")
+    private String describe;
+
+
+}
+
+

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

@@ -0,0 +1,75 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.device.pojo.param.DeviceInfoParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.Getter;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月16日 19:37
+ */
+@Data
+public class ExportParam implements Serializable {
+
+    @ApiModelProperty(name = "lineId",value = "监测点ID")
+    private String lineId;
+
+    @ApiModelProperty(name = "searchBeginTime",value = "开始时间")
+    private String searchBeginTime;
+
+    @ApiModelProperty(name = "searchEndTime",value = "结束时间")
+    private String searchEndTime;
+
+    @ApiModelProperty(name = "lineName",value = "监测点名称")
+    private String lineName;
+
+    @ApiModelProperty(name = "xq",value = "监测点详情")
+    private boolean xq;
+
+    @ApiModelProperty(name = "lb",value = "暂降事件列表")
+    private boolean lb;
+
+    @ApiModelProperty(name = "mdbg",value = "暂降密度表格")
+    private boolean mdbg;
+
+    @ApiModelProperty(name = "mdtx",value = "暂降密度图形")
+    private boolean mdtx;
+
+    @ApiModelProperty(name = "sjdITIC",value = "暂降时间点ITIC")
+    private boolean sjdITIC;
+
+    @ApiModelProperty(name = "sjdF47",value = "暂降时间点F47")
+    private boolean sjdF47;
+
+    @ApiModelProperty(name = "glfbfz",value = "概率分布暂降赋值")
+    private boolean glfbfz;
+
+    @ApiModelProperty(name = "glfbsj",value = "概率分布持续时间")
+    private boolean glfbsj;
+
+    @ApiModelProperty(name = "tjbg",value = "月份统计表格")
+    private boolean tjbg;
+
+    @ApiModelProperty(name = "tjtx",value = "月份统计图形")
+    private boolean tjtx;
+
+    @ApiModelProperty(name = "yybg",value = "暂降原因表格")
+    private boolean yybg;
+
+    @ApiModelProperty(name = "yytx",value = "暂降原因图形")
+    private boolean yytx;
+
+    @ApiModelProperty(name = "lxbg",value = "暂降类型表格")
+    private boolean lxbg;
+
+    @ApiModelProperty(name = "lxtx",value = "暂降类型图形")
+    private boolean lxtx;
+
+    @ApiModelProperty(name = "flag",value = "标识")
+    private Integer flag;
+
+}

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

@@ -0,0 +1,41 @@
+package com.njcn.event.pojo.param;
+
+import lombok.Data;
+
+/**
+ * pqs-event
+ *
+ * @author zbj
+ * @date 2022/8/15
+ */
+@Data
+public class IEC28CountParam {
+
+    //剩余电压名称
+    private String name;
+
+    //0.02~0.1
+    private int zeroZeroTwoToZeroOne = 0;
+
+    //0.1~0.25
+    private int zeroOneToZeroTwentyFive = 0;
+
+    //0.25~0.5
+    private int zeroTwentyFiveToZeroFive = 0;
+
+    //0.5~1
+    private int zeroFiveToOne = 0;
+
+    //1~3
+    private int oneToThree = 0;
+
+    //3~20
+    private int threeToTwenty = 0;
+
+    //20~60
+    private int twentyToSixty = 0;
+
+    //60~180
+    private int sixtyToOneHundredAndEighty = 0;
+
+}

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

@@ -0,0 +1,36 @@
+package com.njcn.event.pojo.param;
+
+import lombok.Data;
+
+/**
+ * pqs-event
+ *
+ * @author zbj
+ * @date 2022/8/15
+ */
+@Data
+public class IEC411CountParam {
+
+    //剩余电压名称
+    private String name;
+
+    //10~20
+    private int tenToTwenty = 0;
+
+    //20~100
+    private int twentyToHundred = 0;
+
+    //0.1~0.2
+    private int zeroOneToZeroTwo = 0;
+
+    //0.2~0.5
+    private int zeroTwoToZeroFive = 0;
+
+    //0.5~1
+    private int zeroFiveToOne = 0;
+
+    //>1
+    private int lessOne = 0;
+
+
+}

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

@@ -0,0 +1,19 @@
+package com.njcn.event.pojo.param;
+
+import lombok.Data;
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月17日
+ */
+@Data
+public class ReportCountParam {
+
+    private String name;
+
+    private String count;
+
+    private String relevanceCount;
+
+
+}

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

@@ -0,0 +1,26 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.web.pojo.param.BaseParam;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月09日 08:45
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@EqualsAndHashCode(callSuper = true)
+public class ReportParam extends BaseParam implements Serializable {
+
+    @ApiModelProperty(name = "staFlag")
+    private boolean staFalg;
+
+}

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

@@ -0,0 +1,38 @@
+package com.njcn.event.pojo.param;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月01日 15:35
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StatisticsParam implements Serializable {
+
+    @NotBlank(message = "没有监测点ID")
+    @ApiModelProperty(name = "lineIndex",value = "监测点ID")
+    private String lineIndex;
+
+    @NotBlank(message = "没有开始时间")
+    @ApiModelProperty(name = "startTime",value = "开始时间")
+    private String startTime;
+
+    @NotBlank(message = "没有结束时间")
+    @ApiModelProperty(name = "endTime",value = "结束时间")
+    private String endTime;
+
+    @ApiModelProperty(name = "flag",value = "标识")
+    private Integer flag;
+
+}

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

@@ -7,6 +7,8 @@ import lombok.EqualsAndHashCode;
 import org.hibernate.validator.constraints.Range;
 
 import javax.validation.constraints.NotNull;
+import java.math.BigDecimal;
+import java.util.List;
 
 /**
  * @version 1.0.0
@@ -27,5 +29,31 @@ public class TransientParam extends DeviceInfoParam.BusinessParam {
     @Range(min = 1,message = "条数必须大于0")
     private Integer pageSize;
 
+    @ApiModelProperty("暂态幅值最大值")
+    private BigDecimal eventValueMax;
+    @ApiModelProperty("暂态幅值最小值")
+    private BigDecimal eventValueMin;
+
+    @ApiModelProperty("持续时间最大值")
+    private Integer persistMax;
+    @ApiModelProperty("持续时间最小值")
+    private Integer persistMin;
+
+    @ApiModelProperty("严重度最大值")
+    private BigDecimal severityMax;
+    @ApiModelProperty("严重度最小值")
+    private BigDecimal severityMin;
+
+    @ApiModelProperty("触发类型")
+    private List<Integer> waveType;
+
+    @ApiModelProperty("暂降原因")
+    private List<String> eventReason;
+
+    @ApiModelProperty("暂降类型")
+    private List<String> eventType;
+
+    @ApiModelProperty("波形文件")
+    private Integer fileFlag;
 }
 

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

@@ -0,0 +1,43 @@
+package com.njcn.event.pojo.param;
+
+import com.njcn.device.pojo.param.DeviceInfoParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.hibernate.validator.constraints.Range;
+
+import javax.validation.constraints.NotNull;
+
+
+/**
+ * @version 1.0.0
+ * @author: zbj
+ * @date: 2022/07/29
+ */
+@Data
+@ApiModel
+public class WaveTypeParam extends DeviceInfoParam.BusinessParam {
+    @ApiModelProperty("搜索值")
+    private String searchValue;
+    @ApiModelProperty("触发类型")
+    private String waveType;
+
+    @ApiModelProperty("页码")
+    @NotNull(message = "页码不可为空")
+    @Range(min = 1, message = "页码必须大于0")
+    private Integer pageNum;
+
+    @ApiModelProperty("条数")
+    @NotNull(message = "条数不可为空")
+    @Range(min = 1, message = "条数必须大于0")
+    private Integer pageSize;
+
+    @NotNull(
+            message = "通讯状态 0.离线 1.在线"
+    )
+    @ApiModelProperty(
+            name = "comFlag",
+            value = "通讯状态 0.离线 1.在线"
+    )
+    private Integer comFlag = 1;
+}

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

@@ -1,41 +0,0 @@
-package com.njcn.event.pojo.po;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-/**
- * @author denghuajun
- * @version 1.0.0
- * @date 2022年08月18日 13:42
- * 电压区域综合评估基本类
- */
-
-@Data
-public class BalanceInfo implements Serializable {
-    @Data
-    public class PointInfo {
-        private Integer pointId;
-        private String pointName;
-        private QtIdx qtIdx;
-        private float civ;
-        private int l;
-
-        public PointInfo() {
-            super();
-            qtIdx = new QtIdx();
-        }
-    }
-    @ApiModelProperty("区域的index")
-    private String areaIndex;
-    @ApiModelProperty("区域名称")
-    private String areaName;
-    @ApiModelProperty("系统最终的评估分")
-    private float ci;
-    @ApiModelProperty("监测点的详细信息")
-    private List<PointInfo> list;
-    @ApiModelProperty("标识是否经过计算，默认为0-未计算，1-计算")
-    private int isCount;
-}

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

@@ -1,9 +1,11 @@
 package com.njcn.event.pojo.po;
 
+import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
 
+import java.math.BigDecimal;
 import java.time.Instant;
 
 /**
@@ -82,4 +84,15 @@ public class EventDetail {
   @Column(name = "create_time")
   private String createTime;
 
+  private String lineName;
+
+  private BigDecimal lat;
+
+  private BigDecimal lng;
+
+  private String gdName;
+
+  private String subName;
+
+
 }

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

@@ -3,10 +3,8 @@ package com.njcn.event.pojo.po;
 import lombok.Data;
 import org.influxdb.annotation.Column;
 import org.influxdb.annotation.Measurement;
-import org.springframework.format.annotation.DateTimeFormat;
 
-import java.time.Instant;
-import java.time.LocalDateTime;
+import java.math.BigDecimal;
 
 /**
  * @author cdf
@@ -22,8 +20,7 @@ public class EventDetailNew {
   private String lineId;
 
   @Column(name = "time")
-  @DateTimeFormat(pattern = "yyyy-mm-dd")
-  private LocalDateTime timeId;
+  private String timeId;
 
   @Column(name = "event_describe")
   private String eventDescribe;
@@ -85,4 +82,18 @@ public class EventDetailNew {
   @Column(name = "create_time")
   private String createTime;
 
+  private String lineName;
+
+  private BigDecimal lat;
+
+  private BigDecimal lng;
+
+  private String gdName;
+
+  private String subName;
+
+  private String ip;
+
+  private String scale;
+
 }

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

@@ -0,0 +1,44 @@
+package com.njcn.event.pojo.po;
+
+import lombok.Data;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.math.BigDecimal;
+import java.time.Instant;
+
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月24日
+ */
+
+@Data
+@Measurement(name = "pqs_eventass")
+public class Eventass {
+
+  @Column(name = "time")
+  private Instant timeId;
+
+  @Column(name = "event_time")
+  private String eventTime;
+
+  @Column(name = "line_id")
+  private String lineId;
+
+  @Column(name = "host")
+  private String host;
+
+  @Column(name = "describe")
+  private String describe;
+
+  @Column(name = "range")
+  private Integer range;
+
+  @Column(name = "user_index")
+  private String userIndex;
+
+  @Column(name = "user_name")
+  private String userName;
+
+}

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

@@ -1,50 +0,0 @@
-package com.njcn.event.pojo.po;
-
-import com.sun.jna.Structure;
-import io.swagger.annotations.ApiModelProperty;
-
-import java.util.List;
-
-/**
- * @author denghuajun
- * @version 1.0.0
- * @date 2022年08月18日 13:45
- * //单个监测点的暂降事件计算评价指标
- */
-public class QtIdx extends Structure {
-    @ApiModelProperty("暂降幅值")
-    public float r_esm;
-    @ApiModelProperty("sarifi-90")
-    public int sarfi_90;
-    @ApiModelProperty("sarifi-50")
-    public int sarifi_50;
-    @ApiModelProperty("暂降能量")
-    public float r_asei;
-    @ApiModelProperty("严重程度")
-    public float r_assi;
-
-    public static class ByReference extends QtIdx implements Structure.ByReference {
-
-    }
-
-    public static class ByValue extends QtIdx implements Structure.ByValue {
-
-    }
-
-    @Override
-    protected List getFieldOrder() {
-        return null;
-    }
-
-    @Override
-    public boolean equals(Object obj) {
-        if (obj == null || !(obj instanceof QtIdx))
-            return false;
-        if (this == obj)
-            return true;
-
-        QtIdx instance = (QtIdx) obj;
-
-        return (r_esm == instance.r_esm) && (sarfi_90 == instance.sarfi_90) && (sarifi_50 == instance.sarifi_50) && (r_asei == instance.r_asei) && (r_assi == instance.r_assi);
-    }
-}

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

@@ -1,18 +0,0 @@
-package com.njcn.event.pojo.po;
-
-import lombok.Data;
-
-import java.io.Serializable;
-
-/**
- * @author denghuajun
- * @version 1.0.0
- * @date 2022年08月19日 11:10
- */
-@Data
-public class Sarifi implements Serializable {
-    private Float sarifiValue;
-    private Float time;
-    private Float pt1;
-    private Float pt2;
-}

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

@@ -0,0 +1,19 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * pqs-event
+ *
+ * @author cdf
+ * @date 2022/9/2
+ */
+@Data
+public class BaseVO {
+
+    private String name;
+
+    private BigDecimal value;
+}

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

@@ -0,0 +1,104 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月02日 08:44
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class BitMapVO implements Serializable {
+
+    @ApiModelProperty(name = "describe",value = "描述")
+    private String describe;
+
+    @ApiModelProperty(name = "eventDetailIndex")
+    private String eventDetailIndex;
+
+    @ApiModelProperty(name = "eventName")
+    private String eventName;
+
+    @ApiModelProperty(name = "eventReason")
+    private String eventReason;
+
+    @ApiModelProperty(name = "eventType")
+    private String eventType;
+
+    @ApiModelProperty(name = "eventassIndex")
+    private String eventassIndex;
+
+    @ApiModelProperty(name = "eventvalue")
+    private Integer eventvalue;
+
+    @ApiModelProperty(name = "eventvaluea")
+    private Integer eventvaluea;
+
+    @ApiModelProperty(name = "eventvalueb")
+    private Integer eventvalueb;
+
+    @ApiModelProperty(name = "eventvaluec")
+    private Integer eventvaluec;
+
+    @ApiModelProperty(name = "fileFlag")
+    private String fileFlag;
+
+    @ApiModelProperty(name = "gdName",value = "供电名称")
+    private String gdName;
+
+    @ApiModelProperty(name = "lineId",value = "监测点ID")
+    private String lineId;
+
+    @ApiModelProperty(name = "lineName",value = "监测点名称")
+    private String lineName;
+
+    @ApiModelProperty(name = "loadType")
+    private String loadType;
+
+    @ApiModelProperty(name = "ms")
+    private Integer ms;
+
+    @ApiModelProperty(name = "persisttime")
+    private String persisttime;
+
+    @ApiModelProperty(name = "persisttimea")
+    private String persisttimea;
+
+    @ApiModelProperty(name = "persisttimeb")
+    private String persisttimeb;
+
+    @ApiModelProperty(name = "persisttimec")
+    private String persisttimec;
+
+    @ApiModelProperty(name = "scale")
+    private String scale;
+
+    @ApiModelProperty(name = "serverity")
+    private String serverity;
+
+    @ApiModelProperty(name = "state")
+    private String state;
+
+    @ApiModelProperty(name = "subName")
+    private String subName;
+
+    @ApiModelProperty(name = "time")
+    private String time;
+
+    @ApiModelProperty(name = "timeid")
+    private String timeid;
+
+    @ApiModelProperty(name = "type")
+    private String type;
+
+    @ApiModelProperty(name = "wavetype")
+    private String wavetype;
+
+}

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

@@ -0,0 +1,33 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月02日 10:50
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ChanceVO implements Serializable {
+
+    @ApiModelProperty(name = "eventvalue")
+    private List<String> eventvalue;
+
+    @ApiModelProperty(name = "pereventvalue")
+    private List<String> pereventvalue;
+
+    @ApiModelProperty(name = "persisttime")
+    private List<String> persisttime;
+
+    @ApiModelProperty(name = "sisttime")
+    private List<String> sisttime;
+
+}

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

@@ -0,0 +1,30 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * 坐标轴
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月01日 15:28
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CoordsVO implements Serializable {
+
+    @ApiModelProperty(name = "x",value = "x轴")
+    private Integer x;
+
+    @ApiModelProperty(name = "y",value = "y轴")
+    private Integer y;
+
+    @ApiModelProperty(name = "z",value = "z轴")
+    private Integer z;
+
+}

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

@@ -0,0 +1,48 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * DISDIP表格
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月01日 15:46
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DISDIPVO implements Serializable {
+
+    @ApiModelProperty(name = "name",value = "剩余电压/持续时间")
+    private String name;
+
+    @ApiModelProperty(name = "twentyMs",value = "20ms")
+    private String twentyMs;
+
+    @ApiModelProperty(name = "oneHundredMs",value = "100ms")
+    private String oneHundredMs;
+
+    @ApiModelProperty(name = "fiveHundredMs",value = "500ms")
+    private String fiveHundredMs;
+
+    @ApiModelProperty(name = "oneS",value = "1s")
+    private String oneS;
+
+    @ApiModelProperty(name = "threeS",value = "3s")
+    private String threeS;
+
+    @ApiModelProperty(name = "twentyS",value = "20s")
+    private String twentyS;
+
+    @ApiModelProperty(name = "sixtyS",value = "60s")
+    private String sixtyS;
+
+    @ApiModelProperty(name = "oneEightyS",value = "180s")
+    private String oneEightyS;
+
+}

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

@@ -0,0 +1,37 @@
+package com.njcn.event.pojo.vo;
+
+import com.njcn.device.pojo.vo.AreaLineInfoVO;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月02日 16:03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class DetailVO extends AreaLineInfoVO implements Serializable {
+
+    @ApiModelProperty(name = "persistTime",value = "持续时间")
+    private Double persistTime;
+
+    @ApiModelProperty(name = "eventType",value = "暂态类型")
+    private String eventType;
+
+    @ApiModelProperty(name = "eventValue",value = "特征幅值")
+    private Double eventValue;
+
+    @ApiModelProperty(name = "time",value = "发生时间")
+    private String timeId;
+
+    @ApiModelProperty(name = "times",value = "次数")
+    private Integer times;
+
+}

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

@@ -15,8 +15,8 @@ import java.util.List;
 public class EventHeatMapVO implements Serializable {
 
     @ApiModelProperty(name = "areaValue",value = "数值")
-    private List<List<Object>> areaValue;
+    private List<BaseVO> areaValue;
 
     @ApiModelProperty(name = "eventHeatMapValue",value = "热力图数值")
-    private List<EventHeatMapDetailVO> eventHeatMapValue;
+    private List<List<Object>> eventHeatMapValue;
 }

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

@@ -0,0 +1,46 @@
+package com.njcn.event.pojo.vo;
+
+import cn.afterturn.easypoi.excel.annotation.Excel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月01日 09:34
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GeneralVO implements Serializable {
+
+    @Excel(name = "区域")
+    @ApiModelProperty(name = "name",value = "监测点名称/电压等级")
+    private String name;
+
+    @Excel(name = "在线")
+    @ApiModelProperty(name = "onLine",value = "在线数量")
+    private Integer onLine;
+
+    @Excel(name = "离线")
+    @ApiModelProperty(name = "offLine",value = "离线数量")
+    private Integer offLine;
+
+    @Excel(name = "暂降次数")
+    @ApiModelProperty(name = "sagsCount",value = "暂降次数")
+    private Integer sagsCount;
+
+    @Excel(name = "中断次数")
+    @ApiModelProperty(name = "breakCount",value = "中断次数")
+    private Integer breakCount;
+
+    @Excel(name = "暂升次数")
+    @ApiModelProperty(name = "upCount",value = "暂升次数")
+    private Integer upCount;
+
+
+}

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

@@ -0,0 +1,47 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月01日 16:09
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IEC28VO implements Serializable {
+
+    @ApiModelProperty(name = "name",value = "剩余电压/持续时间")
+    private String name;
+
+    @ApiModelProperty(name = "q",value = "0.01~0.1s")
+    private String q;
+
+    @ApiModelProperty(name = "w",value = "0.1~0.25s")
+    private String w;
+
+    @ApiModelProperty(name = "e",value = "0.25~0.5s")
+    private String e;
+
+    @ApiModelProperty(name = "r",value = "0.5~1s")
+    private String r;
+
+    @ApiModelProperty(name = "t",value = "1~3s")
+    private String t;
+
+    @ApiModelProperty(name = "y",value = "3~20s")
+    private String y;
+
+    @ApiModelProperty(name = "u",value = "20~60s")
+    private String u;
+
+    @ApiModelProperty(name = "i",value = "60~180s")
+    private String i;
+
+}

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

@@ -0,0 +1,42 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * IEC411
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月01日 16:00
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class IEC411VO implements Serializable {
+
+    @ApiModelProperty(name = "name",value = "剩余电压/持续时间")
+    private String name;
+
+    @ApiModelProperty(name = "tenTwentyMs",value = "10~20ms")
+    private String tenTwentyMs;
+
+    @ApiModelProperty(name = "twentyOneHundredMs",value = "20~100ms")
+    private String twentyOneHundredMs;
+
+    @ApiModelProperty(name = "zeroPiontOneTwoS",value = "0.1~0.2s")
+    private String zeroPiontOneTwoS;
+
+    @ApiModelProperty(name = "zeroPiontTwoFiveS",value = "0.2~0.5s")
+    private String zeroPiontTwoFiveS;
+
+    @ApiModelProperty(name = "zeroPiontFive1S",value = "0.5~1s")
+    private String zeroPiontFive1S;
+
+    @ApiModelProperty(name = "greater1S",value = ">1s")
+    private String greater1S;
+
+}

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

@@ -0,0 +1,23 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月22日 15:03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class OB implements Serializable {
+
+    private double a;
+
+    private double b;
+
+}

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

@@ -0,0 +1,89 @@
+package com.njcn.event.pojo.vo;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+import java.time.Instant;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月08日 10:52
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Measurement(name = "pqs_eventdetail")
+public class PointVO {
+
+    @Column(name = "line_id")
+    private String lineId;
+
+    @Column(name = "time")
+    private String timeId;
+
+    @Column(name = "event_describe")
+    private String eventDescribe;
+
+    @Column(name = "wave_type")
+    private Integer waveType;
+
+    @Column(name = "persist_time")
+    private Double persistTime;
+
+    @Column(name = "event_value")
+    private Double eventValue;
+
+    @Column(name = "event_reason")
+    private String eventReason;
+
+    @Column(name = "event_type")
+    private String eventType;
+
+    @Column(name = "eventass_index")
+    private String eventassIndex;
+
+    @Column(name = "dq_time")
+    private Integer dqTime;
+
+    @Column(name = "deal_time")
+    private String dealTime;
+
+    @Column(name = "deal_flag")
+    private Integer dealFlag;
+
+    @Column(name = "num")
+    private Integer num;
+
+    @Column(name = "file_flag")
+    private Integer fileFlag;
+
+    @Column(name = "first_time")
+    private String firstTime;
+
+    @Column(name = "first_type")
+    private String firstType;
+
+    @Column(name = "first_ms")
+    private Integer firstMs;
+
+    @Column(name = "wave_name")
+    private String waveName;
+
+    @Column(name = "energy")
+    private Double energy;
+
+    @Column(name = "severity")
+    private Double severity;
+
+    @Column(name = "sagsource")
+    private String sagSource;
+
+    @Column(name = "create_time")
+    private String createTime;
+
+
+}

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

@@ -0,0 +1,33 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月03日 15:31
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProbabilityVO implements Serializable {
+
+    @ApiModelProperty(name = "eventvalue")
+    private List<String> eventvalue;
+
+    @ApiModelProperty(name = "pereventvalue")
+    private List<String> pereventvalue;
+
+    @ApiModelProperty(name = "persisttime")
+    private List<String> persisttime;
+
+    @ApiModelProperty(name = "sisttime")
+    private List<String> sisttime;
+
+}

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

@@ -0,0 +1,32 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.Objects;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月03日 09:03
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ReasonsVO implements Serializable {
+
+    @ApiModelProperty(name = "reason",value = "原因")
+    private String reason;
+
+    @ApiModelProperty(name = "times",value = "次数")
+    private Integer times;
+
+    @ApiModelProperty(name = "rate",value = "占比")
+    private String rate;
+
+
+
+}

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

@@ -0,0 +1,43 @@
+package com.njcn.event.pojo.vo;
+
+import com.njcn.event.pojo.po.EventDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月02日 16:01
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class StatisticVO implements Serializable {
+
+    @ApiModelProperty(name = "cityName",value = "城市名称")
+    private String cityName;
+
+    @ApiModelProperty(name = "detail")
+    private List<EventDetail> detail;
+
+    @ApiModelProperty(name = "f47")
+    private String f47;
+
+    @ApiModelProperty(name = "itic")
+    private String itic;
+
+    @ApiModelProperty(name = "reason")
+    private List<ReasonsVO> reason;
+
+    @ApiModelProperty(name = "totalTimes")
+    private Integer totalTimes;
+
+    @ApiModelProperty(name = "types")
+    private List<TypesVO> types;
+
+}

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

@@ -42,22 +42,22 @@ public class TerminalRunningStatisticsVO implements Serializable {
         
         @ApiModelProperty("区域名称")
         private String areaName;
-
+        
         @ApiModelProperty("终端个数")
         private Integer numberOfTerminals;
-
+        
         @ApiModelProperty("投运")
         private Long normal;
 
         @ApiModelProperty("投运率")
         private Double normalRate;
-
+        
         @ApiModelProperty("热备用")
         private Long breaks;
 
         @ApiModelProperty("热备用率")
         private Double breaksRate;
-
+        
         @ApiModelProperty("停运")
         private Long shutdown;
 
@@ -75,41 +75,41 @@ public class TerminalRunningStatisticsVO implements Serializable {
             };
         }
     }
-
+    
     @Data
     @Builder
     public static class TerminalRunningVO implements Serializable {
         private static final long serialVersionUID = 8990224131248734699L;
-
+        
         @ApiModelProperty("总计-终端个数")
         private Integer numberOfTerminals;
-
+        
         @ApiModelProperty("总计-投运")
         private Long normal;
 
         @ApiModelProperty("总计-投运率")
         private Double normalRate;
-
+        
         @ApiModelProperty("总计-热备用")
         private Long breaks;
 
         @ApiModelProperty("总计-热备用率")
         private Double breaksRate;
-
+        
         @ApiModelProperty("总计-停运")
         private Long shutdown;
 
         @ApiModelProperty("总计-停运率")
         private Double shutdownRate;
-
+        
         @ApiModelProperty("总计-在线率")
         private Double onlineRate;
-
+        
         @ApiModelProperty("列表数据")
         private List<TerminalRunningInfoVO> areaInfo;
-
+        
         public static TerminalRunningVO empty() {
-            return TerminalRunningVO.buildVO(0, 0L, 0.00D, 0L, 0.00D, 0L, 0.00D, 0.00D, Collections.emptyList());
+            return TerminalRunningVO.buildVO(0, 0L, 3.14159D, 0L, 3.14159D, 0L, 3.14159D, 3.14159D, Collections.emptyList());
         }
 
         public static TerminalRunningVO buildVO(Integer numberOfTerminals, Long normal, Double normalRate, Long breaks, Double breaksRate, Long shutdown, Double shutdownRate, Double onlineRate, List<TerminalRunningInfoVO> areaInfo) {

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

@@ -0,0 +1,25 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author zbj
+ * @version 1.0.0
+ * @date 2022年08月29日 10:45
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TimeSVO extends TimeVO {
+
+
+    @ApiModelProperty(name = "eventAssIndex", value = "关联处理事件时间")
+    private int eventAssIndex;
+
+
+}

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

@@ -0,0 +1,42 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.checkerframework.checker.units.qual.A;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月02日 10:45
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TimeVO implements Serializable {
+
+    @ApiModelProperty(name = "amounts")
+    private String amounts;
+
+    @ApiModelProperty(name = "handledTimes")
+    private String handledTimes;
+
+    @ApiModelProperty(name = "days",value = "天数")
+    private String day;
+
+    @ApiModelProperty(name = "month",value = "月份")
+    private String month;
+
+    @ApiModelProperty(name = "times")
+    private String times;
+
+    @ApiModelProperty(name = "year",value = "年份")
+    private String year;
+
+    @ApiModelProperty(name = "fulltime",value = "时间全称")
+    private String fulltime;
+
+}

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

@@ -0,0 +1,27 @@
+package com.njcn.event.pojo.vo;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.io.Serializable;
+
+/**
+ * @author xxy
+ * @version 1.0.0
+ * @date 2022年08月03日 09:07
+ */
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class TypesVO implements Serializable {
+
+    @ApiModelProperty(name = "type",value = "类型")
+    private String type;
+
+    @ApiModelProperty(name = "times",value = "次数")
+    private Integer times;
+
+
+}

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

@@ -7,6 +7,7 @@ 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;
@@ -22,13 +23,13 @@ import java.util.List;
 @Builder
 public class VoltageToleranceCurveVO implements Serializable {
     private static final long serialVersionUID = -2659670722467310785L;
-    
+
     @ApiModelProperty(name = "totalNumberOfEvents", value = "事件总数")
     private Integer totalNumberOfEvents;
-    
+
     @ApiModelProperty(name = "VoltageToleranceCurveDataList", value = "图表数据")
     private List<VoltageToleranceCurveDataList> voltageToleranceCurveDataList;
-    
+
     /**
      * 构建默认对象
      *
@@ -37,7 +38,7 @@ public class VoltageToleranceCurveVO implements Serializable {
     public static VoltageToleranceCurveVO empty() {
         return VoltageToleranceCurveVO.buildVO(0, Collections.emptyList());
     }
-    
+
     /**
      * 构建默认对象
      *
@@ -47,37 +48,33 @@ public class VoltageToleranceCurveVO implements Serializable {
      */
     public static VoltageToleranceCurveVO buildVO(int numberEvents, List<VoltageToleranceCurveDataList> dataList) {
         return VoltageToleranceCurveVO.builder().totalNumberOfEvents(numberEvents).voltageToleranceCurveDataList(dataList).build();
-        
+
     }
-    
+
     @Data
     public static class VoltageToleranceCurveDataList implements Serializable {
         private static final long serialVersionUID = 2693688079727369565L;
-        
+
         @ApiModelProperty(name = "lineId", value = "LineId")
         private String lineId;
-        
+
         @ApiModelProperty(name = "persistTime", value = "持续时间（ms）")
         private Double persistTime;
-        
+
         @ApiModelProperty(name = "eventValue", value = "特征幅值")
         private Double eventValue;
-        
+
         @ApiModelProperty(name = "subName", value = "变电站名称")
         private String subName;
-        
+
         @ApiModelProperty(name = "gdName", value = "供电公司名称")
         private String gdName;
-        
+
         @ApiModelProperty(name = "time", value = "发生时刻")
-        private String time;
-        
+        private LocalDateTime time;
+
         public static Comparator<VoltageToleranceCurveDataList> sortAscTime() {
-            return (o1, o2) -> {
-                DateTime time1 = DateUtil.parseDateTime(o1.getTime());
-                DateTime time2 = DateUtil.parseDateTime(o2.getTime());
-                return time1.compareTo(time2);
-            };
+            return Comparator.comparing(VoltageToleranceCurveDataList::getTime);
         }
     }
 }

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

@@ -0,0 +1,194 @@
+package com.njcn.event.pojo.vo;
+
+import com.njcn.device.pojo.vo.AreaLineInfoVO;
+import com.njcn.event.pojo.po.EventDetail;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.influxdb.annotation.Column;
+import org.influxdb.annotation.Measurement;
+
+
+import java.math.BigDecimal;
+import java.time.Instant;
+/**
+ *获取事件报告
+ * @author zbj
+ * @date 2022/8/1
+ */
+
+@Data
+@Measurement(name = "pqs_eventdetail")
+public class WaveTypeVO{
+
+
+    @ApiModelProperty(
+            name = "lineName",
+            value = "监测点名称"
+    )
+    private String lineName;
+    @ApiModelProperty(
+            name = "subId",
+            value = "变电站id"
+    )
+    private String subId;
+    @ApiModelProperty(
+            name = "subName",
+            value = "变电站名称"
+    )
+    private String subName;
+    @ApiModelProperty(
+            name = "gdId",
+            value = "供电公司id"
+    )
+    private String gdId;
+    @ApiModelProperty(
+            name = "gdName",
+            value = "供电公司名称"
+    )
+    private String gdName;
+    @ApiModelProperty(
+            name = "voltageId",
+            value = "母线id"
+    )
+    private String voltageId;
+    @ApiModelProperty(
+            name = "voltageName",
+            value = "母线名称"
+    )
+    private String voltageName;
+    @ApiModelProperty(
+            name = "voltageScale",
+            value = "监测点电压等级"
+    )
+    private String voltageScale;
+    @ApiModelProperty(
+            name = "noDealCount",
+            value = "未处理暂降事件"
+    )
+    private Integer noDealCount;
+    @ApiModelProperty(
+            name = "ct1",
+            value = "ct1"
+    )
+    private Integer ct1;
+    @ApiModelProperty(
+            name = "ct2",
+            value = "ct2"
+    )
+    private Integer ct2;
+    @ApiModelProperty(
+            name = "pt1",
+            value = "pt1"
+    )
+    private Integer pt1;
+    @ApiModelProperty(
+            name = "pt2",
+            value = "pt2"
+    )
+    private Integer pt2;
+    @ApiModelProperty(
+            name = "runFlag",
+            value = "运行状态"
+    )
+    private Integer runFlag;
+    @ApiModelProperty(
+            name = "comFlag",
+            value = "通讯状态"
+    )
+    private Integer comFlag;
+    @ApiModelProperty(
+            name = "ip",
+            value = "装置ip"
+    )
+    private String ip;
+    @ApiModelProperty(
+            name = "lat",
+            value = "维度"
+    )
+    private BigDecimal lat;
+    @ApiModelProperty(
+            name = "lng",
+            value = "经度"
+    )
+    private BigDecimal lng;
+    @ApiModelProperty(
+            name = "manufacturer",
+            value = "供应商名称"
+    )
+    private String manufacturer;
+    @ApiModelProperty(
+            name = "loadType",
+            value = "干扰源类型"
+    )
+    private String loadType;
+
+
+    @Column(name = "line_id")
+    private String lineId;
+
+    @Column(name = "time")
+    private String timeId;
+
+    @Column(name = "event_describe")
+    private String eventDescribe;
+
+    @Column(name = "wave_type")
+    private Integer waveType;
+
+    @Column(name = "persist_time")
+    private Double persistTime;
+
+    @Column(name = "event_value")
+    private Double eventValue;
+
+    @Column(name = "event_reason")
+    private String eventReason;
+
+    @Column(name = "event_type")
+    private String eventType;
+
+    @Column(name = "eventass_index")
+    private String eventassIndex;
+
+    @Column(name = "dq_time")
+    private Integer dqTime;
+
+    @Column(name = "deal_time")
+    private String dealTime;
+
+    @Column(name = "deal_flag")
+    private Integer dealFlag;
+
+    @Column(name = "num")
+    private Integer num;
+
+    @Column(name = "file_flag")
+    private Integer fileFlag;
+
+    @Column(name = "first_time")
+    private String firstTime;
+
+    @Column(name = "first_type")
+    private String firstType;
+
+    @Column(name = "first_ms")
+    private Integer firstMs;
+
+    @Column(name = "wave_name")
+    private String waveName;
+
+    @Column(name = "energy")
+    private Double energy;
+
+    @Column(name = "severity")
+    private Double severity;
+
+    @Column(name = "sagsource")
+    private String sagSource;
+
+    @Column(name = "create_time")
+    private String createTime;
+
+
+}