From 7f9c079c13d7784475f80e24b799a537c20be023 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Wed, 10 Jul 2024 09:06:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=BC=82=E5=B8=B8=E6=A0=87?= =?UTF-8?q?=E5=BF=97=E5=AD=97=E6=AE=B5=EF=BC=8C=E4=BF=AE=E6=94=B9=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=AD=97=E6=AE=B5=E5=90=8D,=E7=B1=BB=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pom.xml | 1 + .../influx/imapper/{IDataIMapper.java => DataIMapper.java} | 2 +- src/main/java/com/njcn/influx/pojo/po/DataFlicker.java | 4 +++- src/main/java/com/njcn/influx/pojo/po/DataFluc.java | 4 +++- src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java | 4 +++- src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java | 4 +++- src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java | 4 ++++ src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java | 4 ++++ src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java | 4 ++++ src/main/java/com/njcn/influx/pojo/po/DataI.java | 4 ++++ src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java | 3 +++ src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java | 4 ++++ src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java | 4 +++- src/main/java/com/njcn/influx/pojo/po/DataPlt.java | 3 +++ src/main/java/com/njcn/influx/pojo/po/DataV.java | 5 ++++- .../java/com/njcn/influx/service/impl/DataVServiceImpl.java | 4 ++-- .../java/com/njcn/influx/service/impl/IDataIServiceImpl.java | 4 ++-- 17 files changed, 51 insertions(+), 11 deletions(-) rename src/main/java/com/njcn/influx/imapper/{IDataIMapper.java => DataIMapper.java} (92%) diff --git a/pom.xml b/pom.xml index 4621c4c..a1959b4 100644 --- a/pom.xml +++ b/pom.xml @@ -10,6 +10,7 @@ com.njcn pqs-influx + 1.0.0 influx公共模块 pqs-influx diff --git a/src/main/java/com/njcn/influx/imapper/IDataIMapper.java b/src/main/java/com/njcn/influx/imapper/DataIMapper.java similarity index 92% rename from src/main/java/com/njcn/influx/imapper/IDataIMapper.java rename to src/main/java/com/njcn/influx/imapper/DataIMapper.java index 45e9b9f..1038d7c 100644 --- a/src/main/java/com/njcn/influx/imapper/IDataIMapper.java +++ b/src/main/java/com/njcn/influx/imapper/DataIMapper.java @@ -14,7 +14,7 @@ import java.util.List; * @version 1.0.0 * @date 2023年07月17日 11:05 */ -public interface IDataIMapper extends InfluxDbBaseMapper { +public interface DataIMapper extends InfluxDbBaseMapper { DataI getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper); diff --git a/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java b/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java index f69ced8..5bb6008 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java @@ -55,5 +55,7 @@ public class DataFlicker { @Column(name = "plt_count") private Integer pltCount; - + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataFluc.java b/src/main/java/com/njcn/influx/pojo/po/DataFluc.java index 80cee12..8831447 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataFluc.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataFluc.java @@ -39,5 +39,7 @@ public class DataFluc { @Column(name = "value_type",tag = true) private String valueType; - + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java b/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java index e602e87..b6070d4 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java @@ -183,5 +183,7 @@ public class DataHarmPhasicI { @Column(name = "i_50") private Double i50; - + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java b/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java index ac9ac92..05f6165 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java @@ -186,5 +186,7 @@ public class DataHarmPhasicV { @Column(name = "v_50") private Double v50; - + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java index e1dbe53..ef10b59 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java @@ -193,4 +193,8 @@ public class DataHarmPowerP { @Column(name = "p_50") private Double p50; + + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java index 34b7103..fd3b270 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java @@ -189,4 +189,8 @@ public class DataHarmPowerQ { @Column(name = "q_50") private Double q50; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java index 2e0d210..904d3dc 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java @@ -188,4 +188,8 @@ public class DataHarmPowerS { @Column(name = "s_50") private Double s50; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataI.java b/src/main/java/com/njcn/influx/pojo/po/DataI.java index be31363..83a2782 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataI.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataI.java @@ -205,4 +205,8 @@ public class DataI { @Column(name = "i_50") private Double i50; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java b/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java index b901d71..472473f 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java @@ -181,5 +181,8 @@ public class DataInHarmRateI { @Column(name = "i_50") private Double i50; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java b/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java index f1b033e..8ffc45d 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java @@ -187,4 +187,8 @@ public class DataInHarmRateV { @Column(name = "v_50") private Double v50; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; + } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java b/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java index c2e2f39..726c0d9 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java @@ -186,5 +186,7 @@ public class DataInHarmV { @Column(name = "v_50") private Double v50; - + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataPlt.java b/src/main/java/com/njcn/influx/pojo/po/DataPlt.java index d7f56a5..f0acd33 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataPlt.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataPlt.java @@ -47,5 +47,8 @@ public class DataPlt { //自定义字段 @Column(name = "mean") private Double mean; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataV.java b/src/main/java/com/njcn/influx/pojo/po/DataV.java index 32edcfc..90ae044 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataV.java @@ -215,7 +215,7 @@ public class DataV { private String lineId; @Column(name = "phasic_type", tag = true) - private String phasicType; + private String phaseType; @Column(name = "value_type", tag = true) private String valueType; @@ -232,4 +232,7 @@ public class DataV { //自定义字段 @Column(name = "count") private Integer count; + //是否是异常指标数据，0否1是 + @Column(name = "abnormal_flag") + private Integer abnormalFlag; } 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 35ec33f..64aefcb 100644 --- a/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/DataVServiceImpl.java @@ -42,7 +42,7 @@ public class DataVServiceImpl implements IDataVService { .min(DataV::getVZero) .min(DataV::getVlDev) .min(DataV::getVuDev) - .groupBy(DataV::getLineId,DataV::getPhasicType,DataV::getQualityFlag,DataV::getValueType) + .groupBy(DataV::getLineId,DataV::getPhaseType,DataV::getQualityFlag,DataV::getValueType) .between(DataV::getTime, startTime, endTime); result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper); System.out.println("result1==:" + result1); @@ -55,7 +55,7 @@ public class DataVServiceImpl implements IDataVService { InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataV.class); influxQueryWrapper.eq(DataV::getLineId, lineIndex) .eq(DataV::getValueType, "CP95") - .ne(DataV::getPhasicType, "T") + .ne(DataV::getPhaseType, "T") .between(DataV::getTime, startTime, endTime);; result1 = dataVMapper.getStatisticsByWraper(influxQueryWrapper); return result1; 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 bbdf846..7a4b041 100644 --- a/src/main/java/com/njcn/influx/service/impl/IDataIServiceImpl.java +++ b/src/main/java/com/njcn/influx/service/impl/IDataIServiceImpl.java @@ -1,6 +1,6 @@ package com.njcn.influx.service.impl; -import com.njcn.influx.imapper.IDataIMapper; +import com.njcn.influx.imapper.DataIMapper; import com.njcn.influx.pojo.po.DataI; import com.njcn.influx.query.InfluxQueryWrapper; import com.njcn.influx.service.IDataIService; @@ -18,7 +18,7 @@ import java.util.List; @RequiredArgsConstructor public class IDataIServiceImpl implements IDataIService { - private final IDataIMapper dataIMapper; + private final DataIMapper dataIMapper; @Override public DataI getMeanAllTimesData(InfluxQueryWrapper influxQueryWrapper) {