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

电压暂降属性修改

Browse Source
This commit is contained in:
wurui
2023-04-07 15:11:41 +08:00
parent 24a12ec54f
commit 76b999a1cb
3 changed files with 25 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;

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

@@ -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;

16
pqs-event/event-boot/src/main/java/com/njcn/event/service/majornetwork/Impl/ReportServiceImpl.java
View File

@@ -510,8 +510,8 @@ public class ReportServiceImpl implements ReportService {
List<DictData> 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<DictData> 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 {