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 eea1486..672d553 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 @@ -123,7 +123,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { */ Map> harmRateV = dataVHarmList.stream() .filter(x -> phase.contains(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataHarmDto::getLineId)); /** @@ -131,7 +131,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { */ Map> dataI = dataIList.stream() .filter(x -> phase.contains(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataIDto::getLineId)); @@ -140,7 +140,7 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { */ Map> inHarmV = dataVInHarmList.stream() .filter(x -> phase.contains(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataHarmDto::getLineId)); /** @@ -148,41 +148,41 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { */ Map> dataVThd = dataVAllTime.stream() .filter(x -> phase.contains(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataVDto::getLineId)); /** * 功能描述:获取influxDB -> data_v -> 负序电压不平衡度 -> 最大值 && 日95%概率值 */ Map> dataVUnbalance = dataVAllTime.stream() - .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equals(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()) || - InfluxDBTableConstant.MAX.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType())) + .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) || + InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataVDto::getLineId)); /** * 功能描述:获取influxDB -> data_i -> 负序电流 -> 最大值 && 日95%概率值 */ Map> dataINeg = dataIList.stream() - .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equals(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.CP95.equals(x.getValueType()) || - InfluxDBTableConstant.MAX.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType())) + .filter(x -> InfluxDBTableConstant.CP95.equalsIgnoreCase(x.getValueType()) || + InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataIDto::getLineId)); /** * 功能描述:获取influxDB -> data_v -> 频率偏差 -> 最大值 && 最小值 */ Map> dataVFreq = dataVAllTime.stream() - .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equals(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.MIN.equals(x.getValueType()) || - InfluxDBTableConstant.MAX.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.PHASE_TYPE_T.equalsIgnoreCase(x.getPhasicType())) + .filter(x -> InfluxDBTableConstant.MIN.equalsIgnoreCase(x.getValueType()) || + InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataVDto::getLineId)); /** * 功能描述:获取influxDB -> data_v -> 电压偏差 -> 最大值 */ Map> dataVDev = dataVAllTime.stream() .filter(x -> phase.contains(x.getPhasicType())) - .filter(x -> InfluxDBTableConstant.MAX.equals(x.getValueType())) + .filter(x -> InfluxDBTableConstant.MAX.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataVDto::getLineId)); /**