From a0ff080232fe0cb14bdd202c3b415331568381f6 Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Sun, 14 Dec 2025 16:39:02 +0800 Subject: [PATCH] feat(ThreePhaseDeviceData): rename averagePowerFactor to totalPowerFactor in DTOs and entity --- .../coal/dataCollector/listener/ThreePhaseDeviceListener.java | 2 +- .../dto/CreateThreePhaseDeviceDataDto.java | 2 +- .../threePhaseDeviceData/dto/ThreePhaseDeviceDataDto.java | 4 ++-- .../dto/UpdateThreePhaseDeviceDataDto.java | 2 +- .../entity/ThreePhaseDeviceDataEntity.java | 4 ++-- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/main/java/cn/lihongjie/coal/dataCollector/listener/ThreePhaseDeviceListener.java b/src/main/java/cn/lihongjie/coal/dataCollector/listener/ThreePhaseDeviceListener.java index 04a8d3a5..8bcdc4b2 100644 --- a/src/main/java/cn/lihongjie/coal/dataCollector/listener/ThreePhaseDeviceListener.java +++ b/src/main/java/cn/lihongjie/coal/dataCollector/listener/ThreePhaseDeviceListener.java @@ -341,7 +341,7 @@ public class ThreePhaseDeviceListener { data.setPowerFactorA(getJsonDouble(jsonNode, "powerFactorA")); data.setPowerFactorB(getJsonDouble(jsonNode, "powerFactorB")); data.setPowerFactorC(getJsonDouble(jsonNode, "powerFactorC")); - data.setAveragePowerFactor(getJsonDouble(jsonNode, "averagePowerFactor")); + data.setTotalPowerFactor(getJsonDouble(jsonNode, "totalPowerFactor")); // 频率 data.setFrequency(getJsonDouble(jsonNode, "frequency")); diff --git a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/CreateThreePhaseDeviceDataDto.java b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/CreateThreePhaseDeviceDataDto.java index 69896983..bc44d57b 100644 --- a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/CreateThreePhaseDeviceDataDto.java +++ b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/CreateThreePhaseDeviceDataDto.java @@ -59,7 +59,7 @@ public class CreateThreePhaseDeviceDataDto extends OrgCommonDto { private Double powerFactorA; private Double powerFactorB; private Double powerFactorC; - private Double averagePowerFactor; + private Double totalPowerFactor; // ========== 频率 (Hz) ========== diff --git a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/ThreePhaseDeviceDataDto.java b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/ThreePhaseDeviceDataDto.java index ac882808..2d66b8e1 100644 --- a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/ThreePhaseDeviceDataDto.java +++ b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/ThreePhaseDeviceDataDto.java @@ -87,8 +87,8 @@ public class ThreePhaseDeviceDataDto extends OrgCommonDto { private Double powerFactorB; /** C相功率因数 */ private Double powerFactorC; - /** 三相平均功率因数 */ - private Double averagePowerFactor; + /** 三相总功率因数 */ + private Double totalPowerFactor; // ========== 频率 (Hz) ========== diff --git a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/UpdateThreePhaseDeviceDataDto.java b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/UpdateThreePhaseDeviceDataDto.java index 1964781a..710b2077 100644 --- a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/UpdateThreePhaseDeviceDataDto.java +++ b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/dto/UpdateThreePhaseDeviceDataDto.java @@ -59,7 +59,7 @@ public class UpdateThreePhaseDeviceDataDto extends OrgCommonDto { private Double powerFactorA; private Double powerFactorB; private Double powerFactorC; - private Double averagePowerFactor; + private Double totalPowerFactor; // ========== 频率 (Hz) ========== diff --git a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/entity/ThreePhaseDeviceDataEntity.java b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/entity/ThreePhaseDeviceDataEntity.java index aadfa156..c19dda3b 100644 --- a/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/entity/ThreePhaseDeviceDataEntity.java +++ b/src/main/java/cn/lihongjie/coal/threePhaseDeviceData/entity/ThreePhaseDeviceDataEntity.java @@ -105,8 +105,8 @@ public class ThreePhaseDeviceDataEntity extends OrgCommonEntity { private Double powerFactorB; /** C相功率因数 */ private Double powerFactorC; - /** 三相平均功率因数 */ - private Double averagePowerFactor; + /** 三相总功率因数 */ + private Double totalPowerFactor; // ========== 频率 (Hz) ==========