From 60afcb97cf073f031208945e9d2105d3d609e439 Mon Sep 17 00:00:00 2001 From: guofeihu <3347277866@qq.com> Date: Fri, 13 Sep 2024 18:42:57 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E4=B8=80=E4=BA=9B=E5=85=AC?= =?UTF-8?q?=E5=85=B1=E6=9F=A5=E8=AF=A2=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/influx/service/DataFlucService.java | 4 +++ .../influx/service/DataHarmRateVService.java | 2 ++ .../service/DataInHarmRateVService.java | 13 +++++++++ .../njcn/influx/service/DataPltService.java | 13 +++++++++ .../njcn/influx/service/IDataIService.java | 1 + .../njcn/influx/service/IDataVService.java | 3 +- .../service/impl/DataFlucServiceImpl.java | 20 ++++++++++++- .../impl/DataHarmRateVServiceImpl.java | 11 +++++++ .../impl/DataInHarmRateVServiceImpl.java | 29 +++++++++++++++++++ .../service/impl/DataPltServiceImpl.java | 29 +++++++++++++++++++ .../influx/service/impl/DataVServiceImpl.java | 8 +++++ .../service/impl/IDataIServiceImpl.java | 8 +++++ 12 files changed, 138 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/njcn/influx/service/DataInHarmRateVService.java create mode 100644 src/main/java/com/njcn/influx/service/DataPltService.java create mode 100644 src/main/java/com/njcn/influx/service/impl/DataInHarmRateVServiceImpl.java create mode 100644 src/main/java/com/njcn/influx/service/impl/DataPltServiceImpl.java diff --git a/src/main/java/com/njcn/influx/service/DataFlucService.java b/src/main/java/com/njcn/influx/service/DataFlucService.java index fd6d641..5c6addf 100644 --- a/src/main/java/com/njcn/influx/service/DataFlucService.java +++ b/src/main/java/com/njcn/influx/service/DataFlucService.java @@ -1,9 +1,13 @@ package com.njcn.influx.service; +import com.njcn.influx.pojo.po.DataFluc; +import java.util.List; + /** * @author hongawen * @version 1.0.0 * @date 2023年05月05日 09:10 */ public interface DataFlucService { + List getNewDataFluc(String lineIndex, String startTime, String endTime); } diff --git a/src/main/java/com/njcn/influx/service/DataHarmRateVService.java b/src/main/java/com/njcn/influx/service/DataHarmRateVService.java index f0c39fd..f71b8da 100644 --- a/src/main/java/com/njcn/influx/service/DataHarmRateVService.java +++ b/src/main/java/com/njcn/influx/service/DataHarmRateVService.java @@ -2,6 +2,7 @@ package com.njcn.influx.service; import com.njcn.influx.pojo.po.DataHarmRateV; import com.njcn.influx.query.InfluxQueryWrapper; +import java.util.List; /** * @author hongawen @@ -10,4 +11,5 @@ import com.njcn.influx.query.InfluxQueryWrapper; */ public interface DataHarmRateVService { DataHarmRateV getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper); + List getNewDataHarmRateV(String lineIndex, String startTime, String endTime); } diff --git a/src/main/java/com/njcn/influx/service/DataInHarmRateVService.java b/src/main/java/com/njcn/influx/service/DataInHarmRateVService.java new file mode 100644 index 0000000..76ff497 --- /dev/null +++ b/src/main/java/com/njcn/influx/service/DataInHarmRateVService.java @@ -0,0 +1,13 @@ +package com.njcn.influx.service; + +import com.njcn.influx.pojo.po.DataInHarmRateV; +import java.util.List; + +/** + * @author guofeihu + * @version 1.0.0 + * @date 2024年09月13日 11:01 + */ +public interface DataInHarmRateVService { + List getNewDataInHarmRateV(String lineIndex, String startTime, String endTime); +} diff --git a/src/main/java/com/njcn/influx/service/DataPltService.java b/src/main/java/com/njcn/influx/service/DataPltService.java new file mode 100644 index 0000000..4dc4841 --- /dev/null +++ b/src/main/java/com/njcn/influx/service/DataPltService.java @@ -0,0 +1,13 @@ +package com.njcn.influx.service; + +import com.njcn.influx.pojo.po.DataPlt; +import java.util.List; + +/** + * @author guofeihu + * @version 1.0.0 + * @date 2024年09月13日 11:01 + */ +public interface DataPltService { + List getNewDataPlt(String lineIndex, String startTime, String endTime); +} diff --git a/src/main/java/com/njcn/influx/service/IDataIService.java b/src/main/java/com/njcn/influx/service/IDataIService.java index d908f12..0538c88 100644 --- a/src/main/java/com/njcn/influx/service/IDataIService.java +++ b/src/main/java/com/njcn/influx/service/IDataIService.java @@ -21,4 +21,5 @@ public interface IDataIService { * @Date: 2024/2/27 */ List getWeekDataI(String lineIndex, String startTime, String endTime); + List getNewDataI(String lineIndex, String startTime, String endTime); } diff --git a/src/main/java/com/njcn/influx/service/IDataVService.java b/src/main/java/com/njcn/influx/service/IDataVService.java index 0876dc3..179afa4 100644 --- a/src/main/java/com/njcn/influx/service/IDataVService.java +++ b/src/main/java/com/njcn/influx/service/IDataVService.java @@ -1,12 +1,11 @@ package com.njcn.influx.service; import com.njcn.influx.pojo.po.DataV; - import java.util.List; public interface IDataVService { List getDataV(String lineIndex, String startTime, String endTime); List getHarmonicDataV(String lineIndex, String startTime, String endTime); - + List getNewDataV(String lineIndex, String startTime, String endTime); } diff --git a/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java index 7f793de..c82295d 100644 --- a/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/DataFlucServiceImpl.java @@ -1,6 +1,12 @@ package com.njcn.influx.service.impl; +import com.njcn.influx.imapper.DataFlucMapper; +import com.njcn.influx.pojo.po.DataFluc; +import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.influx.service.DataFlucService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; /** * @author hongawen @@ -8,5 +14,17 @@ import org.springframework.stereotype.Service; * @date 2023年05月05日 09:10 */ @Service -public class DataFlucServiceImpl { +@RequiredArgsConstructor +public class DataFlucServiceImpl implements DataFlucService { + + private final DataFlucMapper dataFlucMapper; + + @Override + public List getNewDataFluc(String lineIndex, String startTime, String endTime) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataFluc.class); + influxQueryWrapper.eq(DataFluc::getLineId, lineIndex) + .between(DataFluc::getTime, startTime, endTime); + return dataFlucMapper.getStatisticsByWraper(influxQueryWrapper); + } + } diff --git a/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java index 77757f3..44e275b 100644 --- a/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/DataHarmRateVServiceImpl.java @@ -2,11 +2,14 @@ package com.njcn.influx.service.impl; import com.njcn.influx.imapper.DataHarmRateVMapper; import com.njcn.influx.pojo.po.DataHarmRateV; +import com.njcn.influx.pojo.po.DataV; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.influx.service.DataHarmRateVService; import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.List; + /** * @author hongawen * @version 1.0.0 @@ -23,4 +26,12 @@ public class DataHarmRateVServiceImpl implements DataHarmRateVService { public DataHarmRateV getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper) { return dataHarmRateVMapper.getMeanAllTimesData(influxQueryWrapper); } + + @Override + public List getNewDataHarmRateV(String lineIndex, String startTime, String endTime) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmRateV.class); + influxQueryWrapper.eq(DataHarmRateV::getLineId, lineIndex) + .between(DataHarmRateV::getTime, startTime, endTime);; + return dataHarmRateVMapper.getStatisticsByWraper(influxQueryWrapper); + } } diff --git a/src/main/java/com/njcn/influx/service/impl/DataInHarmRateVServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/DataInHarmRateVServiceImpl.java new file mode 100644 index 0000000..634c86b --- /dev/null +++ b/src/main/java/com/njcn/influx/service/impl/DataInHarmRateVServiceImpl.java @@ -0,0 +1,29 @@ +package com.njcn.influx.service.impl; + +import com.njcn.influx.imapper.DataInHarmRateVMapper; +import com.njcn.influx.pojo.po.DataInHarmRateV; +import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.influx.service.DataInHarmRateVService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +/** + * @author guofeihu + * @version 1.0.0 + * @date 2024年09月13日 11:01 + */ +@Service +@RequiredArgsConstructor +public class DataInHarmRateVServiceImpl implements DataInHarmRateVService { + + private final DataInHarmRateVMapper dataInHarmRateVMapper; + + @Override + public List getNewDataInHarmRateV(String lineIndex, String startTime, String endTime) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataInHarmRateV.class); + influxQueryWrapper.eq(DataInHarmRateV::getLineId, lineIndex) + .between(DataInHarmRateV::getTime, startTime, endTime);; + return dataInHarmRateVMapper.getStatisticsByWraper(influxQueryWrapper); + } +} diff --git a/src/main/java/com/njcn/influx/service/impl/DataPltServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/DataPltServiceImpl.java new file mode 100644 index 0000000..639e538 --- /dev/null +++ b/src/main/java/com/njcn/influx/service/impl/DataPltServiceImpl.java @@ -0,0 +1,29 @@ +package com.njcn.influx.service.impl; + +import com.njcn.influx.imapper.DataPltMapper; +import com.njcn.influx.pojo.po.*; +import com.njcn.influx.query.InfluxQueryWrapper; +import com.njcn.influx.service.DataPltService; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import java.util.List; + +/** + * @author guofeihu + * @version 1.0.0 + * @date 2024年09月13日 11:01 + */ +@Service +@RequiredArgsConstructor +public class DataPltServiceImpl implements DataPltService { + + private final DataPltMapper dataPltMapper; + + @Override + public List getNewDataPlt(String lineIndex, String startTime, String endTime) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataPlt.class); + influxQueryWrapper.eq(DataPlt::getLineId, lineIndex) + .between(DataPlt::getTime, startTime, endTime);; + return dataPltMapper.getStatisticsByWraper(influxQueryWrapper); + } +} diff --git a/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java index 64aefcb..582d914 100644 --- a/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java @@ -61,6 +61,14 @@ public class DataVServiceImpl implements IDataVService { return result1; } + @Override + public List getNewDataV(String lineIndex, String startTime, String endTime) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); + influxQueryWrapper.eq(DataV::getLineId, lineIndex) + .between(DataV::getTime, startTime, endTime);; + return dataVMapper.getStatisticsByWraper(influxQueryWrapper); + } + /*** * 自定义需要查询的谐波次数 diff --git a/src/main/java/com/njcn/influx/service/impl/IDataIServiceImpl.java b/src/main/java/com/njcn/influx/service/impl/IDataIServiceImpl.java index 7a4b041..1ed6ba9 100644 --- a/src/main/java/com/njcn/influx/service/impl/IDataIServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/IDataIServiceImpl.java @@ -37,4 +37,12 @@ public class IDataIServiceImpl implements IDataIService { result1 = dataIMapper.getStatisticsByWraper(influxQueryWrapper); return result1; } + + @Override + public List getNewDataI(String lineIndex, String startTime, String endTime) { + InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataI.class); + influxQueryWrapper.eq(DataI::getLineId, lineIndex) + .between(DataI::getTime, startTime, endTime);; + return dataIMapper.getStatisticsByWraper(influxQueryWrapper); + } }