diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java index 8b9aca6..3614677 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/service/line/IDataLimitRateAsync.java @@ -15,6 +15,7 @@ public interface IDataLimitRateAsync { * @param overLimitMap * @param size * @param i + * @param type 系统类型 * @Author: wr * @Date: 2025/12/17 12:16 */ @@ -23,5 +24,6 @@ public interface IDataLimitRateAsync { List phase, Map overLimitMap, int size, - int i); + int i, + int type); } 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 77123dc..f9191c0 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 @@ -111,7 +111,7 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { for (int i = 0; i < pendingIds.size(); i++) { logger.info(calculatedParam.getDataDate()+" 总分区数据:" + pendingIds.size() + "=====》当前第"+(i + 1)+"小分区"); List list = pendingIds.get(i); - dataLimitRateAsync.lineDataRate(calculatedParam.getDataDate(), list, phase, overLimitMap, pendingIds.size(), (i + 1)); + dataLimitRateAsync.lineDataRate(calculatedParam.getDataDate(), list, phase, overLimitMap, pendingIds.size(), (i + 1), lineParam.getType()); } System.gc(); } 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 1b00aef..3643d04 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 @@ -64,12 +64,14 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { List phase, Map overLimitMap, int size, - int i) { + int i, + int type) { List result = new ArrayList<>(); LineCountEvaluateParam lineParam = new LineCountEvaluateParam(); lineParam.setStartTime(TimeUtils.getBeginOfDay(dataDate)); lineParam.setEndTime(TimeUtils.getEndOfDay(dataDate)); lineParam.setLineId(list); + lineParam.setType(type); //获取电压数据 List dataVAllTime = dataVFeignClient.getRawData(lineParam).getData(); //闪变数据 @@ -94,10 +96,17 @@ public class IDataLimitRateAsyncImpl implements IDataLimitRateAsync { * 闪变总计算次数(用data_plt中phasic_type=A,value_type=avg,quality_flag=0来参与统计) */ //fixme 冀北现场 闪变原始表没有 value_type 这个参数 - Map> pltAllTime = dataPltAllTime.stream() - .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType())) -// .filter(x -> InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(x.getValueType())) - .collect(Collectors.groupingBy(DataPltDto::getLineId)); + Map> pltAllTime; + if (type == 2) { + pltAllTime = dataPltAllTime.stream() + .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType())) + .filter(x -> InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(x.getValueType())) + .collect(Collectors.groupingBy(DataPltDto::getLineId)); + } else { + pltAllTime = dataPltAllTime.stream() + .filter(x -> PhaseType.PHASE_A.equals(x.getPhasicType())) + .collect(Collectors.groupingBy(DataPltDto::getLineId)); + } /** *功能描述:获取influxDB -> data_harmrate_v ->