Merge remote-tracking branch 'origin/master'

This commit is contained in:
hzj
2026-04-09 19:54:28 +08:00

View File

@@ -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<String, List<DataIDto>> 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.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);
}
}
}
}