From bc1854258de38aec1afba6b42407b14ca54d43a8 Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Wed, 26 Nov 2025 09:54:27 +0800 Subject: [PATCH] =?UTF-8?q?1.=E5=BE=AE=E8=B0=83=E6=9A=82=E6=80=81=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E6=B8=85=E6=B4=97=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/line/DataCleanServiceImpl.java | 13 +++++++------ .../serviceimpl/line/IDataCrossingServiceImpl.java | 1 + .../njcn/dataProcess/pojo/po/PqDataVerifyBak.java | 13 +++++++++++-- 3 files changed, 19 insertions(+), 8 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java index a0a075f..dc055d5 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/DataCleanServiceImpl.java @@ -522,6 +522,7 @@ public class DataCleanServiceImpl implements IDataCleanService { List list = map.get(DataCleanEnum.RMpEventDetail.getCode()); Map pqReasonableRangeDtoMap = list.stream().collect(Collectors.toMap(PqReasonableRangeDto::getIndexCode, Function.identity())); eventList.forEach(data->{ + data.setFeatureAmplitude(data.getFeatureAmplitude()*100.0); List pqDataVerifies = judgeDataEvent(pqReasonableRangeDtoMap,data); result.addAll(pqDataVerifies); }); @@ -744,13 +745,13 @@ public class DataCleanServiceImpl implements IDataCleanService { //暂降事件 List 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 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); diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java index 8b4507e..ff49a04 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataCrossingServiceImpl.java @@ -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)) { diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java index bd28ed9..5cecf0a 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/pojo/po/PqDataVerifyBak.java @@ -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; /**