From 1b9d736e554df826f2b8e21706abdde772629c7e Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 9 Apr 2026 11:10:34 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E4=B8=89=E7=9B=B8=E7=94=B5=E5=8E=8B?= =?UTF-8?q?=E4=B8=8D=E5=B9=B3=E8=A1=A1=E5=BA=A6=E8=B6=8A=E9=99=90=E6=96=B9?= =?UTF-8?q?=E6=B3=95=E5=88=A4=E6=96=AD=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../line/IDataLimitRateAsyncImpl.java | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java index 7bf1a81..e87a209 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java @@ -203,7 +203,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType())) .filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()) || InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType())) - .peek(x -> x.setValueType(InfluxDBTableConstant.CP95)) +// .peek(x -> x.setValueType(InfluxDBTableConstant.CP95)) .collect(Collectors.groupingBy(DataVDto::getLineId)); } else { dataVUnbalance = dataVAllTime.stream() @@ -216,7 +216,6 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { /** * 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值 */ - Map> dataINeg; if (Objects.equals(versionUsed, "liaoning")) { dataINeg = dataIList.stream() @@ -642,12 +641,20 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { } } } - //三相电压不平衡度 + // 三相电压不平衡度 + // 短时（对应测量值日统计的最大值）4% + // 一般（对应测量值日统计的95%概率大值）2% if (!CollectionUtils.isEmpty(dataVPOUnbalanceList)) { for (DataVDto item : dataVPOUnbalanceList) { if (ObjectUtil.isNotNull(item.getVUnbalance())) { - if (item.getVUnbalance() > overlimit.getUbalance()) { - addAbnormalData(sx, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVUnbalance(), overlimit.getUbalance()); + if (InfluxDBTableConstant.AVG.equalsIgnoreCase(item.getValueType()) || InfluxDBTableConstant.CP95.equalsIgnoreCase(item.getValueType()) ) { + if (item.getVUnbalance() > 2.0) { + addAbnormalData(sx, item.getPhasicType(), "CP95", item.getMinTime(), item.getVUnbalance(), 2.0f); + } + } else { + if (item.getVUnbalance() > 4.0) { + addAbnormalData(sx, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVUnbalance(), 4.0f); + } } } } From 3d59a3d05899bfe864aec97dfb588ff95107778b Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Thu, 9 Apr 2026 11:22:07 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=BE=AE=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../serviceimpl/line/IDataLimitRateAsyncImpl.java | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java index e87a209..73d0126 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/serviceimpl/line/IDataLimitRateAsyncImpl.java @@ -647,14 +647,14 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { if (!CollectionUtils.isEmpty(dataVPOUnbalanceList)) { for (DataVDto item : dataVPOUnbalanceList) { if (ObjectUtil.isNotNull(item.getVUnbalance())) { - if (InfluxDBTableConstant.AVG.equalsIgnoreCase(item.getValueType()) || InfluxDBTableConstant.CP95.equalsIgnoreCase(item.getValueType()) ) { - if (item.getVUnbalance() > 2.0) { - addAbnormalData(sx, item.getPhasicType(), "CP95", item.getMinTime(), item.getVUnbalance(), 2.0f); - } - } else { + if (InfluxDBTableConstant.MAX.equalsIgnoreCase(item.getValueType())) { if (item.getVUnbalance() > 4.0) { addAbnormalData(sx, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVUnbalance(), 4.0f); } + } else { + if (item.getVUnbalance() > 2.0) { + addAbnormalData(sx, item.getPhasicType(), "CP95", item.getMinTime(), item.getVUnbalance(), 2.0f); + } } } }