From b43728e1542b87c63b5f670890862cbe11d9a215 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Mon, 7 Jul 2025 10:11:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E9=A1=B9=E7=9B=AE=E9=83=A8?= =?UTF-8?q?=E7=BD=B2=E8=AF=B4=E6=98=8E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../njcn/influx/bo/po/InfluxDBDataFlicker.java | 4 ++-- .../influx/bo/po/InfluxDBDataHarmpowerP.java | 18 +++++++++--------- .../influx/bo/po/InfluxDBDataHarmpowerQ.java | 6 +++--- .../influx/bo/po/InfluxDBDataHarmpowerS.java | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java index 5fd6ed4..e84ef60 100644 --- a/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java +++ b/influx-data/influx-source/src/main/java/com/njcn/influx/bo/po/InfluxDBDataFlicker.java @@ -58,8 +58,8 @@ public class InfluxDBDataFlicker { influxDBDataFlicker.setLineId(dataFlicker.getLineid()); influxDBDataFlicker.setPhaseType(dataFlicker.getPhasicType()); influxDBDataFlicker.setFluc(dataFlicker.getFluc()); - influxDBDataFlicker.setPlt(dataFlicker.getPst()); - influxDBDataFlicker.setPst(dataFlicker.getPlt()); + influxDBDataFlicker.setPlt(dataFlicker.getPlt()); + influxDBDataFlicker.setPst(dataFlicker.getPst()); influxDBDataFlicker.setQualityFlag(dataFlicker.getQualityflag()+""); 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 3a86299..93e510f 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 @@ -275,9 +275,9 @@ 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.setDf(dataHarmpowerP.getDfMax()); + influxDBDataHarmPhasicV.setPf(dataHarmpowerP.getPfMax()); + influxDBDataHarmPhasicV.setP(dataHarmpowerP.getPMax()); influxDBDataHarmPhasicV.setP1(dataHarmpowerP.getP1Max()); influxDBDataHarmPhasicV.setP2(dataHarmpowerP.getP2Max()); @@ -331,9 +331,9 @@ 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.setDf(dataHarmpowerP.getDfMin()); + influxDBDataHarmPhasicV.setPf(dataHarmpowerP.getPfMin()); + influxDBDataHarmPhasicV.setP(dataHarmpowerP.getPMin()); influxDBDataHarmPhasicV.setP1(dataHarmpowerP.getP1Min()); influxDBDataHarmPhasicV.setP2(dataHarmpowerP.getP2Min()); @@ -387,9 +387,9 @@ 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.setDf(dataHarmpowerP.getDfCp95()); + influxDBDataHarmPhasicV.setPf(dataHarmpowerP.getPfCp95()); + influxDBDataHarmPhasicV.setP(dataHarmpowerP.getPCp95()); influxDBDataHarmPhasicV.setP1(dataHarmpowerP.getP1Cp95()); influxDBDataHarmPhasicV.setP2(dataHarmpowerP.getP2Cp95()); 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 d187c12..7af5051 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 @@ -268,7 +268,7 @@ public class InfluxDBDataHarmpowerQ { influxDBDataHarmPhasicV.setQ50(dataHarmpowerQ.getQ50()); } else if (valueType.equals("MAX")){ - influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQ()); + influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQMax()); influxDBDataHarmPhasicV.setQ1(dataHarmpowerQ.getQ1Max()); influxDBDataHarmPhasicV.setQ2(dataHarmpowerQ.getQ2Max()); @@ -322,7 +322,7 @@ public class InfluxDBDataHarmpowerQ { influxDBDataHarmPhasicV.setQ50(dataHarmpowerQ.getQ50Max()); } else if (valueType.equals("MIN")){ - influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQ()); + influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQMin()); influxDBDataHarmPhasicV.setQ1(dataHarmpowerQ.getQ1Min()); influxDBDataHarmPhasicV.setQ2(dataHarmpowerQ.getQ2Min()); @@ -376,7 +376,7 @@ public class InfluxDBDataHarmpowerQ { influxDBDataHarmPhasicV.setQ50(dataHarmpowerQ.getQ50Min()); } else if (valueType.equals("CP95")){ - influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQ()); + influxDBDataHarmPhasicV.setQ(dataHarmpowerQ.getQCp95()); influxDBDataHarmPhasicV.setQ1(dataHarmpowerQ.getQ1Cp95()); influxDBDataHarmPhasicV.setQ2(dataHarmpowerQ.getQ2Cp95()); 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 de67686..9442dce 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 @@ -266,7 +266,7 @@ public class InfluxDBDataHarmpowerS { influxDBDataHarmPhasicV.setS50(dataHarmpowerS.getS50()); } else if (valueType.equals("MAX")){ - influxDBDataHarmPhasicV.setS(dataHarmpowerS.getS()); + influxDBDataHarmPhasicV.setS(dataHarmpowerS.getSMax()); influxDBDataHarmPhasicV.setS1(dataHarmpowerS.getS1Max()); influxDBDataHarmPhasicV.setS2(dataHarmpowerS.getS2Max()); @@ -320,7 +320,7 @@ public class InfluxDBDataHarmpowerS { influxDBDataHarmPhasicV.setS50(dataHarmpowerS.getS50Max()); } else if (valueType.equals("MIN")){ - influxDBDataHarmPhasicV.setS(dataHarmpowerS.getS()); + influxDBDataHarmPhasicV.setS(dataHarmpowerS.getSMin()); influxDBDataHarmPhasicV.setS1(dataHarmpowerS.getS1Min()); influxDBDataHarmPhasicV.setS2(dataHarmpowerS.getS2Min()); @@ -374,7 +374,7 @@ public class InfluxDBDataHarmpowerS { influxDBDataHarmPhasicV.setS50(dataHarmpowerS.getS50Min()); } else if (valueType.equals("CP95")){ - influxDBDataHarmPhasicV.setS(dataHarmpowerS.getS()); + influxDBDataHarmPhasicV.setS(dataHarmpowerS.getSCp95()); influxDBDataHarmPhasicV.setS1(dataHarmpowerS.getS1Cp95()); influxDBDataHarmPhasicV.setS2(dataHarmpowerS.getS2Cp95());