diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java index 64acbae..c7363f0 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataIImpl.java @@ -206,14 +206,14 @@ public class InfluxdbDataIImpl extends MppServiceImpl getGroupByTimeDataI(LineCountEvaluateParam lineParam) { - InfluxQueryWrapper harmRateVQueryWrapper = new InfluxQueryWrapper(DataHarmrateV.class); - harmRateVQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); - harmRateVQueryWrapper.regular(DataV::getLineId, lineParam.getLineId()) - .eq(DataHarmrateV::getValueType, InfluxDbSqlConstant.CP95) - .ne(DataHarmrateV::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class); + influxQueryWrapper.maxSamePrefixAndSuffix(InfluxDbSqlConstant.I, "", HarmonicTimesUtil.harmonicTimesList(2, 50, 1)); + influxQueryWrapper.regular(DataI::getLineId, lineParam.getLineId()) + .eq(DataI::getValueType, InfluxDbSqlConstant.CP95) + .ne(DataI::getPhasicType, InfluxDBTableConstant.PHASE_TYPE_T) .groupBy("time(" + lineParam.getValueType().get(0) + "m)") - .between(DataHarmrateV::getTime, lineParam.getStartTime(), lineParam.getEndTime()); - List list = dataIMapper.selectByQueryWrapper(harmRateVQueryWrapper); + .between(DataI::getTime, lineParam.getStartTime(), lineParam.getEndTime()); + List list = dataIMapper.selectByQueryWrapper(influxQueryWrapper); List result = new ArrayList<>(); list.forEach(item -> { DataIDto dto = new DataIDto();