Merge remote-tracking branch 'origin/master'
This commit is contained in:
@@ -203,7 +203,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
|
|||||||
.filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
|
.filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType()))
|
||||||
.filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()) ||
|
.filter(x -> InfluxDBTableConstant.AVG.equalsIgnoreCase(x.getValueType()) ||
|
||||||
InfluxDBTableConstant.MAX.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));
|
.collect(Collectors.groupingBy(DataVDto::getLineId));
|
||||||
} else {
|
} else {
|
||||||
dataVUnbalance = dataVAllTime.stream()
|
dataVUnbalance = dataVAllTime.stream()
|
||||||
@@ -216,7 +216,6 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
|
|||||||
/**
|
/**
|
||||||
* 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值
|
* 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值
|
||||||
*/
|
*/
|
||||||
|
|
||||||
Map<String, List<DataIDto>> dataINeg;
|
Map<String, List<DataIDto>> dataINeg;
|
||||||
if (Objects.equals(versionUsed, "liaoning")) {
|
if (Objects.equals(versionUsed, "liaoning")) {
|
||||||
dataINeg = dataIList.stream()
|
dataINeg = dataIList.stream()
|
||||||
@@ -642,12 +641,20 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
//三相电压不平衡度
|
// 三相电压不平衡度
|
||||||
|
// 短时(对应测量值日统计的最大值)4%
|
||||||
|
// 一般(对应测量值日统计的95%概率大值)2%
|
||||||
if (!CollectionUtils.isEmpty(dataVPOUnbalanceList)) {
|
if (!CollectionUtils.isEmpty(dataVPOUnbalanceList)) {
|
||||||
for (DataVDto item : dataVPOUnbalanceList) {
|
for (DataVDto item : dataVPOUnbalanceList) {
|
||||||
if (ObjectUtil.isNotNull(item.getVUnbalance())) {
|
if (ObjectUtil.isNotNull(item.getVUnbalance())) {
|
||||||
if (item.getVUnbalance() > overlimit.getUbalance()) {
|
if (InfluxDBTableConstant.MAX.equalsIgnoreCase(item.getValueType())) {
|
||||||
addAbnormalData(sx, item.getPhasicType(), item.getValueType(), item.getMinTime(), item.getVUnbalance(), overlimit.getUbalance());
|
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);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user