diff --git a/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java b/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java index 0285d79..642b7d6 100644 --- a/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java +++ b/src/main/java/com/njcn/influx/service/DataHarmPowerPService.java @@ -12,4 +12,6 @@ import java.util.List; */ public interface DataHarmPowerPService { List getHarmonicPowerP(String lineIndex, String startTime, String endTime); + + List getNewHarmonicPowerP(String lineIndex, String startTime, String endTime, String phaseType, String valueType); } diff --git a/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java index d0f9b74..8540b51 100644 --- a/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/DataHarmPowerPServiceImpl.java @@ -29,4 +29,15 @@ public class DataHarmPowerPServiceImpl implements DataHarmPowerPService { result1 = dataHarmPowerPMapper.getStatisticsByWraper(influxQueryWrapper); return result1; } + + @Override + public List getNewHarmonicPowerP(String lineIndex, String startTime, String endTime, String phaseType, String valueType) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmPowerP.class); + influxQueryWrapper.between(DataHarmPowerP::getTime, startTime, endTime); + if(lineIndex != null) influxQueryWrapper.eq(DataHarmPowerP::getLineId, lineIndex); + if(phaseType != null) influxQueryWrapper.eq(DataHarmPowerP::getPhaseType, phaseType); + if(valueType != null) influxQueryWrapper.eq(DataHarmPowerP::getValueType, valueType); + List result1 = dataHarmPowerPMapper.getStatisticsByWraper(influxQueryWrapper); + return result1; + } }