diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java index 0701a26a4..3e15230d9 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/DetailVO.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; +import org.influxdb.annotation.Column; import java.io.Serializable; @@ -19,16 +20,16 @@ import java.io.Serializable; public class DetailVO extends AreaLineInfoVO implements Serializable { @ApiModelProperty(name = "persistTime",value = "持续时间") - private Double persistTime; + private Double duration; - @ApiModelProperty(name = "eventType",value = "暂态类型") - private String eventType; + @ApiModelProperty(value = "暂降类型(Event_Type)") + private String advanceType; @ApiModelProperty(name = "eventValue",value = "特征幅值") - private Double eventValue; + private Double featureAmplitude; - @ApiModelProperty(name = "time",value = "发生时间") - private String timeId; + @ApiModelProperty(name = "startTime",value = "发生时间") + private String startTime; @ApiModelProperty(name = "times",value = "次数") private Integer times; diff --git a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java index 7e09d724e..114b751d2 100644 --- a/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java +++ b/pqs-event/event-api/src/main/java/com/njcn/event/pojo/vo/WaveTypeVO.java @@ -129,19 +129,22 @@ public class WaveTypeVO{ private String eventDescribe; @Column(name = "wave_type") - private String waveType; + @ApiModelProperty(value = "统计类型") + private String eventType; - @Column(name = "persist_time") - private Double persistTime; + @ApiModelProperty(value = "持续时间,单位秒") + private Double duration; - @Column(name = "event_value") - private Double eventValue; + @ApiModelProperty(value = "特征幅值") + private Double featureAmplitude; @Column(name = "event_reason") - private String eventReason; + @ApiModelProperty(value = "暂降原因(Event_Reason)") + private String advanceReason; @Column(name = "event_type") - private String eventType; + @ApiModelProperty(value = "暂降类型(Event_Type)") + private String advanceType; @Column(name = "eventass_index") private String eventassIndex; diff --git a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java index 60fa04b42..d1fdb9a79 100644 --- a/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java +++ b/pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java @@ -510,8 +510,8 @@ public class ReportServiceImpl implements ReportService { List type = reason.getData(); for (DetailVO detailVO : result) { for (DictData dictData : type) { - if (dictData.getId().equals(detailVO.getEventType())) { - detailVO.setEventType(dictData.getName()); + if (dictData.getId().equals(detailVO.getAdvanceType())) { + detailVO.setAdvanceType(dictData.getName()); } } } @@ -2011,11 +2011,11 @@ public class ReportServiceImpl implements ReportService { List eventTypeList = type.getData(); for (WaveTypeVO waveTypeVO : eventDetailList) { - if (waveTypeVO.getEventReason() != null) { + if (waveTypeVO.getAdvanceReason() != null) { for (DictData dictData : eventReasonList) { //将字典数据id与VO中属性eventReason对应的字符串进行比较 - if (waveTypeVO.getEventReason().equals(dictData.getId())) { - waveTypeVO.setEventReason(dictData.getName()); + if (waveTypeVO.getAdvanceReason().equals(dictData.getId())) { + waveTypeVO.setAdvanceReason(dictData.getName()); } } } else { @@ -2025,11 +2025,11 @@ public class ReportServiceImpl implements ReportService { } for (WaveTypeVO waveTypeVO : eventDetailList) { - if (waveTypeVO.getEventType() != null) { + if (waveTypeVO.getAdvanceType() != null) { for (DictData dictData : eventTypeList) { //将字典数据id与VO中属性eventType对应的字符串进行比较 - if (waveTypeVO.getEventType().equals(dictData.getId())) { - waveTypeVO.setEventType(dictData.getName()); + if (waveTypeVO.getAdvanceType().equals(dictData.getId())) { + waveTypeVO.setAdvanceType(dictData.getName()); } } } else {