1.微调暂态数据清洗算法
This commit is contained in:
@@ -522,6 +522,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
List<PqReasonableRangeDto> list = map.get(DataCleanEnum.RMpEventDetail.getCode());
|
||||
Map<String, PqReasonableRangeDto> pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity()));
|
||||
eventList.forEach(data->{
|
||||
data.setFeatureAmplitude(data.getFeatureAmplitude()*100.0);
|
||||
List<PqDataVerify> pqDataVerifies = judgeDataEvent(pqReasonableRangeDtoMap,data);
|
||||
result.addAll(pqDataVerifies);
|
||||
});
|
||||
@@ -744,13 +745,13 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
//暂降事件
|
||||
List<DataCleanJsonDTO.DataHarmCleanJsonDTO> list = handleData(codeMap.get(DataCleanEnum.VoltageDip.getCode()),timeInterval);
|
||||
if (CollUtil.isNotEmpty(list)) {
|
||||
bak.setEvent(1);
|
||||
bak.setDip(1);
|
||||
map.put(DataCleanEnum.RMpEventDetail.getCode() + "-" + DataCleanEnum.VoltageDip.getCode(),list);
|
||||
}
|
||||
//暂降事件
|
||||
//暂升事件
|
||||
List<DataCleanJsonDTO.DataHarmCleanJsonDTO> list2 = handleData(codeMap.get(DataCleanEnum.VoltageRise.getCode()),timeInterval);
|
||||
if (CollUtil.isNotEmpty(list2)) {
|
||||
bak.setEvent(1);
|
||||
bak.setRise(1);
|
||||
map.put(DataCleanEnum.RMpEventDetail.getCode() + "-" + DataCleanEnum.VoltageRise.getCode(),list2);
|
||||
}
|
||||
return map;
|
||||
@@ -1821,7 +1822,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
if (dto.getFeatureAmplitude() < pqReasonableRangeDto.getMinValue() || dto.getFeatureAmplitude() > pqReasonableRangeDto.getMaxValue()) {
|
||||
PqDataVerify pqDataVerify = getPqDataVerify(dto.getMeasurementPointId()
|
||||
,dto.getStartTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_MS_PATTERN))
|
||||
,null
|
||||
,"Feature_Amplitude"
|
||||
,"/"
|
||||
,pqReasonableRangeDto.getIndexCode()
|
||||
,pqReasonableRangeDto.getIndexName()
|
||||
@@ -1837,7 +1838,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
if (dto.getFeatureAmplitude() < pqReasonableRangeDto2.getMinValue() || dto.getFeatureAmplitude() > pqReasonableRangeDto2.getMaxValue()) {
|
||||
PqDataVerify pqDataVerify = getPqDataVerify(dto.getMeasurementPointId()
|
||||
,dto.getStartTime().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_MS_PATTERN))
|
||||
,null
|
||||
,"Feature_Amplitude"
|
||||
,"/"
|
||||
,pqReasonableRangeDto2.getIndexCode()
|
||||
,pqReasonableRangeDto2.getIndexName()
|
||||
@@ -1856,7 +1857,7 @@ public class DataCleanServiceImpl implements IDataCleanService {
|
||||
PqDataVerify pqDataVerify = new PqDataVerify();
|
||||
pqDataVerify.setLineId(lineId);
|
||||
pqDataVerify.setTime(time.contains(".")?TimeUtils.StringToLocalDateTimeSSS(time):TimeUtils.StringToLocalDateTime(time));
|
||||
pqDataVerify.setValueType(Objects.isNull(valueType)?"avg":valueType);
|
||||
pqDataVerify.setValueType(Objects.isNull(valueType)?"AVG":valueType);
|
||||
pqDataVerify.setPhasicType(phasicType);
|
||||
pqDataVerify.setIndexCode(indexCode);
|
||||
pqDataVerify.setIndexName(indexName);
|
||||
|
||||
@@ -1104,6 +1104,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService {
|
||||
json.setValue(String.join(",", value.stream()
|
||||
.map(abnormal -> abnormal.getValue() + "")
|
||||
.collect(Collectors.toList())));
|
||||
json.setOverLimitValue(list.get(0).getOverLimitValue());
|
||||
info.add(json);
|
||||
});
|
||||
if (CollUtil.isNotEmpty(info)) {
|
||||
|
||||
@@ -174,8 +174,17 @@ public class PqDataVerifyBak implements Serializable {
|
||||
private Integer pst = 0;
|
||||
|
||||
|
||||
@TableField(value = "event")
|
||||
private Integer event = 0;
|
||||
/**
|
||||
* 电压暂降(0:正常 1:异常)
|
||||
*/
|
||||
@TableField(value = "dip")
|
||||
private Integer dip;
|
||||
|
||||
/**
|
||||
* 电压暂升(0:正常 1:异常)
|
||||
*/
|
||||
@TableField(value = "rise")
|
||||
private Integer rise;
|
||||
|
||||
|
||||
/**
|
||||
|
||||
Reference in New Issue
Block a user