From 68d5804b09f8c079b70b0885accd4819b503a7f6 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Fri, 26 Jun 2026 17:32:11 +0800
Subject: [PATCH] =?UTF-8?q?feat(power):=20=E6=B7=BB=E5=8A=A0=E4=B8=89?=
 =?UTF-8?q?=E7=9B=B8=E5=8A=9F=E7=8E=87=E7=9B=B8=E5=85=B3=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=88=B0=E6=95=B0=E6=8D=AE=E5=AE=9E=E4=BD=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 在DataHarmPowerP中添加三相总谐波有功功率totHarmP字段
- 在DataHarmPowerP中添加基波功率因数dpf字段
- 在DataHarmPowerP中添加三相总有功功率totP字段
- 在DataHarmPowerP中添加三相功率因数totPf字段
- 在DataHarmPowerQ中添加三相总谐波无功功率totHarmQ字段
- 在DataHarmPowerQ中添加三相总无功功率totQ字段
- 在DataHarmPowerS中添加三相总谐波视在功率totHarmS字段
- 在DataHarmPowerS中添加三相总视在功率totS字段
---
 .../java/com/njcn/influx/pojo/po/DataHarmPowerP.java   | 10 ++++++++++
 .../java/com/njcn/influx/pojo/po/DataHarmPowerQ.java   |  4 ++++
 .../java/com/njcn/influx/pojo/po/DataHarmPowerS.java   |  5 +++++
 3 files changed, 19 insertions(+)

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 4741610..6f3cd8a 100644
--- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java
+++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerP.java
@@ -209,9 +209,19 @@ public class DataHarmPowerP {
     @Column(name = "tot_dpf")
     private Double totDpf;
 
+    //三相总谐波有功功率
     @Column(name = "tot_harm_p")
     private Double totHarmP;
 
+    //基波功率因数(P1/S1)
     @Column(name = "dpf")
     private Double dpf;
+
+    //三相总有功功率
+    @Column(name = "tot_p")
+    private Double totP;
+
+    //三相功率因数
+    @Column(name = "tot_pf")
+    private Double totPf;
 }
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 ed7b55e..54cd859 100644
--- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java
+++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerQ.java
@@ -201,7 +201,11 @@ public class DataHarmPowerQ {
     @Column(name = "process")
     private String process;
 
+    //三相总谐波无功功率
     @Column(name = "tot_harm_q")
     private Double totHarmQ;
 
+    //三相总无功功率
+    @Column(name = "tot_q")
+    private Double totQ;
 }
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 757c219..d9536d3 100644
--- a/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java
+++ b/src/main/java/com/njcn/influx/pojo/po/DataHarmPowerS.java
@@ -200,7 +200,12 @@ public class DataHarmPowerS {
     @Column(name = "process")
     private String process;
 
+    //三相总谐波视在功率
     @Column(name = "tot_harm_s")
     private Double totHarmS;
 
+    //三相总视在功率
+    @Column(name = "tot_s")
+    private Double totS;
+
 }