From 4bf195c0fd2ce52183eb7681ed18fcb579b524f5 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 26 Jun 2026 17:39:10 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E4=BD=93=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../njcn/influx/pojo/po/DataHarmPowerP.java   | 152 ++++++++++++++++++
 .../njcn/influx/pojo/po/DataHarmPowerQ.java   | 148 ++++++++++++++++-
 .../njcn/influx/pojo/po/DataHarmPowerS.java   | 147 +++++++++++++++++
 3 files changed, 446 insertions(+), 1 deletion(-)

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 6f3cd8a..4efb6d7 100644
--- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java
+++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java
@@ -196,6 +196,154 @@ public class DataHarmPowerP {
     @Column(name = "p_50")
     private Double p50;
 
+    //2-50总谐波有功功率
+    @Column(name = "tp_2")
+    private Double tp2;
+
+    @Column(name = "tp_3")
+    private Double tp3;
+
+    @Column(name = "tp_4")
+    private Double tp4;
+
+    @Column(name = "tp_5")
+    private Double tp5;
+
+    @Column(name = "tp_6")
+    private Double tp6;
+
+    @Column(name = "tp_7")
+    private Double tp7;
+
+    @Column(name = "tp_8")
+    private Double tp8;
+
+    @Column(name = "tp_9")
+    private Double tp9;
+
+    @Column(name = "tp_10")
+    private Double tp10;
+
+    @Column(name = "tp_11")
+    private Double tp11;
+
+    @Column(name = "tp_12")
+    private Double tp12;
+
+    @Column(name = "tp_13")
+    private Double tp13;
+
+    @Column(name = "tp_14")
+    private Double tp14;
+
+    @Column(name = "tp_15")
+    private Double tp15;
+
+    @Column(name = "tp_16")
+    private Double tp16;
+
+    @Column(name = "tp_17")
+    private Double tp17;
+
+    @Column(name = "tp_18")
+    private Double tp18;
+
+    @Column(name = "tp_19")
+    private Double tp19;
+
+    @Column(name = "tp_20")
+    private Double tp20;
+
+    @Column(name = "tp_21")
+    private Double tp21;
+
+    @Column(name = "tp_22")
+    private Double tp22;
+
+    @Column(name = "tp_23")
+    private Double tp23;
+
+    @Column(name = "tp_24")
+    private Double tp24;
+
+    @Column(name = "tp_25")
+    private Double tp25;
+
+    @Column(name = "tp_26")
+    private Double tp26;
+
+    @Column(name = "tp_27")
+    private Double tp27;
+
+    @Column(name = "tp_28")
+    private Double tp28;
+
+    @Column(name = "tp_29")
+    private Double tp29;
+
+    @Column(name = "tp_30")
+    private Double tp30;
+
+    @Column(name = "tp_31")
+    private Double tp31;
+
+    @Column(name = "tp_32")
+    private Double tp32;
+
+    @Column(name = "tp_33")
+    private Double tp33;
+
+    @Column(name = "tp_34")
+    private Double tp34;
+
+    @Column(name = "tp_35")
+    private Double tp35;
+
+    @Column(name = "tp_36")
+    private Double tp36;
+
+    @Column(name = "tp_37")
+    private Double tp37;
+
+    @Column(name = "tp_38")
+    private Double tp38;
+
+    @Column(name = "tp_39")
+    private Double tp39;
+
+    @Column(name = "tp_40")
+    private Double tp40;
+
+    @Column(name = "tp_41")
+    private Double tp41;
+
+    @Column(name = "tp_42")
+    private Double tp42;
+
+    @Column(name = "tp_43")
+    private Double tp43;
+
+    @Column(name = "tp_44")
+    private Double tp44;
+
+    @Column(name = "tp_45")
+    private Double tp45;
+
+    @Column(name = "tp_46")
+    private Double tp46;
+
+    @Column(name = "tp_47")
+    private Double tp47;
+
+    @Column(name = "tp_48")
+    private Double tp48;
+
+    @Column(name = "tp_49")
+    private Double tp49;
+
+    @Column(name = "tp_50")
+    private Double tp50;
+
     //是否是异常指标数据，0否1是
     @Column(name = "abnormal_flag")
     private Integer abnormalFlag;
@@ -224,4 +372,8 @@ public class DataHarmPowerP {
     //三相功率因数
     @Column(name = "tot_pf")
     private Double totPf;
+
+    //三相位移功率因数
+    @Column(name = "tot_df")
+    private Double totDf;
 }
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 54cd859..74c3ddb 100644
--- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java
+++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java
@@ -37,7 +37,6 @@ public class DataHarmPowerQ {
     @Column(name = "value_type", tag = true)
     private String valueType;
 
-
     @Column(name = "q")
     private Double q;
 
@@ -191,6 +190,153 @@ public class DataHarmPowerQ {
     @Column(name = "q_50")
     private Double q50;
 
+    @Column(name = "tq_2")
+    private Double tq2;
+
+    @Column(name = "tq_3")
+    private Double tq3;
+
+    @Column(name = "tq_4")
+    private Double tq4;
+
+    @Column(name = "tq_5")
+    private Double tq5;
+
+    @Column(name = "tq_6")
+    private Double tq6;
+
+    @Column(name = "tq_7")
+    private Double tq7;
+
+    @Column(name = "tq_8")
+    private Double tq8;
+
+    @Column(name = "tq_9")
+    private Double tq9;
+
+    @Column(name = "tq_10")
+    private Double tq10;
+
+    @Column(name = "tq_11")
+    private Double tq11;
+
+    @Column(name = "tq_12")
+    private Double tq12;
+
+    @Column(name = "tq_13")
+    private Double tq13;
+
+    @Column(name = "tq_14")
+    private Double tq14;
+
+    @Column(name = "tq_15")
+    private Double tq15;
+
+    @Column(name = "tq_16")
+    private Double tq16;
+
+    @Column(name = "tq_17")
+    private Double tq17;
+
+    @Column(name = "tq_18")
+    private Double tq18;
+
+    @Column(name = "tq_19")
+    private Double tq19;
+
+    @Column(name = "tq_20")
+    private Double tq20;
+
+    @Column(name = "tq_21")
+    private Double tq21;
+
+    @Column(name = "tq_22")
+    private Double tq22;
+
+    @Column(name = "tq_23")
+    private Double tq23;
+
+    @Column(name = "tq_24")
+    private Double tq24;
+
+    @Column(name = "tq_25")
+    private Double tq25;
+
+    @Column(name = "tq_26")
+    private Double tq26;
+
+    @Column(name = "tq_27")
+    private Double tq27;
+
+    @Column(name = "tq_28")
+    private Double tq28;
+
+    @Column(name = "tq_29")
+    private Double tq29;
+
+    @Column(name = "tq_30")
+    private Double tq30;
+
+    @Column(name = "tq_31")
+    private Double tq31;
+
+    @Column(name = "tq_32")
+    private Double tq32;
+
+    @Column(name = "tq_33")
+    private Double tq33;
+
+    @Column(name = "tq_34")
+    private Double tq34;
+
+    @Column(name = "tq_35")
+    private Double tq35;
+
+    @Column(name = "tq_36")
+    private Double tq36;
+
+    @Column(name = "tq_37")
+    private Double tq37;
+
+    @Column(name = "tq_38")
+    private Double tq38;
+
+    @Column(name = "tq_39")
+    private Double tq39;
+
+    @Column(name = "tq_40")
+    private Double tq40;
+
+    @Column(name = "tq_41")
+    private Double tq41;
+
+    @Column(name = "tq_42")
+    private Double tq42;
+
+    @Column(name = "tq_43")
+    private Double tq43;
+
+    @Column(name = "tq_44")
+    private Double tq44;
+
+    @Column(name = "tq_45")
+    private Double tq45;
+
+    @Column(name = "tq_46")
+    private Double tq46;
+
+    @Column(name = "tq_47")
+    private Double tq47;
+
+    @Column(name = "tq_48")
+    private Double tq48;
+
+    @Column(name = "tq_49")
+    private Double tq49;
+
+    @Column(name = "tq_50")
+    private Double tq50;
+
     //是否是异常指标数据，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 d9536d3..b5ccfed 100644
--- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java
+++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java
@@ -190,6 +190,153 @@ public class DataHarmPowerS {
     @Column(name = "s_50")
     private Double s50;
 
+    @Column(name = "ts_2")
+    private Double ts2;
+
+    @Column(name = "ts_3")
+    private Double ts3;
+
+    @Column(name = "ts_4")
+    private Double ts4;
+
+    @Column(name = "ts_5")
+    private Double ts5;
+
+    @Column(name = "ts_6")
+    private Double ts6;
+
+    @Column(name = "ts_7")
+    private Double ts7;
+
+    @Column(name = "ts_8")
+    private Double ts8;
+
+    @Column(name = "ts_9")
+    private Double ts9;
+
+    @Column(name = "ts_10")
+    private Double ts10;
+
+    @Column(name = "ts_11")
+    private Double ts11;
+
+    @Column(name = "ts_12")
+    private Double ts12;
+
+    @Column(name = "ts_13")
+    private Double ts13;
+
+    @Column(name = "ts_14")
+    private Double ts14;
+
+    @Column(name = "ts_15")
+    private Double ts15;
+
+    @Column(name = "ts_16")
+    private Double ts16;
+
+    @Column(name = "ts_17")
+    private Double ts17;
+
+    @Column(name = "ts_18")
+    private Double ts18;
+
+    @Column(name = "ts_19")
+    private Double ts19;
+
+    @Column(name = "ts_20")
+    private Double ts20;
+
+    @Column(name = "ts_21")
+    private Double ts21;
+
+    @Column(name = "ts_22")
+    private Double ts22;
+
+    @Column(name = "ts_23")
+    private Double ts23;
+
+    @Column(name = "ts_24")
+    private Double ts24;
+
+    @Column(name = "ts_25")
+    private Double ts25;
+
+    @Column(name = "ts_26")
+    private Double ts26;
+
+    @Column(name = "ts_27")
+    private Double ts27;
+
+    @Column(name = "ts_28")
+    private Double ts28;
+
+    @Column(name = "ts_29")
+    private Double ts29;
+
+    @Column(name = "ts_30")
+    private Double ts30;
+
+    @Column(name = "ts_31")
+    private Double ts31;
+
+    @Column(name = "ts_32")
+    private Double ts32;
+
+    @Column(name = "ts_33")
+    private Double ts33;
+
+    @Column(name = "ts_34")
+    private Double ts34;
+
+    @Column(name = "ts_35")
+    private Double ts35;
+
+    @Column(name = "ts_36")
+    private Double ts36;
+
+    @Column(name = "ts_37")
+    private Double ts37;
+
+    @Column(name = "ts_38")
+    private Double ts38;
+
+    @Column(name = "ts_39")
+    private Double ts39;
+
+    @Column(name = "ts_40")
+    private Double ts40;
+
+    @Column(name = "ts_41")
+    private Double ts41;
+
+    @Column(name = "ts_42")
+    private Double ts42;
+
+    @Column(name = "ts_43")
+    private Double ts43;
+
+    @Column(name = "ts_44")
+    private Double ts44;
+
+    @Column(name = "ts_45")
+    private Double ts45;
+
+    @Column(name = "ts_46")
+    private Double ts46;
+
+    @Column(name = "ts_47")
+    private Double ts47;
+
+    @Column(name = "ts_48")
+    private Double ts48;
+
+    @Column(name = "ts_49")
+    private Double ts49;
+
+    @Column(name = "ts_50")
+    private Double ts50;
+
     //是否是异常指标数据，0否1是
     @Column(name = "abnormal_flag")
     private Integer abnormalFlag;