From d298f2b9fdda948568537d9281096cf740618e36 Mon Sep 17 00:00:00 2001 From: guofeihu <3347277866@qq.com> Date: Tue, 3 Sep 2024 09:44:01 +0800 Subject: [PATCH] =?UTF-8?q?DataHarmPowerPService=E4=B8=AD=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95getNewHarmonicPowe?= =?UTF-8?q?rP?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/influx/service/DataHarmPowerPService.java | 2 ++ .../service/impl/DataHarmPowerPServiceImpl.java | 11 +++++++++++ 2 files changed, 13 insertions(+) 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; + } }