Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

暂降系统优化influxdb转mysql

Browse Source
This commit is contained in:
wurui
2023-03-31 10:28:39 +08:00
parent 8c3ae3ef2b
commit 6237a7b656
23 changed files with 1619 additions and 1686 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,7 +45,7 @@ public class TransientParam extends DeviceInfoParam.BusinessParam {
private BigDecimal severityMin;
@ApiModelProperty("触发类型")
private List<Integer> waveType;
private List<String> waveType;
@ApiModelProperty("暂降原因")
private List<String> eventReason;

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

@@ -1,14 +1,17 @@
package com.njcn.event.pojo.po;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.datatype.jsr310.ser.InstantSerializer;
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;
import java.time.LocalDateTime;
import java.time.ZoneId;
import java.util.concurrent.TimeUnit;
/**
* @author denghuajun
@@ -20,81 +23,90 @@ import java.time.Instant;
@Measurement(name = "pqs_eventdetail")
public class EventDetail {
@Column(name = "line_id")
private String lineId;
@Column(name = "line_id")
private String lineId;
@Column(name = "time")
@JsonSerialize(using = InstantSerializer.class)
private Instant timeId;
@Column(name = "time")
@ApiModelProperty(value = "开始时间")
@JsonSerialize(using = InstantSerializer.class)
private Instant startTime;
@Column(name = "event_describe")
private String eventDescribe;
@Column(name = "event_describe")
@ApiModelProperty(value = "事件描述")
private String eventDescribe;
@Column(name = "wave_type")
private Integer waveType;
@Column(name = "wave_type")
@ApiModelProperty(value = "统计类型")
private String eventType;
@Column(name = "persist_time")
private Double persistTime;
@Column(name = "persist_time")
@ApiModelProperty(value = "持续时间，单位秒")
private Double duration;
@Column(name = "event_value")
private Double eventValue;
@Column(name = "event_value")
@ApiModelProperty(value = "特征幅值")
private Double featureAmplitude;
@Column(name = "event_reason")
private String eventReason;
@Column(name = "event_reason")
@ApiModelProperty(value = "暂降原因（Event_Reason）")
private String advanceReason;
@Column(name = "event_type")
private String eventType;
@Column(name = "event_type")
@ApiModelProperty(value = "暂降类型（Event_Type）")
private String advanceType;
@Column(name = "eventass_index")
private String eventassIndex;
@Column(name = "eventass_index")
private String eventassIndex;
@Column(name = "dq_time")
private Integer dqTime;
@Column(name = "dq_time")
private Integer dqTime;
@Column(name = "deal_time")
private String dealTime;
@Column(name = "deal_time")
private String dealTime;
@Column(name = "deal_flag")
private Integer dealFlag;
@Column(name = "deal_flag")
private Integer dealFlag;
@Column(name = "num")
private Integer num;
@Column(name = "num")
private Integer num;
@Column(name = "file_flag")
private Integer fileFlag;
@Column(name = "file_flag")
private Integer fileFlag;
@Column(name = "first_time")
private String firstTime;
@Column(name = "first_time")
private String firstTime;
@Column(name = "first_type")
private String firstType;
@Column(name = "first_type")
private String firstType;
@Column(name = "first_ms")
private Integer firstMs;
@Column(name = "first_ms")
private Integer firstMs;
@Column(name = "wave_name")
private String waveName;
@Column(name = "wave_name")
@ApiModelProperty(value = "波形路径")
private String wavePath;
@Column(name = "energy")
private Double energy;
@Column(name = "energy")
private Double energy;
@Column(name = "severity")
private Double severity;
@Column(name = "severity")
private Double severity;
@Column(name = "sagsource")
private String sagSource;
@Column(name = "sagsource")
private String sagSource;
@Column(name = "create_time")
private String createTime;
@Column(name = "create_time")
private String createTime;
private String lineName;
private String lineName;
private BigDecimal lat;
private BigDecimal lat;
private BigDecimal lng;
private BigDecimal lng;
private String gdName;
private String gdName;
private String subName;
private String subName;
}

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

@@ -1,8 +1,8 @@
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;
@@ -13,87 +13,98 @@ import java.math.BigDecimal;
*/
@Data
@Measurement(name = "pqs_eventdetail")
//@Measurement(name = "pqs_eventdetail")
public class EventDetailNew {
@Column(name = "line_id")
private String lineId;
@Column(name = "line_id")
private String lineId;
@Column(name = "time")
private String timeId;
@Column(name = "time")
@ApiModelProperty(value = "开始时间")
private String startTime;
@Column(name = "event_describe")
private String eventDescribe;
@Column(name = "event_describe")
@ApiModelProperty(value = "事件描述")
private String eventDescribe;
@Column(name = "wave_type")
private String waveType;
@Column(name = "wave_type")
@ApiModelProperty(value = "统计类型")
private String eventType;
@Column(name = "persist_time")
private Double persistTime;
@Column(name = "persist_time")
@ApiModelProperty(value = "持续时间，单位秒")
private Double duration;
@Column(name = "event_value")
private Double eventValue;
@Column(name = "event_value")
@ApiModelProperty(value = "特征幅值")
private Double featureAmplitude;
@Column(name = "event_reason")
private String eventReason;
@Column(name = "event_reason")
@ApiModelProperty(value = "暂降原因（Event_Reason）")
private String advanceReason;
@Column(name = "event_type")
private String eventType;
@Column(name = "event_type")
@ApiModelProperty(value = "暂降类型（Event_Type）")
private String advanceType;
@Column(name = "eventass_index")
private String eventassIndex;
@Column(name = "eventass_index")
private String eventassIndex;
@Column(name = "dq_time")
private Integer dqTime;
@Column(name = "dq_time")
private Integer dqTime;
@Column(name = "deal_time")
private String dealTime;
@Column(name = "deal_time")
private String dealTime;
@Column(name = "deal_flag")
private Integer dealFlag;
@Column(name = "deal_flag")
private Integer dealFlag;
@Column(name = "num")
private Integer num;
@Column(name = "num")
private Integer num;
@Column(name = "file_flag")
private Integer fileFlag;
@Column(name = "file_flag")
private Integer fileFlag;
@Column(name = "first_time")
private String firstTime;
@Column(name = "first_time")
private String firstTime;
@Column(name = "first_type")
private String firstType;
@Column(name = "first_type")
private String firstType;
@Column(name = "first_ms")
private Integer firstMs;
@Column(name = "first_ms")
private Integer firstMs;
@Column(name = "wave_name")
private String waveName;
@Column(name = "wave_name")
@ApiModelProperty(value = "波形路径")
private String wavePath;
@Column(name = "energy")
private Double energy;
@Column(name = "energy")
private Double energy;
@Column(name = "severity")
private Double severity;
@Column(name = "severity")
private Double severity;
@Column(name = "sagsource")
private String sagSource;
@Column(name = "sagsource")
private String sagSource;
@Column(name = "create_time")
private String createTime;
@Column(name = "create_time")
private String createTime;
private String lineName;
private String lineName;
private BigDecimal lat;
private BigDecimal lat;
private BigDecimal lng;
private BigDecimal lng;
private String gdName;
private String gdName;
private String subName;
private String subName;
private String ip;
private String ip;
private String scale;
private String scale;
@ApiModelProperty(value = "暂时事件ID")
private String eventId;
}

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

@@ -1,6 +1,5 @@
package com.njcn.event.pojo.po;
import cn.hutool.core.date.DateTime;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
@@ -10,15 +9,12 @@ import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
import org.influxdb.annotation.Column;
import java.io.Serializable;
import java.math.BigDecimal;
import java.time.LocalDateTime;
import java.util.Date;
/**
* (RMpEventDetail)实体类
* (influxdb 转 mysql 专用)实体类
*
* @author yzh
* @since 2022-10-12 18:34:55
@@ -37,12 +33,20 @@ public class RmpEventDetailPO implements Serializable {
@ApiModelProperty(value = "监测点ID")
private String measurementPointId;
@ApiModelProperty(value = "事件类型")
@ApiModelProperty(value = "监测点ID(复制)")
@TableField("measurement_point_id")
private String lineId;
@ApiModelProperty(value = "统计类型")
private String eventType;
@ApiModelProperty(value = "暂降原因（字典表PQS_Dicdata）")
@TableField("Event_Reason")
private String eventReason;
@ApiModelProperty(value = "暂降原因（Event_Reason）")
@TableField("advance_reason")
private String advanceReason;
@ApiModelProperty(value = "暂降类型（Event_Type）")
@TableField("advance_type")
private String advanceType;
@ApiModelProperty(value = "事件关联分析表Guid")
private String eventassIndex;
@@ -82,7 +86,8 @@ public class RmpEventDetailPO implements Serializable {
@ApiModelProperty(value = "开始时间")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS",timezone = "GMT+8")
private Date startTime;
private String startTime;
@ApiModelProperty(value = "持续时间，单位秒")
private Double duration;
@@ -99,14 +104,10 @@ public class RmpEventDetailPO implements Serializable {
@ApiModelProperty(value = "波形路径")
private String wavePath;
@ApiModelProperty(value = "波形名称")
@TableField("wave_path")
private String waveName;
private String phasicType;
private Double transientValue;
private String createTime;
}

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

@@ -130,7 +130,7 @@ public class WaveTypeVO{
private String eventDescribe;
@Column(name = "wave_type")
private Integer waveType;
private String waveType;
@Column(name = "persist_time")
private Double persistTime;