From f6e69e13bdacded2f6404580e4b48e06d7a72d4a Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Fri, 4 Jul 2025 16:21:55 +0800 Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=BD=AE=E6=97=A5=E5=BF=97=E8=81=94?= =?UTF-8?q?=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataProcess/po/influx/DataHarmpowerP.java | 18 +++++++++--------- .../dataProcess/po/influx/DataHarmpowerQ.java | 6 +++--- .../dataProcess/po/influx/DataHarmpowerS.java | 6 +++--- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java index c88c49a..e2c2a9c 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerP.java @@ -281,9 +281,9 @@ public class DataHarmpowerP { influxDBDataHarmpowerP.setP50(Objects.isNull(dataHarmpowerP.getP50())?0.00:dataHarmpowerP.getP50()); } else if (valueType.equals("MAX")){ - influxDBDataHarmpowerP.setDf(Objects.isNull(dataHarmpowerP.getDf())?0.00:dataHarmpowerP.getDf()); - influxDBDataHarmpowerP.setPf(Objects.isNull(dataHarmpowerP.getPf())?0.00:dataHarmpowerP.getPf()); - influxDBDataHarmpowerP.setP(Objects.isNull(dataHarmpowerP.getP())?0.00:dataHarmpowerP.getP()); + influxDBDataHarmpowerP.setDf(Objects.isNull(dataHarmpowerP.getDf())?0.00:dataHarmpowerP.getDfMax()); + influxDBDataHarmpowerP.setPf(Objects.isNull(dataHarmpowerP.getPf())?0.00:dataHarmpowerP.getPfMax()); + influxDBDataHarmpowerP.setP(Objects.isNull(dataHarmpowerP.getP())?0.00:dataHarmpowerP.getPMax()); influxDBDataHarmpowerP.setP1(Objects.isNull(dataHarmpowerP.getP1Max())?0.00:dataHarmpowerP.getP1Max()); influxDBDataHarmpowerP.setP2(Objects.isNull(dataHarmpowerP.getP2Max())?0.00:dataHarmpowerP.getP2Max()); @@ -337,9 +337,9 @@ public class DataHarmpowerP { influxDBDataHarmpowerP.setP50(Objects.isNull(dataHarmpowerP.getP50Max())?0.00:dataHarmpowerP.getP50Max()); } else if (valueType.equals("MIN")){ - influxDBDataHarmpowerP.setDf(Objects.isNull(dataHarmpowerP.getDf())?0.00:dataHarmpowerP.getDf()); - influxDBDataHarmpowerP.setPf(Objects.isNull(dataHarmpowerP.getPf())?0.00:dataHarmpowerP.getPf()); - influxDBDataHarmpowerP.setP(Objects.isNull(dataHarmpowerP.getP())?0.00:dataHarmpowerP.getP()); + influxDBDataHarmpowerP.setDf(Objects.isNull(dataHarmpowerP.getDf())?0.00:dataHarmpowerP.getDfMin()); + influxDBDataHarmpowerP.setPf(Objects.isNull(dataHarmpowerP.getPf())?0.00:dataHarmpowerP.getPfMin()); + influxDBDataHarmpowerP.setP(Objects.isNull(dataHarmpowerP.getP())?0.00:dataHarmpowerP.getPMin()); influxDBDataHarmpowerP.setP1(Objects.isNull(dataHarmpowerP.getP1Min())?0.00:dataHarmpowerP.getP1Min()); influxDBDataHarmpowerP.setP2(Objects.isNull(dataHarmpowerP.getP2Min())?0.00:dataHarmpowerP.getP2Min()); @@ -393,9 +393,9 @@ public class DataHarmpowerP { influxDBDataHarmpowerP.setP50(Objects.isNull(dataHarmpowerP.getP50Min())?0.00:dataHarmpowerP.getP50Min()); } else if (valueType.equals("CP95")){ - influxDBDataHarmpowerP.setDf(Objects.isNull(dataHarmpowerP.getDf())?0.00:dataHarmpowerP.getDf()); - influxDBDataHarmpowerP.setPf(Objects.isNull(dataHarmpowerP.getPf())?0.00:dataHarmpowerP.getPf()); - influxDBDataHarmpowerP.setP(Objects.isNull(dataHarmpowerP.getP())?0.00:dataHarmpowerP.getP()); + influxDBDataHarmpowerP.setDf(Objects.isNull(dataHarmpowerP.getDf())?0.00:dataHarmpowerP.getDfCp95()); + influxDBDataHarmpowerP.setPf(Objects.isNull(dataHarmpowerP.getPf())?0.00:dataHarmpowerP.getPfCp95()); + influxDBDataHarmpowerP.setP(Objects.isNull(dataHarmpowerP.getP())?0.00:dataHarmpowerP.getPCp95()); influxDBDataHarmpowerP.setP1(Objects.isNull(dataHarmpowerP.getP1Cp95())?0.00:dataHarmpowerP.getP1Cp95()); influxDBDataHarmpowerP.setP2(Objects.isNull(dataHarmpowerP.getP2Cp95())?0.00:dataHarmpowerP.getP2Cp95()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java index 1d1019b..6c53c0c 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerQ.java @@ -274,7 +274,7 @@ public class DataHarmpowerQ { influxDBDataHarmpowerQ.setQ50(Objects.isNull(dataHarmpowerQ.getQ50())?0.00:dataHarmpowerQ.getQ50()); } else if (valueType.equals("MAX")){ - influxDBDataHarmpowerQ.setQ(Objects.isNull(dataHarmpowerQ.getQ())?0.00:dataHarmpowerQ.getQ()); + influxDBDataHarmpowerQ.setQ(Objects.isNull(dataHarmpowerQ.getQ())?0.00:dataHarmpowerQ.getQMax()); influxDBDataHarmpowerQ.setQ1(Objects.isNull(dataHarmpowerQ.getQ1Max())?0.00:dataHarmpowerQ.getQ1Max()); influxDBDataHarmpowerQ.setQ2(Objects.isNull(dataHarmpowerQ.getQ2Max())?0.00:dataHarmpowerQ.getQ2Max()); @@ -328,7 +328,7 @@ public class DataHarmpowerQ { influxDBDataHarmpowerQ.setQ50(Objects.isNull(dataHarmpowerQ.getQ50Max())?0.00:dataHarmpowerQ.getQ50Max()); } else if (valueType.equals("MIN")){ - influxDBDataHarmpowerQ.setQ(Objects.isNull(dataHarmpowerQ.getQ())?0.00:dataHarmpowerQ.getQ()); + influxDBDataHarmpowerQ.setQ(Objects.isNull(dataHarmpowerQ.getQ())?0.00:dataHarmpowerQ.getQMin()); influxDBDataHarmpowerQ.setQ1(Objects.isNull(dataHarmpowerQ.getQ1Min())?0.00:dataHarmpowerQ.getQ1Min()); influxDBDataHarmpowerQ.setQ2(Objects.isNull(dataHarmpowerQ.getQ2Min())?0.00:dataHarmpowerQ.getQ2Min()); @@ -382,7 +382,7 @@ public class DataHarmpowerQ { influxDBDataHarmpowerQ.setQ50(Objects.isNull(dataHarmpowerQ.getQ50Min())?0.00:dataHarmpowerQ.getQ50Min()); } else if (valueType.equals("CP95")){ - influxDBDataHarmpowerQ.setQ(Objects.isNull(dataHarmpowerQ.getQ())?0.00:dataHarmpowerQ.getQ()); + influxDBDataHarmpowerQ.setQ(Objects.isNull(dataHarmpowerQ.getQ())?0.00:dataHarmpowerQ.getQCp95()); influxDBDataHarmpowerQ.setQ1(Objects.isNull(dataHarmpowerQ.getQ1Cp95())?0.00:dataHarmpowerQ.getQ1Cp95()); influxDBDataHarmpowerQ.setQ2(Objects.isNull(dataHarmpowerQ.getQ2Cp95())?0.00:dataHarmpowerQ.getQ2Cp95()); diff --git a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java index 67524c9..7d87873 100644 --- a/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java +++ b/data-processing/data-processing-api/src/main/java/com/njcn/dataProcess/po/influx/DataHarmpowerS.java @@ -272,7 +272,7 @@ public class DataHarmpowerS { influxDBDataHarmpowerS.setS50(Objects.isNull(dataHarmpowerS.getS50())?0.00:dataHarmpowerS.getS50()); } else if (valueType.equals("MAX")){ - influxDBDataHarmpowerS.setS(Objects.isNull(dataHarmpowerS.getS())?0.00:dataHarmpowerS.getS()); + influxDBDataHarmpowerS.setS(Objects.isNull(dataHarmpowerS.getS())?0.00:dataHarmpowerS.getSMax()); influxDBDataHarmpowerS.setS1(Objects.isNull(dataHarmpowerS.getS1Max())?0.00:dataHarmpowerS.getS1Max()); influxDBDataHarmpowerS.setS2(Objects.isNull(dataHarmpowerS.getS2Max())?0.00:dataHarmpowerS.getS2Max()); @@ -326,7 +326,7 @@ public class DataHarmpowerS { influxDBDataHarmpowerS.setS50(Objects.isNull(dataHarmpowerS.getS50Max())?0.00:dataHarmpowerS.getS50Max()); } else if (valueType.equals("MIN")){ - influxDBDataHarmpowerS.setS(Objects.isNull(dataHarmpowerS.getS())?0.00:dataHarmpowerS.getS()); + influxDBDataHarmpowerS.setS(Objects.isNull(dataHarmpowerS.getS())?0.00:dataHarmpowerS.getSMin()); influxDBDataHarmpowerS.setS1(Objects.isNull(dataHarmpowerS.getS1Min())?0.00:dataHarmpowerS.getS1Min()); influxDBDataHarmpowerS.setS2(Objects.isNull(dataHarmpowerS.getS2Min())?0.00:dataHarmpowerS.getS2Min()); @@ -380,7 +380,7 @@ public class DataHarmpowerS { influxDBDataHarmpowerS.setS50(Objects.isNull(dataHarmpowerS.getS50Min())?0.00:dataHarmpowerS.getS50Min()); } else if (valueType.equals("CP95")){ - influxDBDataHarmpowerS.setS(Objects.isNull(dataHarmpowerS.getS())?0.00:dataHarmpowerS.getS()); + influxDBDataHarmpowerS.setS(Objects.isNull(dataHarmpowerS.getS())?0.00:dataHarmpowerS.getSCp95()); influxDBDataHarmpowerS.setS1(Objects.isNull(dataHarmpowerS.getS1Cp95())?0.00:dataHarmpowerS.getS1Cp95()); influxDBDataHarmpowerS.setS2(Objects.isNull(dataHarmpowerS.getS2Cp95())?0.00:dataHarmpowerS.getS2Cp95());