实体调整

- 在 CommonService 中新增 getDianDuData 方法接口
- 实现电度增量数据查询的具体逻辑
- 添加对多个查询参数的循环处理支持
- 集成 InfluxDB 差值计算功能
- 处理查询结果的数据转换和格式化
- 添加对空集合的安全检查和处理

src/main/java/com/njcn/influx/imapper/ApfDataMapper.java

@@ -0,0 +1,14 @@
+package com.njcn.influx.imapper;
+
+import com.njcn.influx.base.InfluxDbBaseMapper;
+import com.njcn.influx.pojo.po.cs.ApfData;
+
+/**
+ * @author hongawen
+ * @version 1.0.0
+ * @date 2023年07月17日 11:05
+ */
+public interface ApfDataMapper extends InfluxDbBaseMapper<ApfData> {
+
+
+}

src/main/java/com/njcn/influx/pojo/bo/CommonQueryParam.java

@@ -14,6 +14,7 @@ public class CommonQueryParam {
     private String lineId;
     private String tableName;
     private String columnName;
+    private String resultName;
     private String phasic;
     private String startTime;
     private String endTime;

src/main/java/com/njcn/influx/pojo/constant/InfluxDBTableConstant.java

@@ -196,5 +196,8 @@ public interface InfluxDBTableConstant {
     String NORMAL = "0";
     String UN_NORMAL = "1";
 
-
+    /**
+     * 数据清洗标志 0:正常 1:异常
+     */
+    String ABNORMAL_FLAG = "abnormal_flag";
 }

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;
 }

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;
 }

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;
 }

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;
 }

src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java

@@ -199,4 +199,19 @@ 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;
+
+    @Column(name = "tot_dpf")
+    private Double totDpf;
+
+    @Column(name = "tot_harm_p")
+    private Double totHarmP;
+
+    @Column(name = "dpf")
+    private Double dpf;
 }

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,13 @@ public class DataHarmPowerQ {
     @Column(name = "abnormal_flag")
     private Integer abnormalFlag;
 
+    @Column(name = "cl_did")
+    private String clDid;
+
+    @Column(name = "process")
+    private String process;
+
+    @Column(name = "tot_harm_q")
+    private Double totHarmQ;
+
 }

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,13 @@ public class DataHarmPowerS {
     @Column(name = "abnormal_flag")
     private Integer abnormalFlag;
 
+    @Column(name = "cl_did")
+    private String clDid;
+
+    @Column(name = "process")
+    private String process;
+
+    @Column(name = "tot_harm_s")
+    private Double totHarmS;
+
 }

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;
 }

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;
+
 }

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;
+
 }

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;
+
 }

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;
 }

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;
+
 }

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;
 }

src/main/java/com/njcn/influx/pojo/po/cs/ApfData.java

@@ -0,0 +1,686 @@
+package com.njcn.influx.pojo.po.cs;
+
+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.io.Serializable;
+import java.time.Instant;
+
+/**
+ *  *
+ * @author xy
+ * 部分字段，后续有需要自行添加字段
+ * @version V1.0.0
+ */
+@Data
+@Measurement(name = "apf_data")
+public class ApfData implements Serializable {
+
+    @TimeColumn
+    @Column(name = "time",tag = true)
+    @JsonSerialize(using = InstantDateSerializer.class)
+    private Instant time;
+
+    @Column(name = "line_id",tag = true)
+    private String lineId;
+
+    @Column(name = "phasic_type",tag = true)
+    private String phaseType;
+
+    @Column(name = "quality_flag",tag = true)
+    private String qualityFlag;
+
+    @Column(name = "value_type",tag = true)
+    private String valueType;
+
+    @Column(name = "cl_did")
+    private String clDid;
+
+    @Column(name = "process")
+    private String process;
+
+    @Column(name = "Apf_Freq")
+    private Double apfFreq;
+
+    @Column(name = "Apf_RmsI_TolOut")
+    private Double apfRmsITolOut;
+
+    @Column(name = "Apf_RmsI_Sys")
+    private Double apfRmsISys;
+
+    @Column(name = "Apf_ThdA_Sys")
+    private Double apfThdASys;
+
+    @Column(name = "Apf_PhV_Sys")
+    private Double apfPhVSys;
+
+    @Column(name = "Apf_ThdU_Sys")
+    private Double apfThdUSys;
+
+    @Column(name = "Apf_RmsI_Load")
+    private Double apfRmsILoad;
+
+    @Column(name = "Apf_ThdA_Load")
+    private Double apfThdALoad;
+
+    @Column(name = "Apf_P_Load")
+    private Double apfPLoad;
+
+    @Column(name = "Apf_P_Sys")
+    private Double apfPSys;
+
+    @Column(name = "Apf_Q_Load")
+    private Double apfQLoad;
+
+    @Column(name = "Apf_Q_Sys")
+    private Double apfQSys;
+
+    @Column(name = "Apf_S_Load")
+    private Double apfSLoad;
+
+    @Column(name = "Apf_S_Sys")
+    private Double apfSSys;
+
+    @Column(name = "Apf_PF_Load")
+    private Double apfPFLoad;
+
+    @Column(name = "Apf_PF_Sys")
+    private Double apfPFSys;
+
+    @Column(name = "Apf_HarmI_Sys_2")
+    private Double apfHarmISys2;
+
+    @Column(name = "Apf_HarmI_Sys_3")
+    private Double apfHarmISys3;
+
+    @Column(name = "Apf_HarmI_Sys_4")
+    private Double apfHarmISys4;
+
+    @Column(name = "Apf_HarmI_Sys_5")
+    private Double apfHarmISys5;
+
+    @Column(name = "Apf_HarmI_Sys_6")
+    private Double apfHarmISys6;
+
+    @Column(name = "Apf_HarmI_Sys_7")
+    private Double apfHarmISys7;
+
+    @Column(name = "Apf_HarmI_Sys_8")
+    private Double apfHarmISys8;
+
+    @Column(name = "Apf_HarmI_Sys_9")
+    private Double apfHarmISys9;
+
+    @Column(name = "Apf_HarmI_Sys_10")
+    private Double apfHarmISys10;
+
+    @Column(name = "Apf_HarmI_Sys_11")
+    private Double apfHarmISys11;
+
+    @Column(name = "Apf_HarmI_Sys_12")
+    private Double apfHarmISys12;
+
+    @Column(name = "Apf_HarmI_Sys_13")
+    private Double apfHarmISys13;
+
+    @Column(name = "Apf_HarmI_Sys_14")
+    private Double apfHarmISys14;
+
+    @Column(name = "Apf_HarmI_Sys_15")
+    private Double apfHarmISys15;
+
+    @Column(name = "Apf_HarmI_Sys_16")
+    private Double apfHarmISys16;
+
+    @Column(name = "Apf_HarmI_Sys_17")
+    private Double apfHarmISys17;
+
+    @Column(name = "Apf_HarmI_Sys_18")
+    private Double apfHarmISys18;
+
+    @Column(name = "Apf_HarmI_Sys_19")
+    private Double apfHarmISys19;
+
+    @Column(name = "Apf_HarmI_Sys_20")
+    private Double apfHarmISys20;
+
+    @Column(name = "Apf_HarmI_Sys_21")
+    private Double apfHarmISys21;
+
+    @Column(name = "Apf_HarmI_Sys_22")
+    private Double apfHarmISys22;
+
+    @Column(name = "Apf_HarmI_Sys_23")
+    private Double apfHarmISys23;
+
+    @Column(name = "Apf_HarmI_Sys_24")
+    private Double apfHarmISys24;
+
+    @Column(name = "Apf_HarmI_Sys_25")
+    private Double apfHarmISys25;
+
+    @Column(name = "Apf_HarmI_Sys_26")
+    private Double apfHarmISys26;
+
+    @Column(name = "Apf_HarmI_Sys_27")
+    private Double apfHarmISys27;
+
+    @Column(name = "Apf_HarmI_Sys_28")
+    private Double apfHarmISys28;
+
+    @Column(name = "Apf_HarmI_Sys_29")
+    private Double apfHarmISys29;
+
+    @Column(name = "Apf_HarmI_Sys_30")
+    private Double apfHarmISys30;
+
+    @Column(name = "Apf_HarmI_Sys_31")
+    private Double apfHarmISys31;
+
+    @Column(name = "Apf_HarmI_Sys_32")
+    private Double apfHarmISys32;
+
+    @Column(name = "Apf_HarmI_Sys_33")
+    private Double apfHarmISys33;
+
+    @Column(name = "Apf_HarmI_Sys_34")
+    private Double apfHarmISys34;
+
+    @Column(name = "Apf_HarmI_Sys_35")
+    private Double apfHarmISys35;
+
+    @Column(name = "Apf_HarmI_Sys_36")
+    private Double apfHarmISys36;
+
+    @Column(name = "Apf_HarmI_Sys_37")
+    private Double apfHarmISys37;
+
+    @Column(name = "Apf_HarmI_Sys_38")
+    private Double apfHarmISys38;
+
+    @Column(name = "Apf_HarmI_Sys_39")
+    private Double apfHarmISys39;
+
+    @Column(name = "Apf_HarmI_Sys_40")
+    private Double apfHarmISys40;
+
+    @Column(name = "Apf_HarmI_Sys_41")
+    private Double apfHarmISys41;
+
+    @Column(name = "Apf_HarmI_Sys_42")
+    private Double apfHarmISys42;
+
+    @Column(name = "Apf_HarmI_Sys_43")
+    private Double apfHarmISys43;
+
+    @Column(name = "Apf_HarmI_Sys_44")
+    private Double apfHarmISys44;
+
+    @Column(name = "Apf_HarmI_Sys_45")
+    private Double apfHarmISys45;
+
+    @Column(name = "Apf_HarmI_Sys_46")
+    private Double apfHarmISys46;
+
+    @Column(name = "Apf_HarmI_Sys_47")
+    private Double apfHarmISys47;
+
+    @Column(name = "Apf_HarmI_Sys_48")
+    private Double apfHarmISys48;
+
+    @Column(name = "Apf_HarmI_Sys_49")
+    private Double apfHarmISys49;
+
+    @Column(name = "Apf_HarmI_Sys_50")
+    private Double apfHarmISys50;
+
+    @Column(name = "Apf_HarmI_Load_2")
+    private Double apfHarmILoad2;
+
+    @Column(name = "Apf_HarmI_Load_3")
+    private Double apfHarmILoad3;
+
+    @Column(name = "Apf_HarmI_Load_4")
+    private Double apfHarmILoad4;
+
+    @Column(name = "Apf_HarmI_Load_5")
+    private Double apfHarmILoad5;
+
+    @Column(name = "Apf_HarmI_Load_6")
+    private Double apfHarmILoad6;
+
+    @Column(name = "Apf_HarmI_Load_7")
+    private Double apfHarmILoad7;
+
+    @Column(name = "Apf_HarmI_Load_8")
+    private Double apfHarmILoad8;
+
+    @Column(name = "Apf_HarmI_Load_9")
+    private Double apfHarmILoad9;
+
+    @Column(name = "Apf_HarmI_Load_10")
+    private Double apfHarmILoad10;
+
+    @Column(name = "Apf_HarmI_Load_11")
+    private Double apfHarmILoad11;
+
+    @Column(name = "Apf_HarmI_Load_12")
+    private Double apfHarmILoad12;
+
+    @Column(name = "Apf_HarmI_Load_13")
+    private Double apfHarmILoad13;
+
+    @Column(name = "Apf_HarmI_Load_14")
+    private Double apfHarmILoad14;
+
+    @Column(name = "Apf_HarmI_Load_15")
+    private Double apfHarmILoad15;
+
+    @Column(name = "Apf_HarmI_Load_16")
+    private Double apfHarmILoad16;
+
+    @Column(name = "Apf_HarmI_Load_17")
+    private Double apfHarmILoad17;
+
+    @Column(name = "Apf_HarmI_Load_18")
+    private Double apfHarmILoad18;
+
+    @Column(name = "Apf_HarmI_Load_19")
+    private Double apfHarmILoad19;
+
+    @Column(name = "Apf_HarmI_Load_20")
+    private Double apfHarmILoad20;
+
+    @Column(name = "Apf_HarmI_Load_21")
+    private Double apfHarmILoad21;
+
+    @Column(name = "Apf_HarmI_Load_22")
+    private Double apfHarmILoad22;
+
+    @Column(name = "Apf_HarmI_Load_23")
+    private Double apfHarmILoad23;
+
+    @Column(name = "Apf_HarmI_Load_24")
+    private Double apfHarmILoad24;
+
+    @Column(name = "Apf_HarmI_Load_25")
+    private Double apfHarmILoad25;
+
+    @Column(name = "Apf_HarmI_Load_26")
+    private Double apfHarmILoad26;
+
+    @Column(name = "Apf_HarmI_Load_27")
+    private Double apfHarmILoad27;
+
+    @Column(name = "Apf_HarmI_Load_28")
+    private Double apfHarmILoad28;
+
+    @Column(name = "Apf_HarmI_Load_29")
+    private Double apfHarmILoad29;
+
+    @Column(name = "Apf_HarmI_Load_30")
+    private Double apfHarmILoad30;
+
+    @Column(name = "Apf_HarmI_Load_31")
+    private Double apfHarmILoad31;
+
+    @Column(name = "Apf_HarmI_Load_32")
+    private Double apfHarmILoad32;
+
+    @Column(name = "Apf_HarmI_Load_33")
+    private Double apfHarmILoad33;
+
+    @Column(name = "Apf_HarmI_Load_34")
+    private Double apfHarmILoad34;
+
+    @Column(name = "Apf_HarmI_Load_35")
+    private Double apfHarmILoad35;
+
+    @Column(name = "Apf_HarmI_Load_36")
+    private Double apfHarmILoad36;
+
+    @Column(name = "Apf_HarmI_Load_37")
+    private Double apfHarmILoad37;
+
+    @Column(name = "Apf_HarmI_Load_38")
+    private Double apfHarmILoad38;
+
+    @Column(name = "Apf_HarmI_Load_39")
+    private Double apfHarmILoad39;
+
+    @Column(name = "Apf_HarmI_Load_40")
+    private Double apfHarmILoad40;
+
+    @Column(name = "Apf_HarmI_Load_41")
+    private Double apfHarmILoad41;
+
+    @Column(name = "Apf_HarmI_Load_42")
+    private Double apfHarmILoad42;
+
+    @Column(name = "Apf_HarmI_Load_43")
+    private Double apfHarmILoad43;
+
+    @Column(name = "Apf_HarmI_Load_44")
+    private Double apfHarmILoad44;
+
+    @Column(name = "Apf_HarmI_Load_45")
+    private Double apfHarmILoad45;
+
+    @Column(name = "Apf_HarmI_Load_46")
+    private Double apfHarmILoad46;
+
+    @Column(name = "Apf_HarmI_Load_47")
+    private Double apfHarmILoad47;
+
+    @Column(name = "Apf_HarmI_Load_48")
+    private Double apfHarmILoad48;
+
+    @Column(name = "Apf_HarmI_Load_49")
+    private Double apfHarmILoad49;
+
+    @Column(name = "Apf_HarmI_Load_50")
+    private Double apfHarmILoad50;
+
+    @Column(name = "Apf_HarmUR_Sys_2")
+    private Double apfHarmURSys2;
+
+    @Column(name = "Apf_HarmUR_Sys_3")
+    private Double apfHarmURSys3;
+
+    @Column(name = "Apf_HarmUR_Sys_4")
+    private Double apfHarmURSys4;
+
+    @Column(name = "Apf_HarmUR_Sys_5")
+    private Double apfHarmURSys5;
+
+    @Column(name = "Apf_HarmUR_Sys_6")
+    private Double apfHarmURSys6;
+
+    @Column(name = "Apf_HarmUR_Sys_7")
+    private Double apfHarmURSys7;
+
+    @Column(name = "Apf_HarmUR_Sys_8")
+    private Double apfHarmURSys8;
+
+    @Column(name = "Apf_HarmUR_Sys_9")
+    private Double apfHarmURSys9;
+
+    @Column(name = "Apf_HarmUR_Sys_10")
+    private Double apfHarmURSys10;
+
+    @Column(name = "Apf_HarmUR_Sys_11")
+    private Double apfHarmURSys11;
+
+    @Column(name = "Apf_HarmUR_Sys_12")
+    private Double apfHarmURSys12;
+
+    @Column(name = "Apf_HarmUR_Sys_13")
+    private Double apfHarmURSys13;
+
+    @Column(name = "Apf_HarmUR_Sys_14")
+    private Double apfHarmURSys14;
+
+    @Column(name = "Apf_HarmUR_Sys_15")
+    private Double apfHarmURSys15;
+
+    @Column(name = "Apf_HarmUR_Sys_16")
+    private Double apfHarmURSys16;
+
+    @Column(name = "Apf_HarmUR_Sys_17")
+    private Double apfHarmURSys17;
+
+    @Column(name = "Apf_HarmUR_Sys_18")
+    private Double apfHarmURSys18;
+
+    @Column(name = "Apf_HarmUR_Sys_19")
+    private Double apfHarmURSys19;
+
+    @Column(name = "Apf_HarmUR_Sys_20")
+    private Double apfHarmURSys20;
+
+    @Column(name = "Apf_HarmUR_Sys_21")
+    private Double apfHarmURSys21;
+
+    @Column(name = "Apf_HarmUR_Sys_22")
+    private Double apfHarmURSys22;
+
+    @Column(name = "Apf_HarmUR_Sys_23")
+    private Double apfHarmURSys23;
+
+    @Column(name = "Apf_HarmUR_Sys_24")
+    private Double apfHarmURSys24;
+
+    @Column(name = "Apf_HarmUR_Sys_25")
+    private Double apfHarmURSys25;
+
+    @Column(name = "Apf_HarmUR_Sys_26")
+    private Double apfHarmURSys26;
+
+    @Column(name = "Apf_HarmUR_Sys_27")
+    private Double apfHarmURSys27;
+
+    @Column(name = "Apf_HarmUR_Sys_28")
+    private Double apfHarmURSys28;
+
+    @Column(name = "Apf_HarmUR_Sys_29")
+    private Double apfHarmURSys29;
+
+    @Column(name = "Apf_HarmUR_Sys_30")
+    private Double apfHarmURSys30;
+
+    @Column(name = "Apf_HarmUR_Sys_31")
+    private Double apfHarmURSys31;
+
+    @Column(name = "Apf_HarmUR_Sys_32")
+    private Double apfHarmURSys32;
+
+    @Column(name = "Apf_HarmUR_Sys_33")
+    private Double apfHarmURSys33;
+
+    @Column(name = "Apf_HarmUR_Sys_34")
+    private Double apfHarmURSys34;
+
+    @Column(name = "Apf_HarmUR_Sys_35")
+    private Double apfHarmURSys35;
+
+    @Column(name = "Apf_HarmUR_Sys_36")
+    private Double apfHarmURSys36;
+
+    @Column(name = "Apf_HarmUR_Sys_37")
+    private Double apfHarmURSys37;
+
+    @Column(name = "Apf_HarmUR_Sys_38")
+    private Double apfHarmURSys38;
+
+    @Column(name = "Apf_HarmUR_Sys_39")
+    private Double apfHarmURSys39;
+
+    @Column(name = "Apf_HarmUR_Sys_40")
+    private Double apfHarmURSys40;
+
+    @Column(name = "Apf_HarmUR_Sys_41")
+    private Double apfHarmURSys41;
+
+    @Column(name = "Apf_HarmUR_Sys_42")
+    private Double apfHarmURSys42;
+
+    @Column(name = "Apf_HarmUR_Sys_43")
+    private Double apfHarmURSys43;
+
+    @Column(name = "Apf_HarmUR_Sys_44")
+    private Double apfHarmURSys44;
+
+    @Column(name = "Apf_HarmUR_Sys_45")
+    private Double apfHarmURSys45;
+
+    @Column(name = "Apf_HarmUR_Sys_46")
+    private Double apfHarmURSys46;
+
+    @Column(name = "Apf_HarmUR_Sys_47")
+    private Double apfHarmURSys47;
+
+    @Column(name = "Apf_HarmUR_Sys_48")
+    private Double apfHarmURSys48;
+
+    @Column(name = "Apf_HarmUR_Sys_49")
+    private Double apfHarmURSys49;
+
+    @Column(name = "Apf_HarmUR_Sys_50")
+    private Double apfHarmURSys50;
+
+    @Column(name = "Apf_HarmUR_Load_2")
+    private Double apfHarmURLoad2;
+
+    @Column(name = "Apf_HarmUR_Load_3")
+    private Double apfHarmURLoad3;
+
+    @Column(name = "Apf_HarmUR_Load_4")
+    private Double apfHarmURLoad4;
+
+    @Column(name = "Apf_HarmUR_Load_5")
+    private Double apfHarmURLoad5;
+
+    @Column(name = "Apf_HarmUR_Load_6")
+    private Double apfHarmURLoad6;
+
+    @Column(name = "Apf_HarmUR_Load_7")
+    private Double apfHarmURLoad7;
+
+    @Column(name = "Apf_HarmUR_Load_8")
+    private Double apfHarmURLoad8;
+
+    @Column(name = "Apf_HarmUR_Load_9")
+    private Double apfHarmURLoad9;
+
+    @Column(name = "Apf_HarmUR_Load_10")
+    private Double apfHarmURLoad10;
+
+    @Column(name = "Apf_HarmUR_Load_11")
+    private Double apfHarmURLoad11;
+
+    @Column(name = "Apf_HarmUR_Load_12")
+    private Double apfHarmURLoad12;
+
+    @Column(name = "Apf_HarmUR_Load_13")
+    private Double apfHarmURLoad13;
+
+    @Column(name = "Apf_HarmUR_Load_14")
+    private Double apfHarmURLoad14;
+
+    @Column(name = "Apf_HarmUR_Load_15")
+    private Double apfHarmURLoad15;
+
+    @Column(name = "Apf_HarmUR_Load_16")
+    private Double apfHarmURLoad16;
+
+    @Column(name = "Apf_HarmUR_Load_17")
+    private Double apfHarmURLoad17;
+
+    @Column(name = "Apf_HarmUR_Load_18")
+    private Double apfHarmURLoad18;
+
+    @Column(name = "Apf_HarmUR_Load_19")
+    private Double apfHarmURLoad19;
+
+    @Column(name = "Apf_HarmUR_Load_20")
+    private Double apfHarmURLoad20;
+
+    @Column(name = "Apf_HarmUR_Load_21")
+    private Double apfHarmURLoad21;
+
+    @Column(name = "Apf_HarmUR_Load_22")
+    private Double apfHarmURLoad22;
+
+    @Column(name = "Apf_HarmUR_Load_23")
+    private Double apfHarmURLoad23;
+
+    @Column(name = "Apf_HarmUR_Load_24")
+    private Double apfHarmURLoad24;
+
+    @Column(name = "Apf_HarmUR_Load_25")
+    private Double apfHarmURLoad25;
+
+    @Column(name = "Apf_HarmUR_Load_26")
+    private Double apfHarmURLoad26;
+
+    @Column(name = "Apf_HarmUR_Load_27")
+    private Double apfHarmURLoad27;
+
+    @Column(name = "Apf_HarmUR_Load_28")
+    private Double apfHarmURLoad28;
+
+    @Column(name = "Apf_HarmUR_Load_29")
+    private Double apfHarmURLoad29;
+
+    @Column(name = "Apf_HarmUR_Load_30")
+    private Double apfHarmURLoad30;
+
+    @Column(name = "Apf_HarmUR_Load_31")
+    private Double apfHarmURLoad31;
+
+    @Column(name = "Apf_HarmUR_Load_32")
+    private Double apfHarmURLoad32;
+
+    @Column(name = "Apf_HarmUR_Load_33")
+    private Double apfHarmURLoad33;
+
+    @Column(name = "Apf_HarmUR_Load_34")
+    private Double apfHarmURLoad34;
+
+    @Column(name = "Apf_HarmUR_Load_35")
+    private Double apfHarmURLoad35;
+
+    @Column(name = "Apf_HarmUR_Load_36")
+    private Double apfHarmURLoad36;
+
+    @Column(name = "Apf_HarmUR_Load_37")
+    private Double apfHarmURLoad37;
+
+    @Column(name = "Apf_HarmUR_Load_38")
+    private Double apfHarmURLoad38;
+
+    @Column(name = "Apf_HarmUR_Load_39")
+    private Double apfHarmURLoad39;
+
+    @Column(name = "Apf_HarmUR_Load_40")
+    private Double apfHarmURLoad40;
+
+    @Column(name = "Apf_HarmUR_Load_41")
+    private Double apfHarmURLoad41;
+
+    @Column(name = "Apf_HarmUR_Load_42")
+    private Double apfHarmURLoad42;
+
+    @Column(name = "Apf_HarmUR_Load_43")
+    private Double apfHarmURLoad43;
+
+    @Column(name = "Apf_HarmUR_Load_44")
+    private Double apfHarmURLoad44;
+
+    @Column(name = "Apf_HarmUR_Load_45")
+    private Double apfHarmURLoad45;
+
+    @Column(name = "Apf_HarmUR_Load_46")
+    private Double apfHarmURLoad46;
+
+    @Column(name = "Apf_HarmUR_Load_47")
+    private Double apfHarmURLoad47;
+
+    @Column(name = "Apf_HarmUR_Load_48")
+    private Double apfHarmURLoad48;
+
+    @Column(name = "Apf_HarmUR_Load_49")
+    private Double apfHarmURLoad49;
+
+    @Column(name = "Apf_HarmUR_Load_50")
+    private Double apfHarmURLoad50;
+
+}
+
+
+
+

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;

src/main/java/com/njcn/influx/service/CommonService.java

@@ -84,5 +84,16 @@ public interface CommonService {
      */
     StatisticalDataDTO getCounts(String lineId, String tableName, String columnName,String resultName, String phasic, String dataType, String clDid, String process,String startTime, String endTime);
 
+    List<StatisticalDataDTO> getEachModule(CommonQueryParam param);
 
+    StatisticalDataDTO getDataCounts(String lineId, String tableName, String columnName,String resultName, String phasic, String dataType, String clDid, String process,String startTime, String endTime);
+
+    List<StatisticalDataDTO> getModuleData(CommonQueryParam param);
+
+    /**
+     * 电度增量数据查询
+     * @param commonQueryParams
+     * @return
+     */
+    List<StatisticalDataDTO> getDianDuData(List<CommonQueryParam> commonQueryParams);
 }

src/main/java/com/njcn/influx/service/impl/CommonServiceImpl.java

@@ -1,5 +1,7 @@
 package com.njcn.influx.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.date.DatePattern;
 import com.njcn.influx.imapper.CommonMapper;
 import com.njcn.influx.pojo.bo.CommonQueryParam;
 import com.njcn.influx.pojo.constant.InfluxDBTableConstant;
@@ -9,6 +11,8 @@ import com.njcn.influx.service.CommonService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 
+import java.time.LocalDateTime;
+import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -32,6 +36,7 @@ public class CommonServiceImpl implements CommonService {
                 .select(StatisticalDataDTO::getPhaseType)
                 .select(StatisticalDataDTO::getValueType)
                 .last(columnName)
+                .le(InfluxDBTableConstant.TIME, LocalDateTime.now().format(DateTimeFormatter.ofPattern(DatePattern.NORM_DATETIME_PATTERN)))
                 .eq(InfluxDBTableConstant.LINE_ID,lineId)
                 .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic)
                 .eq(InfluxDBTableConstant.VALUE_TYPE,dataType)
@@ -70,9 +75,14 @@ public class CommonServiceImpl implements CommonService {
                     .select(commonQueryParam.getColumnName(), InfluxDBTableConstant.VALUE)
                     .eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId())
                     .eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic())
-                    .eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess())
                     .between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime())
-                    .eq(InfluxDBTableConstant.VALUE_TYPE, commonQueryParam.getDataType()).eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid());
+                    .eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid());
+            if (commonQueryParam.getDataType() != null) {
+                influxQueryWrapper.eq(InfluxDBTableConstant.VALUE_TYPE, commonQueryParam.getDataType());
+            }
+            if (commonQueryParam.getProcess() != null) {
+                influxQueryWrapper.eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess());
+            }
             List<StatisticalDataDTO> deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
             resultList.addAll(deviceRtData);
         }
@@ -141,7 +151,7 @@ public class CommonServiceImpl implements CommonService {
                 .select(StatisticalDataDTO::getClDid)
                 .last(columnName,InfluxDBTableConstant.VALUE)
                 .eq(InfluxDBTableConstant.LINE_ID,lineId)
-                .eq(InfluxDBTableConstant.PHASIC_TYPE, "M")
+                .eq(InfluxDBTableConstant.PHASIC_TYPE, "T")
                 .eq(InfluxDBTableConstant.PROCESS,process)
                 .groupBy(InfluxDBTableConstant.CL_DID);
         return commonMapper.getTopTemperature(influxQueryWrapper);
@@ -157,9 +167,80 @@ public class CommonServiceImpl implements CommonService {
                 .eq(InfluxDBTableConstant.VALUE_TYPE,dataType)
                 .eq(InfluxDBTableConstant.CL_DID,clDid)
                 .eq(InfluxDBTableConstant.PROCESS,process)
-                .between(InfluxDBTableConstant.TIME, startTime, endTime);;
+                .between(InfluxDBTableConstant.TIME, startTime, endTime);
         return commonMapper.getLineRtData(influxQueryWrapper);
     }
 
+    @Override
+    public List<StatisticalDataDTO> getEachModule(CommonQueryParam param) {
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(param.getTableName(),StatisticalDataDTO.class);
+        influxQueryWrapper.select(param.getColumnName(),param.getResultName())
+                .between(InfluxDBTableConstant.TIME, param.getStartTime(), param.getEndTime())
+                .eq(InfluxDBTableConstant.LINE_ID,param.getLineId())
+                .eq(InfluxDBTableConstant.PHASIC_TYPE, "T")
+                .eq(InfluxDBTableConstant.VALUE_TYPE,"AVG")
+                .eq(param.getDataType(),0)
+                .eq(InfluxDBTableConstant.PROCESS,param.getProcess())
+                .eq(InfluxDBTableConstant.CL_DID,param.getClDid());
+        return commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
+    }
 
+    @Override
+    public StatisticalDataDTO getDataCounts(String lineId, String tableName, String columnName, String resultName, String phasic, String dataType, String clDid, String process, String startTime, String endTime) {
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(tableName,StatisticalDataDTO.class);
+        influxQueryWrapper.count(columnName,resultName)
+                .eq(InfluxDBTableConstant.LINE_ID,lineId)
+                .eq(InfluxDBTableConstant.PHASIC_TYPE,phasic)
+                .eq(InfluxDBTableConstant.VALUE_TYPE,dataType)
+                .eq(InfluxDBTableConstant.CL_DID,clDid)
+                .eq(InfluxDBTableConstant.PROCESS,process)
+                .between(InfluxDBTableConstant.TIME, startTime, endTime);
+        return commonMapper.getLineRtData(influxQueryWrapper);
+    }
+
+    @Override
+    public List<StatisticalDataDTO> getModuleData(CommonQueryParam param) {
+        InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(param.getTableName(),StatisticalDataDTO.class);
+        influxQueryWrapper
+                .select(StatisticalDataDTO::getLineId)
+                .select(StatisticalDataDTO::getPhaseType)
+                .select("Apf_RmsI_ModOut","value")
+                .select("Apf_RmsI_Load","avgValue")
+                .select("Apf_Temp_Env","minValue")
+                .between(InfluxDBTableConstant.TIME, param.getStartTime(), param.getEndTime())
+                .eq(InfluxDBTableConstant.LINE_ID,param.getLineId())
+                .eq(InfluxDBTableConstant.VALUE_TYPE,"avg")
+                .eq(InfluxDBTableConstant.PROCESS,param.getProcess())
+                .eq(InfluxDBTableConstant.CL_DID,param.getClDid());
+        return commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
+    }
+
+    @Override
+    public List<StatisticalDataDTO> getDianDuData(List<CommonQueryParam> commonQueryParams) {
+        List<StatisticalDataDTO> resultList = new ArrayList<>();
+        for (CommonQueryParam commonQueryParam: commonQueryParams) {
+            InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(commonQueryParam.getTableName(), StatisticalDataDTO.class);
+            influxQueryWrapper.difference(commonQueryParam.getColumnName())
+                    .eq(InfluxDBTableConstant.LINE_ID, commonQueryParam.getLineId())
+                    .eq(InfluxDBTableConstant.PHASIC_TYPE, commonQueryParam.getPhasic())
+                    .between(InfluxDBTableConstant.TIME, commonQueryParam.getStartTime(), commonQueryParam.getEndTime())
+                    .eq(InfluxDBTableConstant.CL_DID, commonQueryParam.getClDid());
+            if (commonQueryParam.getDataType() != null) {
+                influxQueryWrapper.eq(InfluxDBTableConstant.VALUE_TYPE, commonQueryParam.getDataType());
+            }
+            if (commonQueryParam.getProcess() != null) {
+                influxQueryWrapper.eq(InfluxDBTableConstant.PROCESS, commonQueryParam.getProcess());
+            }
+            List<StatisticalDataDTO> deviceRtData = commonMapper.getDeviceRtDataByTime(influxQueryWrapper);
+            if (CollUtil.isNotEmpty(deviceRtData)) {
+                deviceRtData.forEach(item -> {
+                    item.setLineId(commonQueryParam.getLineId());
+                    item.setPhaseType(commonQueryParam.getPhasic());
+                    item.setValueType("AVG");
+                });
+            }
+            resultList.addAll(deviceRtData);
+        }
+        return resultList;
+    }
 }