From c5b300abbf0608145d825ce754cbe70fb6818341 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Mon, 25 May 2026 20:00:30 +0800 Subject: [PATCH] =?UTF-8?q?feat(influx):=20=E6=B7=BB=E5=8A=A0=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=AE=9E=E4=BD=93=E7=B1=BB=E7=9A=84=E6=97=B6=E9=97=B4?= =?UTF-8?q?=E5=88=97=E6=B3=A8=E8=A7=A3=E5=92=8C=E6=96=B0=E5=AD=97=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 为多个数据实体类添加 @TimeColumn 注解以标识时间列 - 在多个数据实体类中新增 cl_did 和 process 字段 - 为 PqdData 类添加 quality_flag 字段作为标签 - 更新 DataInHarmRateI 类的时间序列化配置 - 统一数据实体类中的异常标志字段定义 --- .../java/com/njcn/influx/pojo/po/DataFlicker.java | 6 ++++++ src/main/java/com/njcn/influx/pojo/po/DataFluc.java | 9 +++++++++ .../java/com/njcn/influx/pojo/po/DataHarmPhasicI.java | 8 ++++++++ .../java/com/njcn/influx/pojo/po/DataHarmPhasicV.java | 6 ++++++ .../java/com/njcn/influx/pojo/po/DataHarmPowerP.java | 6 ++++++ .../java/com/njcn/influx/pojo/po/DataHarmPowerQ.java | 8 ++++++++ .../java/com/njcn/influx/pojo/po/DataHarmPowerS.java | 8 ++++++++ .../java/com/njcn/influx/pojo/po/DataHarmRateV.java | 6 ++++++ src/main/java/com/njcn/influx/pojo/po/DataI.java | 6 ++++++ .../java/com/njcn/influx/pojo/po/DataInHarmRateI.java | 11 +++++++++++ .../java/com/njcn/influx/pojo/po/DataInHarmRateV.java | 6 ++++++ .../java/com/njcn/influx/pojo/po/DataInHarmV.java | 6 ++++++ src/main/java/com/njcn/influx/pojo/po/DataPlt.java | 6 ++++++ src/main/java/com/njcn/influx/pojo/po/DataV.java | 7 +++++++ src/main/java/com/njcn/influx/pojo/po/cs/PqdData.java | 3 +++ 15 files changed, 102 insertions(+) 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 5bb6008..fd9cf91 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java @@ -58,4 +58,10 @@ public class DataFlicker { //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } 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 8831447..44b1ebc 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataFluc.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataFluc.java @@ -5,6 +5,7 @@ import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; +import org.influxdb.annotation.TimeColumn; import java.time.Instant; @@ -18,6 +19,7 @@ import java.time.Instant; @Measurement(name = "data_fluc") public class DataFluc { + @TimeColumn @Column(name = "time") @JsonSerialize(using = InstantDateSerializer.class) private Instant time; @@ -39,7 +41,14 @@ public class DataFluc { @Column(name = "value_type",tag = true) private String valueType; + //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } 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 b6070d4..d8371b4 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicI.java @@ -5,6 +5,7 @@ import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; +import org.influxdb.annotation.TimeColumn; import java.time.Instant; @@ -18,6 +19,7 @@ import java.time.Instant; @Measurement(name = "data_harmphasic_i") public class DataHarmPhasicI { + @TimeColumn @Column(name = "time") @JsonSerialize(using = InstantDateSerializer.class) private Instant time; @@ -186,4 +188,10 @@ public class DataHarmPhasicI { //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } 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 05f6165..b151691 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java @@ -189,4 +189,10 @@ public class DataHarmPhasicV { //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } 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 078eb5c..7458b6f 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java @@ -199,4 +199,10 @@ public class DataHarmPowerP { //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } 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 fd3b270..1b2f1e7 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java @@ -5,6 +5,7 @@ import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; +import org.influxdb.annotation.TimeColumn; import java.time.Instant; @@ -19,6 +20,7 @@ import java.time.Instant; @Measurement(name = "data_harmpower_q") public class DataHarmPowerQ { + @TimeColumn @Column(name = "time") @JsonSerialize(using = InstantDateSerializer.class) private Instant time; @@ -193,4 +195,10 @@ public class DataHarmPowerQ { @Column(name = "abnormal_flag") private Integer abnormalFlag; + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; + } 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 904d3dc..c6b738a 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java @@ -5,6 +5,7 @@ import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; +import org.influxdb.annotation.TimeColumn; import java.time.Instant; @@ -19,6 +20,7 @@ import java.time.Instant; @Measurement(name = "data_harmpower_s") public class DataHarmPowerS { + @TimeColumn @Column(name = "time") @JsonSerialize(using = InstantDateSerializer.class) private Instant time; @@ -192,4 +194,10 @@ public class DataHarmPowerS { @Column(name = "abnormal_flag") private Integer abnormalFlag; + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; + } diff --git a/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java b/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java index 4eed999..3777544 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmRateV.java @@ -189,4 +189,10 @@ public class DataHarmRateV{ //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } 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 83a2782..a0034dc 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataI.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataI.java @@ -209,4 +209,10 @@ public class DataI { @Column(name = "abnormal_flag") private Integer abnormalFlag; + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; + } 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 472473f..5d694eb 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateI.java @@ -1,8 +1,11 @@ package com.njcn.influx.pojo.po; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.njcn.influx.utils.InstantDateSerializer; import lombok.Data; import org.influxdb.annotation.Column; import org.influxdb.annotation.Measurement; +import org.influxdb.annotation.TimeColumn; import java.time.Instant; @@ -17,7 +20,9 @@ import java.time.Instant; @Measurement(name = "data_inharmrate_i") public class DataInHarmRateI { + @TimeColumn @Column(name = "time") + @JsonSerialize(using = InstantDateSerializer.class) private Instant time; @Column(name = "line_id",tag = true) @@ -185,4 +190,10 @@ public class DataInHarmRateI { @Column(name = "abnormal_flag") private Integer abnormalFlag; + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; + } 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 8ffc45d..39355cb 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java @@ -191,4 +191,10 @@ public class DataInHarmRateV { @Column(name = "abnormal_flag") private Integer abnormalFlag; + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; + } 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 726c0d9..61e8768 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java @@ -189,4 +189,10 @@ public class DataInHarmV { //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } 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 f0acd33..d33af69 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataPlt.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataPlt.java @@ -51,4 +51,10 @@ public class DataPlt { @Column(name = "abnormal_flag") private Integer abnormalFlag; + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; + } 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 90ae044..324e861 100644 --- a/src/main/java/com/njcn/influx/pojo/po/DataV.java +++ b/src/main/java/com/njcn/influx/pojo/po/DataV.java @@ -232,7 +232,14 @@ public class DataV { //自定义字段 @Column(name = "count") private Integer count; + //是否是异常指标数据，0否1是 @Column(name = "abnormal_flag") private Integer abnormalFlag; + + @Column(name = "cl_did") + private String clDid; + + @Column(name = "process") + private String process; } diff --git a/src/main/java/com/njcn/influx/pojo/po/cs/PqdData.java b/src/main/java/com/njcn/influx/pojo/po/cs/PqdData.java index dca3e38..5e5a767 100644 --- a/src/main/java/com/njcn/influx/pojo/po/cs/PqdData.java +++ b/src/main/java/com/njcn/influx/pojo/po/cs/PqdData.java @@ -39,6 +39,9 @@ public class PqdData implements Serializable { @Column(name = "abnormal_flag") private Integer abnormalFlag; + @Column(name = "quality_flag",tag = true) + private String qualityFlag; + @Column(name = "Pq_DF") private Double pq_DF;