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-02-21 15:34:50 +08:00
parent 92d540e497
commit fa09ac7a67
13 changed files with 666 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
analysis/stat/stat-api/src/main/java/com/njcn/stat/messagedto/MessageDataV.java
View File

@@ -47,6 +47,23 @@ public class MessageDataV {
@JsonProperty("MIN_VRMS")
private Double minVrms;
//95值 电压有效值
@JsonProperty("G_VRMS_LVR")
private Double gVrmsLvr;
//平均值 电压有效值
@JsonProperty("VRMS_LVR")
private Double vrmsLvr;
//最大值 电压有效值
@JsonProperty("MAX_VRMS_LVR")
private Double maxVrmsLvr;
//最小值 电压有效值
@JsonProperty("MIN_VRMS_LVR")
private Double minVrmsLvr;
//95值 电压总谐波畸变率
@JsonProperty("G_VTHD")
private Double gVthd;

234
analysis/stat/stat-api/src/main/java/com/njcn/stat/utils/BeanVConverter.java
View File

@@ -3,6 +3,7 @@ package com.njcn.stat.utils;
import com.njcn.dataProcess.dto.DataHarmphasicVDTO;
import com.njcn.dataProcess.dto.DataHarmrateVDTO;
import com.njcn.dataProcess.dto.DataInharmVDTO;
import com.njcn.dataProcess.dto.DataVDTO;
import com.njcn.stat.messagedto.MessageDataV;
@@ -278,7 +279,7 @@ public class BeanVConverter {
};
//T项
public static DataVDTO messageDataVTODataV(MessageDataVT messageDataVT){
public static DataVDTO messageDataVTODataV(MessageDataVT messageDataVT,MessageDataV messageDataVa,MessageDataV messageDataVb,MessageDataV messageDataVc){
DataVDTO dataVRelation = new DataVDTO();
if(Objects.nonNull(messageDataVT)){
dataVRelation.setFreq(messageDataVT.getFreq());
@@ -308,7 +309,29 @@ public class BeanVConverter {
dataVRelation.setVPosCp95(messageDataVT.getGvpseq());
dataVRelation.setVNegCp95(messageDataVT.getGvnseq());
dataVRelation.setVZeroCp95(messageDataVT.getGvzseq());
}
if(Objects.nonNull(messageDataVa)){
dataVRelation.setRmsab(messageDataVa.getVrmsLvr());
dataVRelation.setRmsabMax(messageDataVa.getMaxVrmsLvr());
dataVRelation.setRmsabMin(messageDataVa.getMinVrmsLvr());
dataVRelation.setRmsabCp95(messageDataVa.getGVrmsLvr());
}
if(Objects.nonNull(messageDataVb)){
dataVRelation.setRmsab(messageDataVb.getVrmsLvr());
dataVRelation.setRmsabMax(messageDataVb.getMaxVrmsLvr());
dataVRelation.setRmsabMin(messageDataVb.getMinVrmsLvr());
dataVRelation.setRmsabCp95(messageDataVb.getGVrmsLvr());
}
if(Objects.nonNull(messageDataVc)){
dataVRelation.setRmsbc(messageDataVc.getVrmsLvr());
dataVRelation.setRmsbcMax(messageDataVc.getMaxVrmsLvr());
dataVRelation.setRmsbcMin(messageDataVc.getMinVrmsLvr());
dataVRelation.setRmsbcCp95(messageDataVc.getGVrmsLvr());
}
return dataVRelation;
}
@@ -739,4 +762,213 @@ public class BeanVConverter {
}
public static DataHarmrateVDTO messageDataVTODataHarmprateV(MessageDataV a) {
DataHarmrateVDTO dataHarmrateVDTO = new DataHarmrateVDTO();
if(Objects.nonNull(a)){
dataHarmrateVDTO.setV2(a.getV2());
dataHarmrateVDTO.setV3(a.getV3());
dataHarmrateVDTO.setV4(a.getV4());
dataHarmrateVDTO.setV5(a.getV5());
dataHarmrateVDTO.setV6(a.getV6());
dataHarmrateVDTO.setV7(a.getV7());
dataHarmrateVDTO.setV8(a.getV8());
dataHarmrateVDTO.setV9(a.getV9());
dataHarmrateVDTO.setV10(a.getV10());
dataHarmrateVDTO.setV11(a.getV11());
dataHarmrateVDTO.setV12(a.getV12());
dataHarmrateVDTO.setV13(a.getV13());
dataHarmrateVDTO.setV14(a.getV14());
dataHarmrateVDTO.setV15(a.getV15());
dataHarmrateVDTO.setV16(a.getV16());
dataHarmrateVDTO.setV17(a.getV17());
dataHarmrateVDTO.setV18(a.getV18());
dataHarmrateVDTO.setV19(a.getV19());
dataHarmrateVDTO.setV20(a.getV20());
dataHarmrateVDTO.setV21(a.getV21());
dataHarmrateVDTO.setV22(a.getV22());
dataHarmrateVDTO.setV23(a.getV23());
dataHarmrateVDTO.setV24(a.getV24());
dataHarmrateVDTO.setV25(a.getV25());
dataHarmrateVDTO.setV26(a.getV26());
dataHarmrateVDTO.setV27(a.getV27());
dataHarmrateVDTO.setV28(a.getV28());
dataHarmrateVDTO.setV29(a.getV29());
dataHarmrateVDTO.setV30(a.getV30());
dataHarmrateVDTO.setV31(a.getV31());
dataHarmrateVDTO.setV32(a.getV32());
dataHarmrateVDTO.setV33(a.getV33());
dataHarmrateVDTO.setV34(a.getV34());
dataHarmrateVDTO.setV35(a.getV35());
dataHarmrateVDTO.setV36(a.getV36());
dataHarmrateVDTO.setV37(a.getV37());
dataHarmrateVDTO.setV38(a.getV38());
dataHarmrateVDTO.setV39(a.getV39());
dataHarmrateVDTO.setV40(a.getV40());
dataHarmrateVDTO.setV41(a.getV41());
dataHarmrateVDTO.setV42(a.getV42());
dataHarmrateVDTO.setV43(a.getV43());
dataHarmrateVDTO.setV44(a.getV44());
dataHarmrateVDTO.setV45(a.getV45());
dataHarmrateVDTO.setV46(a.getV46());
dataHarmrateVDTO.setV47(a.getV47());
dataHarmrateVDTO.setV48(a.getV48());
dataHarmrateVDTO.setV49(a.getV49());
dataHarmrateVDTO.setV50(a.getV50());
dataHarmrateVDTO.setV2Max(a.getMaxV2());
dataHarmrateVDTO.setV3Max(a.getMaxV3());
dataHarmrateVDTO.setV4Max(a.getMaxV4());
dataHarmrateVDTO.setV5Max(a.getMaxV5());
dataHarmrateVDTO.setV6Max(a.getMaxV6());
dataHarmrateVDTO.setV7Max(a.getMaxV7());
dataHarmrateVDTO.setV8Max(a.getMaxV8());
dataHarmrateVDTO.setV9Max(a.getMaxV9());
dataHarmrateVDTO.setV10Max(a.getMaxV10());
dataHarmrateVDTO.setV11Max(a.getMaxV11());
dataHarmrateVDTO.setV12Max(a.getMaxV12());
dataHarmrateVDTO.setV13Max(a.getMaxV13());
dataHarmrateVDTO.setV14Max(a.getMaxV14());
dataHarmrateVDTO.setV15Max(a.getMaxV15());
dataHarmrateVDTO.setV16Max(a.getMaxV16());
dataHarmrateVDTO.setV17Max(a.getMaxV17());
dataHarmrateVDTO.setV18Max(a.getMaxV18());
dataHarmrateVDTO.setV19Max(a.getMaxV19());
dataHarmrateVDTO.setV20Max(a.getMaxV20());
dataHarmrateVDTO.setV21Max(a.getMaxV21());
dataHarmrateVDTO.setV22Max(a.getMaxV22());
dataHarmrateVDTO.setV23Max(a.getMaxV23());
dataHarmrateVDTO.setV24Max(a.getMaxV24());
dataHarmrateVDTO.setV25Max(a.getMaxV25());
dataHarmrateVDTO.setV26Max(a.getMaxV26());
dataHarmrateVDTO.setV27Max(a.getMaxV27());
dataHarmrateVDTO.setV28Max(a.getMaxV28());
dataHarmrateVDTO.setV29Max(a.getMaxV29());
dataHarmrateVDTO.setV30Max(a.getMaxV30());
dataHarmrateVDTO.setV31Max(a.getMaxV31());
dataHarmrateVDTO.setV32Max(a.getMaxV32());
dataHarmrateVDTO.setV33Max(a.getMaxV33());
dataHarmrateVDTO.setV34Max(a.getMaxV34());
dataHarmrateVDTO.setV35Max(a.getMaxV35());
dataHarmrateVDTO.setV36Max(a.getMaxV36());
dataHarmrateVDTO.setV37Max(a.getMaxV37());
dataHarmrateVDTO.setV38Max(a.getMaxV38());
dataHarmrateVDTO.setV39Max(a.getMaxV39());
dataHarmrateVDTO.setV40Max(a.getMaxV40());
dataHarmrateVDTO.setV41Max(a.getMaxV41());
dataHarmrateVDTO.setV42Max(a.getMaxV42());
dataHarmrateVDTO.setV43Max(a.getMaxV43());
dataHarmrateVDTO.setV44Max(a.getMaxV44());
dataHarmrateVDTO.setV45Max(a.getMaxV45());
dataHarmrateVDTO.setV46Max(a.getMaxV46());
dataHarmrateVDTO.setV47Max(a.getMaxV47());
dataHarmrateVDTO.setV48Max(a.getMaxV48());
dataHarmrateVDTO.setV49Max(a.getMaxV49());
dataHarmrateVDTO.setV50Max(a.getMaxV50());
dataHarmrateVDTO.setV2Min(a.getMinV2());
dataHarmrateVDTO.setV3Min(a.getMinV3());
dataHarmrateVDTO.setV4Min(a.getMinV4());
dataHarmrateVDTO.setV5Min(a.getMinV5());
dataHarmrateVDTO.setV6Min(a.getMinV6());
dataHarmrateVDTO.setV7Min(a.getMinV7());
dataHarmrateVDTO.setV8Min(a.getMinV8());
dataHarmrateVDTO.setV9Min(a.getMinV9());
dataHarmrateVDTO.setV10Min(a.getMinV10());
dataHarmrateVDTO.setV11Min(a.getMinV11());
dataHarmrateVDTO.setV12Min(a.getMinV12());
dataHarmrateVDTO.setV13Min(a.getMinV13());
dataHarmrateVDTO.setV14Min(a.getMinV14());
dataHarmrateVDTO.setV15Min(a.getMinV15());
dataHarmrateVDTO.setV16Min(a.getMinV16());
dataHarmrateVDTO.setV17Min(a.getMinV17());
dataHarmrateVDTO.setV18Min(a.getMinV18());
dataHarmrateVDTO.setV19Min(a.getMinV19());
dataHarmrateVDTO.setV20Min(a.getMinV20());
dataHarmrateVDTO.setV21Min(a.getMinV21());
dataHarmrateVDTO.setV22Min(a.getMinV22());
dataHarmrateVDTO.setV23Min(a.getMinV23());
dataHarmrateVDTO.setV24Min(a.getMinV24());
dataHarmrateVDTO.setV25Min(a.getMinV25());
dataHarmrateVDTO.setV26Min(a.getMinV26());
dataHarmrateVDTO.setV27Min(a.getMinV27());
dataHarmrateVDTO.setV28Min(a.getMinV28());
dataHarmrateVDTO.setV29Min(a.getMinV29());
dataHarmrateVDTO.setV30Min(a.getMinV30());
dataHarmrateVDTO.setV31Min(a.getMinV31());
dataHarmrateVDTO.setV32Min(a.getMinV32());
dataHarmrateVDTO.setV33Min(a.getMinV33());
dataHarmrateVDTO.setV34Min(a.getMinV34());
dataHarmrateVDTO.setV35Min(a.getMinV35());
dataHarmrateVDTO.setV36Min(a.getMinV36());
dataHarmrateVDTO.setV37Min(a.getMinV37());
dataHarmrateVDTO.setV38Min(a.getMinV38());
dataHarmrateVDTO.setV39Min(a.getMinV39());
dataHarmrateVDTO.setV40Min(a.getMinV40());
dataHarmrateVDTO.setV41Min(a.getMinV41());
dataHarmrateVDTO.setV42Min(a.getMinV42());
dataHarmrateVDTO.setV43Min(a.getMinV43());
dataHarmrateVDTO.setV44Min(a.getMinV44());
dataHarmrateVDTO.setV45Min(a.getMinV45());
dataHarmrateVDTO.setV46Min(a.getMinV46());
dataHarmrateVDTO.setV47Min(a.getMinV47());
dataHarmrateVDTO.setV48Min(a.getMinV48());
dataHarmrateVDTO.setV49Min(a.getMinV49());
dataHarmrateVDTO.setV50Min(a.getMinV50());
dataHarmrateVDTO.setV2Cp95(a.getGv2());
dataHarmrateVDTO.setV3Cp95(a.getGv3());
dataHarmrateVDTO.setV4Cp95(a.getGv4());
dataHarmrateVDTO.setV5Cp95(a.getGv5());
dataHarmrateVDTO.setV6Cp95(a.getGv6());
dataHarmrateVDTO.setV7Cp95(a.getGv7());
dataHarmrateVDTO.setV8Cp95(a.getGv8());
dataHarmrateVDTO.setV9Cp95(a.getGv9());
dataHarmrateVDTO.setV10Cp95(a.getGv10());
dataHarmrateVDTO.setV11Cp95(a.getGv11());
dataHarmrateVDTO.setV12Cp95(a.getGv12());
dataHarmrateVDTO.setV13Cp95(a.getGv13());
dataHarmrateVDTO.setV14Cp95(a.getGv14());
dataHarmrateVDTO.setV15Cp95(a.getGv15());
dataHarmrateVDTO.setV16Cp95(a.getGv16());
dataHarmrateVDTO.setV17Cp95(a.getGv17());
dataHarmrateVDTO.setV18Cp95(a.getGv18());
dataHarmrateVDTO.setV19Cp95(a.getGv19());
dataHarmrateVDTO.setV20Cp95(a.getGv20());
dataHarmrateVDTO.setV21Cp95(a.getGv21());
dataHarmrateVDTO.setV22Cp95(a.getGv22());
dataHarmrateVDTO.setV23Cp95(a.getGv23());
dataHarmrateVDTO.setV24Cp95(a.getGv24());
dataHarmrateVDTO.setV25Cp95(a.getGv25());
dataHarmrateVDTO.setV26Cp95(a.getGv26());
dataHarmrateVDTO.setV27Cp95(a.getGv27());
dataHarmrateVDTO.setV28Cp95(a.getGv28());
dataHarmrateVDTO.setV29Cp95(a.getGv29());
dataHarmrateVDTO.setV30Cp95(a.getGv30());
dataHarmrateVDTO.setV31Cp95(a.getGv31());
dataHarmrateVDTO.setV32Cp95(a.getGv32());
dataHarmrateVDTO.setV33Cp95(a.getGv33());
dataHarmrateVDTO.setV34Cp95(a.getGv34());
dataHarmrateVDTO.setV35Cp95(a.getGv35());
dataHarmrateVDTO.setV36Cp95(a.getGv36());
dataHarmrateVDTO.setV37Cp95(a.getGv37());
dataHarmrateVDTO.setV38Cp95(a.getGv38());
dataHarmrateVDTO.setV39Cp95(a.getGv39());
dataHarmrateVDTO.setV40Cp95(a.getGv40());
dataHarmrateVDTO.setV41Cp95(a.getGv41());
dataHarmrateVDTO.setV42Cp95(a.getGv42());
dataHarmrateVDTO.setV43Cp95(a.getGv43());
dataHarmrateVDTO.setV44Cp95(a.getGv44());
dataHarmrateVDTO.setV45Cp95(a.getGv45());
dataHarmrateVDTO.setV46Cp95(a.getGv46());
dataHarmrateVDTO.setV47Cp95(a.getGv47());
dataHarmrateVDTO.setV48Cp95(a.getGv48());
dataHarmrateVDTO.setV49Cp95(a.getGv49());
dataHarmrateVDTO.setV50Cp95(a.getGv50());
}
return dataHarmrateVDTO;
}
}