diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerP.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerP.java index b36da57..3a86299 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerP.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerP.java @@ -218,6 +218,11 @@ public class InfluxDBDataHarmpowerP { influxDBDataHarmPhasicV.setQualityFlag(dataHarmpowerP.getQualityflag()+""); influxDBDataHarmPhasicV.setValueType(valueType); if (valueType.equals("AVG")) { + influxDBDataHarmPhasicV.setDf(dataHarmpowerP.getDf()); + influxDBDataHarmPhasicV.setPf(dataHarmpowerP.getPf()); + influxDBDataHarmPhasicV.setP(dataHarmpowerP.getP()); + + influxDBDataHarmPhasicV.setP1(dataHarmpowerP.getP1()); influxDBDataHarmPhasicV.setP2(dataHarmpowerP.getP2()); influxDBDataHarmPhasicV.setP3(dataHarmpowerP.getP3()); @@ -270,6 +275,10 @@ public class InfluxDBDataHarmpowerP { influxDBDataHarmPhasicV.setP50(dataHarmpowerP.getP50()); } else if (valueType.equals("MAX")){ + influxDBDataHarmPhasicV.setDf(dataHarmpowerP.getDf()); + influxDBDataHarmPhasicV.setPf(dataHarmpowerP.getPf()); + influxDBDataHarmPhasicV.setP(dataHarmpowerP.getP()); + influxDBDataHarmPhasicV.setP1(dataHarmpowerP.getP1Max()); influxDBDataHarmPhasicV.setP2(dataHarmpowerP.getP2Max()); influxDBDataHarmPhasicV.setP3(dataHarmpowerP.getP3Max()); @@ -322,6 +331,10 @@ public class InfluxDBDataHarmpowerP { influxDBDataHarmPhasicV.setP50(dataHarmpowerP.getP50Max()); } else if (valueType.equals("MIN")){ + influxDBDataHarmPhasicV.setDf(dataHarmpowerP.getDf()); + influxDBDataHarmPhasicV.setPf(dataHarmpowerP.getPf()); + influxDBDataHarmPhasicV.setP(dataHarmpowerP.getP()); + influxDBDataHarmPhasicV.setP1(dataHarmpowerP.getP1Min()); influxDBDataHarmPhasicV.setP2(dataHarmpowerP.getP2Min()); influxDBDataHarmPhasicV.setP3(dataHarmpowerP.getP3Min()); @@ -374,6 +387,10 @@ public class InfluxDBDataHarmpowerP { influxDBDataHarmPhasicV.setP50(dataHarmpowerP.getP50Min()); } else if (valueType.equals("CP95")){ + influxDBDataHarmPhasicV.setDf(dataHarmpowerP.getDf()); + influxDBDataHarmPhasicV.setPf(dataHarmpowerP.getPf()); + influxDBDataHarmPhasicV.setP(dataHarmpowerP.getP()); + influxDBDataHarmPhasicV.setP1(dataHarmpowerP.getP1Cp95()); influxDBDataHarmPhasicV.setP2(dataHarmpowerP.getP2Cp95()); influxDBDataHarmPhasicV.setP3(dataHarmpowerP.getP3Cp95()); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerQ.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerQ.java index f7722e6..d187c12 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerQ.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerQ.java @@ -212,6 +212,10 @@ public class InfluxDBDataHarmpowerQ { influxDBDataHarmPhasicV.setQualityFlag(dataHarmpowerQ.getQualityflag()+""); influxDBDataHarmPhasicV.setValueType(valueType); if (valueType.equals("AVG")) { + + influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQ()); + + influxDBDataHarmPhasicV.setQ1(dataHarmpowerQ.getQ1()); influxDBDataHarmPhasicV.setQ2(dataHarmpowerQ.getQ2()); influxDBDataHarmPhasicV.setQ3(dataHarmpowerQ.getQ3()); @@ -264,6 +268,8 @@ public class InfluxDBDataHarmpowerQ { influxDBDataHarmPhasicV.setQ50(dataHarmpowerQ.getQ50()); } else if (valueType.equals("MAX")){ + influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQ()); + influxDBDataHarmPhasicV.setQ1(dataHarmpowerQ.getQ1Max()); influxDBDataHarmPhasicV.setQ2(dataHarmpowerQ.getQ2Max()); influxDBDataHarmPhasicV.setQ3(dataHarmpowerQ.getQ3Max()); @@ -316,6 +322,8 @@ public class InfluxDBDataHarmpowerQ { influxDBDataHarmPhasicV.setQ50(dataHarmpowerQ.getQ50Max()); } else if (valueType.equals("MIN")){ + influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQ()); + influxDBDataHarmPhasicV.setQ1(dataHarmpowerQ.getQ1Min()); influxDBDataHarmPhasicV.setQ2(dataHarmpowerQ.getQ2Min()); influxDBDataHarmPhasicV.setQ3(dataHarmpowerQ.getQ3Min()); @@ -368,6 +376,8 @@ public class InfluxDBDataHarmpowerQ { influxDBDataHarmPhasicV.setQ50(dataHarmpowerQ.getQ50Min()); } else if (valueType.equals("CP95")){ + influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQ()); + influxDBDataHarmPhasicV.setQ1(dataHarmpowerQ.getQ1Cp95()); influxDBDataHarmPhasicV.setQ2(dataHarmpowerQ.getQ2Cp95()); influxDBDataHarmPhasicV.setQ3(dataHarmpowerQ.getQ3Cp95()); diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerS.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerS.java index 7b87b74..de67686 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerS.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataHarmpowerS.java @@ -212,6 +212,8 @@ public class InfluxDBDataHarmpowerS { influxDBDataHarmPhasicV.setQualityFlag(dataHarmpowerS.getQualityflag()+""); influxDBDataHarmPhasicV.setValueType(valueType); if (valueType.equals("AVG")) { + influxDBDataHarmPhasicV.setS(dataHarmpowerS.getS()); + influxDBDataHarmPhasicV.setS1(dataHarmpowerS.getS1()); influxDBDataHarmPhasicV.setS2(dataHarmpowerS.getS2()); influxDBDataHarmPhasicV.setS3(dataHarmpowerS.getS3()); @@ -264,6 +266,8 @@ public class InfluxDBDataHarmpowerS { influxDBDataHarmPhasicV.setS50(dataHarmpowerS.getS50()); } else if (valueType.equals("MAX")){ + influxDBDataHarmPhasicV.setS(dataHarmpowerS.getS()); + influxDBDataHarmPhasicV.setS1(dataHarmpowerS.getS1Max()); influxDBDataHarmPhasicV.setS2(dataHarmpowerS.getS2Max()); influxDBDataHarmPhasicV.setS3(dataHarmpowerS.getS3Max()); @@ -316,6 +320,8 @@ public class InfluxDBDataHarmpowerS { influxDBDataHarmPhasicV.setS50(dataHarmpowerS.getS50Max()); } else if (valueType.equals("MIN")){ + influxDBDataHarmPhasicV.setS(dataHarmpowerS.getS()); + influxDBDataHarmPhasicV.setS1(dataHarmpowerS.getS1Min()); influxDBDataHarmPhasicV.setS2(dataHarmpowerS.getS2Min()); influxDBDataHarmPhasicV.setS3(dataHarmpowerS.getS3Min()); @@ -368,6 +374,8 @@ public class InfluxDBDataHarmpowerS { influxDBDataHarmPhasicV.setS50(dataHarmpowerS.getS50Min()); } else if (valueType.equals("CP95")){ + influxDBDataHarmPhasicV.setS(dataHarmpowerS.getS()); + influxDBDataHarmPhasicV.setS1(dataHarmpowerS.getS1Cp95()); influxDBDataHarmPhasicV.setS2(dataHarmpowerS.getS2Cp95()); influxDBDataHarmPhasicV.setS3(dataHarmpowerS.getS3Cp95());