diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataI.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataI.java index 9c7a0fa..856a55f 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataI.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataI.java @@ -1272,6 +1272,7 @@ public class MessageDataI { //谐波电流有效值 最小值 @JsonProperty("MIN_I50") private Double minI50; + //谐波电流相角 95值 @JsonProperty("G_IA2") private Double gIa2; @@ -1284,6 +1285,7 @@ public class MessageDataI { //谐波电流相角 最小值 @JsonProperty("MIN_IA2") private Double minIa2; + //谐波电流相角 95值 @JsonProperty("G_IA3") private Double gIa3; diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataV.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataV.java index ed54c01..83d35d5 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataV.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataV.java @@ -1712,6 +1712,22 @@ public class MessageDataV { @JsonProperty("MIN_V50") private Double minV50; + //新增的谐波电压相角 + @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; + //95值 谐波电压相角 @JsonProperty("G_VA2") private Double gVa2; diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java index fab24ae..b6ee237 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanIConverter.java @@ -283,7 +283,7 @@ public class BeanIConverter { public static DataHarmphasicIDTO messageDataITODataHarmphasicI(MessageDataI messageDataI){ DataHarmphasicIDTO dataHarmphasicI = new DataHarmphasicIDTO(); if(Objects.nonNull(messageDataI)){ - dataHarmphasicI.setI1(1.00); + dataHarmphasicI.setI1(messageDataI.getIfundAngle()); dataHarmphasicI.setI2(messageDataI.getIa2()); dataHarmphasicI.setI3(messageDataI.getIa3()); dataHarmphasicI.setI4(messageDataI.getIa4()); @@ -334,7 +334,7 @@ public class BeanIConverter { dataHarmphasicI.setI49(messageDataI.getIa49()); dataHarmphasicI.setI50(messageDataI.getIa50()); - dataHarmphasicI.setI1Max(1.00); + dataHarmphasicI.setI1Max( messageDataI.getMaxIfundAngle()); dataHarmphasicI.setI2Max(messageDataI.getMaxIa2()); dataHarmphasicI.setI3Max(messageDataI.getMaxIa3()); dataHarmphasicI.setI4Max(messageDataI.getMaxIa4()); @@ -385,7 +385,7 @@ public class BeanIConverter { dataHarmphasicI.setI49Max(messageDataI.getMaxIa49()); dataHarmphasicI.setI50Max(messageDataI.getMaxIa50()); - dataHarmphasicI.setI1Min(1.00); + dataHarmphasicI.setI1Min(messageDataI.getMinIfundAngle()); dataHarmphasicI.setI2Min(messageDataI.getMinIa2()); dataHarmphasicI.setI3Min(messageDataI.getMinIa3()); dataHarmphasicI.setI4Min(messageDataI.getMinIa4()); @@ -436,7 +436,7 @@ public class BeanIConverter { dataHarmphasicI.setI49Min(messageDataI.getMinIa49()); dataHarmphasicI.setI50Min(messageDataI.getMinIa50()); - dataHarmphasicI.setI1Cp95(1.00); + dataHarmphasicI.setI1Cp95(messageDataI.getGIfundAngle()); dataHarmphasicI.setI2Cp95(messageDataI.getGIa2()); dataHarmphasicI.setI3Cp95(messageDataI.getGIa3()); dataHarmphasicI.setI4Cp95(messageDataI.getGIa4()); diff --git a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java index b93a1de..3aad3d1 100644 --- a/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java +++ b/analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java @@ -561,7 +561,7 @@ public class BeanVConverter { public static DataHarmphasicVDTO messageDataVTODataHarmphasicV(MessageDataV messageDataV){ DataHarmphasicVDTO dataHarmphasicV = new DataHarmphasicVDTO(); if (Objects.nonNull(messageDataV)){ -// dataHarmphasicV.setV1(1.00); + dataHarmphasicV.setV1(messageDataV.getVfundAngle()); dataHarmphasicV.setV2(messageDataV.getVa2()); dataHarmphasicV.setV3(messageDataV.getVa3()); dataHarmphasicV.setV4(messageDataV.getVa4()); @@ -612,7 +612,7 @@ public class BeanVConverter { dataHarmphasicV.setV49(messageDataV.getVa49()); dataHarmphasicV.setV50(messageDataV.getVa50()); -// dataHarmphasicV.setV1Max(1.00); + dataHarmphasicV.setV1Max(messageDataV.getMaxVfundAngle()); dataHarmphasicV.setV2Max(messageDataV.getMaxVa2()); dataHarmphasicV.setV3Max(messageDataV.getMaxVa3()); dataHarmphasicV.setV4Max(messageDataV.getMaxVa4()); @@ -663,7 +663,7 @@ public class BeanVConverter { dataHarmphasicV.setV49Max(messageDataV.getMaxVa49()); dataHarmphasicV.setV50Max(messageDataV.getMaxVa50()); -// dataHarmphasicV.setV1Min(1.00); + dataHarmphasicV.setV1Min(messageDataV.getMinVfundAngle()); dataHarmphasicV.setV2Min(messageDataV.getMinVa2()); dataHarmphasicV.setV3Min(messageDataV.getMinVa3()); dataHarmphasicV.setV4Min(messageDataV.getMinVa4()); @@ -714,7 +714,7 @@ public class BeanVConverter { dataHarmphasicV.setV49Min(messageDataV.getMinVa49()); dataHarmphasicV.setV50Min(messageDataV.getMinVa50()); -// dataHarmphasicV.setV1Cp95(1.00); + dataHarmphasicV.setV1Cp95(messageDataV.getGVfundAngle()); dataHarmphasicV.setV2Cp95(messageDataV.getGVa2()); dataHarmphasicV.setV3Cp95(messageDataV.getGVa3()); dataHarmphasicV.setV4Cp95(messageDataV.getGVa4());