diff --git a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java index a2ca81d..91df75f 100644 --- a/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java +++ b/algorithm/algorithm-boot/src/main/java/com/njcn/algorithm/ExecutionCenter.java @@ -190,6 +190,7 @@ public class ExecutionCenter extends BaseController { startDate = DateUtil.offsetDay(startDate, 1); } calculatedParam.setDataDate(DateUtil.format(startDate, DatePattern.NORM_DATE_PATTERN)); + calculatedParam.setType(2); liteflowResponse = flowExecutor.execute2Resp("wl_measurement_point", calculatedParam); dealResponse(calculatedParam, liteflowResponse, methodDescribe); } 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 15aef13..3f3af0d 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 @@ -125,7 +125,8 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { pendingIds.forEach(list -> { lineParam.setLineId(list); //获取电压数据 - List dataVAllTime = dataVFeignClient.getRawData(lineParam).getData(); +// List dataVAllTime = dataVFeignClient.getRawData(lineParam).getData(); + List dataVAllTime = new ArrayList<>(); //闪变数据 List dataPltAllTime = dataPltFeignClient.getRawData(lineParam).getData(); //谐波数据 @@ -147,9 +148,10 @@ public class IDataCrossingServiceImpl implements IDataCrossingService { * 功能描述:获取influxDB -> data_plt -> * 闪变总计算次数(用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())) +// .filter(x -> InfluxDbSqlConstant.AVG_WEB.equalsIgnoreCase(x.getValueType())) .collect(Collectors.groupingBy(DataPltDto::getLineId)); /**