Middleware/cn-data-platform
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

新增字段前置缺少的字段

Browse Source
This commit is contained in:
hzj
2025-03-07 13:35:14 +08:00
parent 484b6b53aa
commit b2097bd38a
3 changed files with 90 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataP.java
View File

@@ -72,6 +72,20 @@ public class MessageDataP {
//无功功率 最小值
@JsonProperty("MIN_Q")
private Double minQ;
//谐波有功功率 95值
@JsonProperty("G_P1")
private Double gp1;
//谐波有功功率 平均值
@JsonProperty("P1")
private Double p1;
//谐波有功功率 最大值
@JsonProperty("MAX_P1")
private Double maxP1;
//谐波有功功率 最小值
@JsonProperty("MIN_P1")
private Double minP1;
//谐波有功功率 95值
@JsonProperty("G_P2")
private Double gp2;
@@ -660,6 +674,20 @@ public class MessageDataP {
//谐波有功功率 最小值
@JsonProperty("MIN_P50")
private Double minP50;
//视在功率 95值
@JsonProperty("G_S1")
private Double gs1;
//视在功率 平均值
@JsonProperty("S1")
private Double s1;
//视在功率 最大值
@JsonProperty("MAX_S1")
private Double maxS1;
//视在功率 最小值
@JsonProperty("MIN_S1")
private Double minS1;
//视在功率 95值
@JsonProperty("G_S2")
private Double gs2;
@@ -1248,6 +1276,20 @@ public class MessageDataP {
//视在功率 最小值
@JsonProperty("MIN_S50")
private Double minS50;
//无功功率 95值
@JsonProperty("G_Q1")
private Double gq1;
//无功功率 平均值
@JsonProperty("Q1")
private Double q1;
//无功功率 最大值
@JsonProperty("MAX_Q1")
private Double maxQ1;
//无功功率 最小值
@JsonProperty("MIN_Q1")
private Double minQ1;
//无功功率 95值
@JsonProperty("G_Q2")
private Double gq2;

16
analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanPConverter.java
View File

@@ -286,7 +286,7 @@ public class BeanPConverter {
// dataHarmpowerS.setPhasicType();
// dataHarmpowerS.setQualityflag();
dataHarmpowerS.setS(messageDataP.getS());
// dataHarmpowerS.setS1(messageDataP.getS1());
dataHarmpowerS.setS1(messageDataP.getS1());
dataHarmpowerS.setS2(messageDataP.getS2());
dataHarmpowerS.setS3(messageDataP.getS3());
dataHarmpowerS.setS4(messageDataP.getS4());
@@ -338,7 +338,7 @@ public class BeanPConverter {
dataHarmpowerS.setS50(messageDataP.getS50());
dataHarmpowerS.setSMax(messageDataP.getMaxS());
// dataHarmpowerS.setS1Max();
dataHarmpowerS.setS1Max(messageDataP.getMaxS1());
dataHarmpowerS.setS2Max(messageDataP.getMaxS2());
dataHarmpowerS.setS3Max(messageDataP.getMaxS3());
dataHarmpowerS.setS4Max(messageDataP.getMaxS4());
@@ -390,7 +390,7 @@ public class BeanPConverter {
dataHarmpowerS.setS50Max(messageDataP.getMaxS50());
dataHarmpowerS.setSMin(messageDataP.getMinS());
// dataHarmpowerS.setS1Min();
dataHarmpowerS.setS1Min(messageDataP.getMinS1());
dataHarmpowerS.setS2Min(messageDataP.getMinS2());
dataHarmpowerS.setS3Min(messageDataP.getMinS3());
dataHarmpowerS.setS4Min(messageDataP.getMinS4());
@@ -442,7 +442,7 @@ public class BeanPConverter {
dataHarmpowerS.setS50Min(messageDataP.getMinS50());
dataHarmpowerS.setSCp95(messageDataP.getGs());
// dataHarmpowerS.setS1Cp95();
dataHarmpowerS.setS1Cp95(messageDataP.getGs1());
dataHarmpowerS.setS2Cp95(messageDataP.getGs2());
dataHarmpowerS.setS3Cp95(messageDataP.getGs3());
dataHarmpowerS.setS4Cp95(messageDataP.getGs4());
@@ -529,7 +529,7 @@ public class BeanPConverter {
// dataHarmpowerQ.setQualityflag();
dataHarmpowerQ.setQ(messageDataP.getQ());
// dataHarmpowerS.setS1(messageDataP.getS1());
dataHarmpowerQ.setQ1(messageDataP.getQ1());
dataHarmpowerQ.setQ2(messageDataP.getQ2());
dataHarmpowerQ.setQ3(messageDataP.getQ3());
dataHarmpowerQ.setQ4(messageDataP.getQ4());
@@ -581,7 +581,7 @@ public class BeanPConverter {
dataHarmpowerQ.setQ50(messageDataP.getQ50());
dataHarmpowerQ.setQMax(messageDataP.getMaxQ());
// dataHarmpowerS.setS1Max();
dataHarmpowerQ.setQ1Max(messageDataP.getMaxQ1());
dataHarmpowerQ.setQ2Max(messageDataP.getMaxQ2());
dataHarmpowerQ.setQ3Max(messageDataP.getMaxQ3());
dataHarmpowerQ.setQ4Max(messageDataP.getMaxQ4());
@@ -633,7 +633,7 @@ public class BeanPConverter {
dataHarmpowerQ.setQ50Max(messageDataP.getMaxQ50());
dataHarmpowerQ.setQMin(messageDataP.getMinQ());
// dataHarmpowerS.setS1Min();
dataHarmpowerQ.setQ1Min(messageDataP.getMinQ1());
dataHarmpowerQ.setQ2Min(messageDataP.getMinQ2());
dataHarmpowerQ.setQ3Min(messageDataP.getMinQ3());
dataHarmpowerQ.setQ4Min(messageDataP.getMinQ4());
@@ -685,7 +685,7 @@ public class BeanPConverter {
dataHarmpowerQ.setQ50Min(messageDataP.getMinQ50());
dataHarmpowerQ.setQCp95(messageDataP.getGq());
// dataHarmpowerS.setS1Cp95();
dataHarmpowerQ.setQ1Cp95(messageDataP.getGq1());
dataHarmpowerQ.setQ2Cp95(messageDataP.getGq2());
dataHarmpowerQ.setQ3Cp95(messageDataP.getGq3());
dataHarmpowerQ.setQ4Cp95(messageDataP.getGq4());

40
analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/Tets.java Normal file
View File

@@ -0,0 +1,40 @@
package com.njcn.stat.utils;
import com.fasterxml.jackson.annotation.JsonProperty;
import com.njcn.stat.messagedto.MessageDataI;
import lombok.Data;
/**
* Description:
* Date: 2025/03/07 上午 10:15【需求编号】
*
* @author clam
* @version V1.0.0
*/
@Data
public class Tets {
//新增的谐波电压相角
@JsonProperty("G_VFUND_ANGLE")
private Double gVfundAngle;
//平均值 谐波电压相角
@JsonProperty("VFUND_ANGLE")
private Double vfundAngle;
//最大值 谐波电压相角
@JsonProperty("MAX_VFUND_ANGLE")
private Double maxVfundAngle;
//最小值 谐波电压相角
@JsonProperty("MIN_VFUND_ANGLE")
private Double minVfundAngle;
public static void main(String[] args) {
Tets m = new Tets();
Double gVfundAngle = m.getGVfundAngle();
Double vfundAngle = m.getVfundAngle();
Double maxVfundAngle = m.getMaxVfundAngle();
Double minVfundAngle = m.getMinVfundAngle();
}
}