diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java index 9131c8ceb..f69ced884 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataFlicker.java @@ -20,17 +20,17 @@ import java.time.Instant; public class DataFlicker { @TimeColumn - @Column(name = "time") + @Column(name = "time", tag = true) @JsonSerialize(using = InstantDateSerializer.class) private Instant time; @Column(name = "fluc") private Double fluc; - @Column(name = "line_id") + @Column(name = "line_id", tag = true) private String lineId; - @Column(name = "phasic_type") + @Column(name = "phasic_type", tag = true) private String phaseType; @Column(name = "plt") @@ -39,7 +39,7 @@ public class DataFlicker { @Column(name = "pst") private Double pst; - @Column(name = "quality_flag") + @Column(name = "quality_flag", tag = true) private String qualityFlag; diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java index af1d324a4..ac9ac9262 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataHarmPhasicV.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,20 +20,21 @@ import java.time.Instant; @Measurement(name = "data_harmphasic_v") public class DataHarmPhasicV { - @Column(name = "time") + @TimeColumn + @Column(name = "time", tag = true) @JsonSerialize(using = InstantDateSerializer.class) private Instant time; - @Column(name = "line_id") + @Column(name = "line_id", tag = true) private String lineId; - @Column(name = "phasic_type") + @Column(name = "phasic_type", tag = true) private String phaseType; - @Column(name = "quality_flag") + @Column(name = "quality_flag", tag = true) private String qualityFlag; - @Column(name = "value_type") + @Column(name = "value_type", tag = true) private String valueType; @Column(name = "v_1") diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java index c3c1db8a3..be313633d 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataI.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,20 +20,21 @@ import java.time.Instant; @Measurement(name = "data_i") public class DataI { - @Column(name = "time") + @TimeColumn + @Column(name = "time", tag = true) @JsonSerialize(using = InstantDateSerializer.class) private Instant time; - @Column(name = "line_id") + @Column(name = "line_id", tag = true) private String lineId; - @Column(name = "phasic_type") + @Column(name = "phasic_type", tag = true) private String phaseType; - @Column(name = "quality_flag") + @Column(name = "quality_flag", tag = true) private String qualityFlag; - @Column(name = "value_type") + @Column(name = "value_type", tag = true) private String valueType; @Column(name = "i_neg") diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java index dfc574c73..f1b033e11 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmRateV.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,19 +20,21 @@ import java.time.Instant; @Measurement(name = "data_inharmrate_v") public class DataInHarmRateV { - @Column(name = "time") + @Column(name = "time", tag = true) + @TimeColumn + @JsonSerialize(using = InstantDateSerializer.class) private Instant time; - @Column(name = "line_id") + @Column(name = "line_id", tag = true) private String lineId; - @Column(name = "phasic_type") + @Column(name = "phasic_type", tag = true) private String phaseType; - @Column(name = "quality_flag") + @Column(name = "quality_flag", tag = true) private String qualityFlag; - @Column(name = "value_type") + @Column(name = "value_type", tag = true) private String valueType; @Column(name = "v_1") diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java index 0e22b0630..c2e2f391b 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataInHarmV.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,19 +20,21 @@ import java.time.Instant; @Measurement(name = "data_inharm_v") public class DataInHarmV { - @Column(name = "time") + @Column(name = "time", tag = true) + @TimeColumn + @JsonSerialize(using = InstantDateSerializer.class) private Instant time; - @Column(name = "line_id") + @Column(name = "line_id", tag = true) private String lineId; - @Column(name = "phasic_type") + @Column(name = "phasic_type", tag = true) private String phaseType; - @Column(name = "quality_flag") + @Column(name = "quality_flag", tag = true) private String qualityFlag; - @Column(name = "value_type") + @Column(name = "value_type", tag = true) private String valueType; @Column(name = "v_1") @@ -181,5 +186,5 @@ public class DataInHarmV { @Column(name = "v_50") private Double v50; - + } diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java index 0596d9b13..d7f56a5d9 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataPlt.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,20 +20,21 @@ import java.time.Instant; @Measurement(name = "data_plt") public class DataPlt { - @Column(name = "time") + @TimeColumn + @Column(name = "time", tag = true) @JsonSerialize(using = InstantDateSerializer.class) private Instant time; - @Column(name = "line_id") + @Column(name = "line_id", tag = true) private String lineId; - @Column(name = "phasic_type") + @Column(name = "phasic_type", tag = true) private String phaseType; - @Column(name = "value_type") + @Column(name = "value_type", tag = true) private String valueType; - @Column(name = "quality_flag") + @Column(name = "quality_flag", tag = true) private String qualityFlag; @Column(name = "plt") diff --git a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java index 9cb432fc9..32edcfcdb 100644 --- a/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.java +++ b/pqs-influx/src/main/java/com/njcn/influx/pojo/po/DataV.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; @@ -17,9 +18,10 @@ import java.time.Instant; */ @Data @Measurement(name = "data_v") -public class DataV{ +public class DataV { - @Column(name = "time") + @TimeColumn + @Column(name = "time", tag = true) @JsonSerialize(using = InstantDateSerializer.class) private Instant time; @@ -29,7 +31,7 @@ public class DataV{ @Column(name = "freq_dev") private Double freqDev; - @Column(name = "quality_flag") + @Column(name = "quality_flag", tag = true) private String qualityFlag; @Column(name = "rms") @@ -209,13 +211,13 @@ public class DataV{ @Column(name = "v_zero") private Double vZero; - @Column(name = "line_id") + @Column(name = "line_id", tag = true) private String lineId; - @Column(name = "phasic_type") + @Column(name = "phasic_type", tag = true) private String phasicType; - @Column(name = "value_type") + @Column(name = "value_type", tag = true) private String valueType;