From 274d787b049fcfcf50fca59d4a92c2101dca8e46 Mon Sep 17 00:00:00 2001 From: xy <748613696@qq.com> Date: Wed, 1 Jul 2026 17:16:21 +0800 Subject: [PATCH] =?UTF-8?q?refactor(data):=20=E7=BB=9F=E4=B8=80=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E5=BA=93=E5=AD=97=E6=AE=B5=E5=91=BD=E5=90=8D=E8=A7=84?= =?UTF-8?q?=E8=8C=83=E5=B9=B6=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 将DataHarmpowerP类中的totPf、totDf、totP等字段的@Column注解名称规范化为下划线格式 - 将DataHarmpowerP类中的totP1-totP50字段名统一调整为tot_tp_1-tot_tp_50格式 - 将DataHarmpowerQ类中的totQ字段名调整为tot_q，totQ1-totQ50调整为tot_tq_1-tot_tq_50格式 - 将DataHarmpowerS类中的totS字段名调整为tot_s，totS1-totS50调整为tot_ts_1-tot_ts_50格式 - 在InfluxdbDataHarmpowerPImpl服务中添加tot_tp_1-tot_tp_50字段的查询条件配置 - 在InfluxdbDataHarmpowerPImpl服务中增加TotP、TotDf、TotPf字段的选择查询 - 在InfluxdbDataHarmpowerQImpl服务中添加tot_tq_1-tot_tq_50字段的查询条件配置 - 在InfluxdbDataHarmpowerQImpl服务中增加TotQ字段的选择查询 - 在InfluxdbDataHarmpowerSImpl服务中添加tot_ts_1-tot_ts_50字段的查询条件配置 - 在InfluxdbDataHarmpowerSImpl服务中增加TotS字段的选择查询 --- .../dataProcess/po/influx/DataHarmpowerP.java | 110 +++++++++--------- .../dataProcess/po/influx/DataHarmpowerQ.java | 102 ++++++++-------- .../dataProcess/po/influx/DataHarmpowerS.java | 102 ++++++++-------- .../influxdb/InfluxdbDataHarmpowerPImpl.java | 4 + .../influxdb/InfluxdbDataHarmpowerQImpl.java | 2 + .../influxdb/InfluxdbDataHarmpowerSImpl.java | 2 + 6 files changed, 165 insertions(+), 157 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 49d9cc3..1e75132 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 @@ -214,111 +214,111 @@ public class DataHarmpowerP { private Double p50; //在线监测添加的字段 - @Column(name = "totPf") - private Double totPf; - @Column(name = "totDf") - private Double totDf; - @Column(name = "totP") + @Column(name = "tot_p") private Double totP; - @Column(name = "totP1") + @Column(name = "tot_df") + private Double totDf; + @Column(name = "tot_pf") + private Double totPf; + @Column(name = "tot_tp_1") private Double totP1; - @Column(name = "totP2") + @Column(name = "tot_tp_2") private Double totP2; - @Column(name = "totP3") + @Column(name = "tot_tp_3") private Double totP3; - @Column(name = "totP4") + @Column(name = "tot_tp_4") private Double totP4; - @Column(name = "totP5") + @Column(name = "tot_tp_5") private Double totP5; - @Column(name = "totP6") + @Column(name = "tot_tp_6") private Double totP6; - @Column(name = "totP7") + @Column(name = "tot_tp_7") private Double totP7; - @Column(name = "totP8") + @Column(name = "tot_tp_8") private Double totP8; - @Column(name = "totP9") + @Column(name = "tot_tp_9") private Double totP9; - @Column(name = "totP10") + @Column(name = "tot_tp_10") private Double totP10; - @Column(name = "totP11") + @Column(name = "tot_tp_11") private Double totP11; - @Column(name = "totP12") + @Column(name = "tot_tp_12") private Double totP12; - @Column(name = "totP13") + @Column(name = "tot_tp_13") private Double totP13; - @Column(name = "totP14") + @Column(name = "tot_tp_14") private Double totP14; - @Column(name = "totP15") + @Column(name = "tot_tp_15") private Double totP15; - @Column(name = "totP16") + @Column(name = "tot_tp_16") private Double totP16; - @Column(name = "totP17") + @Column(name = "tot_tp_17") private Double totP17; - @Column(name = "totP18") + @Column(name = "tot_tp_18") private Double totP18; - @Column(name = "totP19") + @Column(name = "tot_tp_19") private Double totP19; - @Column(name = "totP20") + @Column(name = "tot_tp_20") private Double totP20; - @Column(name = "totP21") + @Column(name = "tot_tp_21") private Double totP21; - @Column(name = "totP22") + @Column(name = "tot_tp_22") private Double totP22; - @Column(name = "totP23") + @Column(name = "tot_tp_23") private Double totP23; - @Column(name = "totP24") + @Column(name = "tot_tp_24") private Double totP24; - @Column(name = "totP25") + @Column(name = "tot_tp_25") private Double totP25; - @Column(name = "totP26") + @Column(name = "tot_tp_26") private Double totP26; - @Column(name = "totP27") + @Column(name = "tot_tp_27") private Double totP27; - @Column(name = "totP28") + @Column(name = "tot_tp_28") private Double totP28; - @Column(name = "totP29") + @Column(name = "tot_tp_29") private Double totP29; - @Column(name = "totP30") + @Column(name = "tot_tp_30") private Double totP30; - @Column(name = "totP31") + @Column(name = "tot_tp_31") private Double totP31; - @Column(name = "totP32") + @Column(name = "tot_tp_32") private Double totP32; - @Column(name = "totP33") + @Column(name = "tot_tp_33") private Double totP33; - @Column(name = "totP34") + @Column(name = "tot_tp_34") private Double totP34; - @Column(name = "totP35") + @Column(name = "tot_tp_35") private Double totP35; - @Column(name = "totP36") + @Column(name = "tot_tp_36") private Double totP36; - @Column(name = "totP37") + @Column(name = "tot_tp_37") private Double totP37; - @Column(name = "totP38") + @Column(name = "tot_tp_38") private Double totP38; - @Column(name = "totP39") + @Column(name = "tot_tp_39") private Double totP39; - @Column(name = "totP40") + @Column(name = "tot_tp_40") private Double totP40; - @Column(name = "totP41") + @Column(name = "tot_tp_41") private Double totP41; - @Column(name = "totP42") + @Column(name = "tot_tp_42") private Double totP42; - @Column(name = "totP43") + @Column(name = "tot_tp_43") private Double totP43; - @Column(name = "totP44") + @Column(name = "tot_tp_44") private Double totP44; - @Column(name = "totP45") + @Column(name = "tot_tp_45") private Double totP45; - @Column(name = "totP46") + @Column(name = "tot_tp_46") private Double totP46; - @Column(name = "totP47") + @Column(name = "tot_tp_47") private Double totP47; - @Column(name = "totP49") + @Column(name = "tot_tp_49") private Double totP48; - @Column(name = "totP49") + @Column(name = "tot_tp_49") private Double totP49; - @Column(name = "totP50") + @Column(name = "tot_tp_50") private Double totP50; 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 beaeb33..5ca76a7 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 @@ -208,107 +208,107 @@ public class DataHarmpowerQ { private Double q50; //在线监测添加的字段 - @Column(name = "totQ") + @Column(name = "tot_q") private Double totQ; - @Column(name = "totQ1") + @Column(name = "tot_tq_1") private Double totQ1; - @Column(name = "totQ2") + @Column(name = "tot_tq_2") private Double totQ2; - @Column(name = "totQ3") + @Column(name = "tot_tq_3") private Double totQ3; - @Column(name = "totQ4") + @Column(name = "tot_tq_4") private Double totQ4; - @Column(name = "totQ5") + @Column(name = "tot_tq_5") private Double totQ5; - @Column(name = "totQ6") + @Column(name = "tot_tq_6") private Double totQ6; - @Column(name = "totQ7") + @Column(name = "tot_tq_7") private Double totQ7; - @Column(name = "totQ8") + @Column(name = "tot_tq_8") private Double totQ8; - @Column(name = "totQ9") + @Column(name = "tot_tq_9") private Double totQ9; - @Column(name = "totQ10") + @Column(name = "tot_tq_10") private Double totQ10; - @Column(name = "totQ11") + @Column(name = "tot_tq_11") private Double totQ11; - @Column(name = "totQ12") + @Column(name = "tot_tq_12") private Double totQ12; - @Column(name = "totQ13") + @Column(name = "tot_tq_13") private Double totQ13; - @Column(name = "totQ14") + @Column(name = "tot_tq_14") private Double totQ14; - @Column(name = "totQ15") + @Column(name = "tot_tq_15") private Double totQ15; - @Column(name = "totQ16") + @Column(name = "tot_tq_16") private Double totQ16; - @Column(name = "totQ17") + @Column(name = "tot_tq_17") private Double totQ17; - @Column(name = "totQ18") + @Column(name = "tot_tq_18") private Double totQ18; - @Column(name = "totQ19") + @Column(name = "tot_tq_19") private Double totQ19; - @Column(name = "totQ20") + @Column(name = "tot_tq_20") private Double totQ20; - @Column(name = "totQ21") + @Column(name = "tot_tq_21") private Double totQ21; - @Column(name = "totQ22") + @Column(name = "tot_tq_22") private Double totQ22; - @Column(name = "totQ23") + @Column(name = "tot_tq_23") private Double totQ23; - @Column(name = "totQ24") + @Column(name = "tot_tq_24") private Double totQ24; - @Column(name = "totQ25") + @Column(name = "tot_tq_25") private Double totQ25; - @Column(name = "totQ26") + @Column(name = "tot_tq_26") private Double totQ26; - @Column(name = "totQ27") + @Column(name = "tot_tq_27") private Double totQ27; - @Column(name = "totQ28") + @Column(name = "tot_tq_28") private Double totQ28; - @Column(name = "totQ29") + @Column(name = "tot_tq_29") private Double totQ29; - @Column(name = "totQ30") + @Column(name = "tot_tq_30") private Double totQ30; - @Column(name = "totQ31") + @Column(name = "tot_tq_31") private Double totQ31; - @Column(name = "totQ32") + @Column(name = "tot_tq_32") private Double totQ32; - @Column(name = "totQ33") + @Column(name = "tot_tq_33") private Double totQ33; - @Column(name = "totQ34") + @Column(name = "tot_tq_34") private Double totQ34; - @Column(name = "totQ35") + @Column(name = "tot_tq_35") private Double totQ35; - @Column(name = "totQ36") + @Column(name = "tot_tq_36") private Double totQ36; - @Column(name = "totQ37") + @Column(name = "tot_tq_37") private Double totQ37; - @Column(name = "totQ38") + @Column(name = "tot_tq_38") private Double totQ38; - @Column(name = "totQ39") + @Column(name = "tot_tq_39") private Double totQ39; - @Column(name = "totQ40") + @Column(name = "tot_tq_40") private Double totQ40; - @Column(name = "totQ41") + @Column(name = "tot_tq_41") private Double totQ41; - @Column(name = "totQ42") + @Column(name = "tot_tq_42") private Double totQ42; - @Column(name = "totQ43") + @Column(name = "tot_tq_43") private Double totQ43; - @Column(name = "totQ44") + @Column(name = "tot_tq_44") private Double totQ44; - @Column(name = "totQ45") + @Column(name = "tot_tq_45") private Double totQ45; - @Column(name = "totQ46") + @Column(name = "tot_tq_46") private Double totQ46; - @Column(name = "totQ47") + @Column(name = "tot_tq_47") private Double totQ47; - @Column(name = "totQ49") + @Column(name = "tot_tq_49") private Double totQ48; - @Column(name = "totQ49") + @Column(name = "tot_tq_49") private Double totQ49; - @Column(name = "totQ50") + @Column(name = "tot_tq_50") private Double totQ50; 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 ddb0094..feb8162 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 @@ -208,107 +208,107 @@ public class DataHarmpowerS { private Double s50; //在线监测添加的字段 - @Column(name = "totS") + @Column(name = "tot_s") private Double totS; - @Column(name = "totS1") + @Column(name = "tot_ts_1") private Double totS1; - @Column(name = "totS2") + @Column(name = "tot_ts_2") private Double totS2; - @Column(name = "totS3") + @Column(name = "tot_ts_3") private Double totS3; - @Column(name = "totS4") + @Column(name = "tot_ts_4") private Double totS4; - @Column(name = "totS5") + @Column(name = "tot_ts_5") private Double totS5; - @Column(name = "totS6") + @Column(name = "tot_ts_6") private Double totS6; - @Column(name = "totS7") + @Column(name = "tot_ts_7") private Double totS7; - @Column(name = "totS8") + @Column(name = "tot_ts_8") private Double totS8; - @Column(name = "totS9") + @Column(name = "tot_ts_9") private Double totS9; - @Column(name = "totS10") + @Column(name = "tot_ts_10") private Double totS10; - @Column(name = "totS11") + @Column(name = "tot_ts_11") private Double totS11; - @Column(name = "totS12") + @Column(name = "tot_ts_12") private Double totS12; - @Column(name = "totS13") + @Column(name = "tot_ts_13") private Double totS13; - @Column(name = "totS14") + @Column(name = "tot_ts_14") private Double totS14; - @Column(name = "totS15") + @Column(name = "tot_ts_15") private Double totS15; - @Column(name = "totS16") + @Column(name = "tot_ts_16") private Double totS16; - @Column(name = "totS17") + @Column(name = "tot_ts_17") private Double totS17; - @Column(name = "totS18") + @Column(name = "tot_ts_18") private Double totS18; - @Column(name = "totS19") + @Column(name = "tot_ts_19") private Double totS19; - @Column(name = "totS20") + @Column(name = "tot_ts_20") private Double totS20; - @Column(name = "totS21") + @Column(name = "tot_ts_21") private Double totS21; - @Column(name = "totS22") + @Column(name = "tot_ts_22") private Double totS22; - @Column(name = "totS23") + @Column(name = "tot_ts_23") private Double totS23; - @Column(name = "totS24") + @Column(name = "tot_ts_24") private Double totS24; - @Column(name = "totS25") + @Column(name = "tot_ts_25") private Double totS25; - @Column(name = "totS26") + @Column(name = "tot_ts_26") private Double totS26; - @Column(name = "totS27") + @Column(name = "tot_ts_27") private Double totS27; - @Column(name = "totS28") + @Column(name = "tot_ts_28") private Double totS28; - @Column(name = "totS29") + @Column(name = "tot_ts_29") private Double totS29; - @Column(name = "totS30") + @Column(name = "tot_ts_30") private Double totS30; - @Column(name = "totS31") + @Column(name = "tot_ts_31") private Double totS31; - @Column(name = "totS32") + @Column(name = "tot_ts_32") private Double totS32; - @Column(name = "totS33") + @Column(name = "tot_ts_33") private Double totS33; - @Column(name = "totS34") + @Column(name = "tot_ts_34") private Double totS34; - @Column(name = "totS35") + @Column(name = "tot_ts_35") private Double totS35; - @Column(name = "totS36") + @Column(name = "tot_ts_36") private Double totS36; - @Column(name = "totS37") + @Column(name = "tot_ts_37") private Double totS37; - @Column(name = "totS38") + @Column(name = "tot_ts_38") private Double totS38; - @Column(name = "totS39") + @Column(name = "tot_ts_39") private Double totS39; - @Column(name = "totS40") + @Column(name = "tot_ts_40") private Double totS40; - @Column(name = "totS41") + @Column(name = "tot_ts_41") private Double totS41; - @Column(name = "totS42") + @Column(name = "tot_ts_42") private Double totS42; - @Column(name = "totS43") + @Column(name = "tot_ts_43") private Double totS43; - @Column(name = "totS44") + @Column(name = "tot_ts_44") private Double totS44; - @Column(name = "totS45") + @Column(name = "tot_ts_45") private Double totS45; - @Column(name = "totS46") + @Column(name = "tot_ts_46") private Double totS46; - @Column(name = "totS47") + @Column(name = "tot_ts_47") private Double totS47; - @Column(name = "totS49") + @Column(name = "tot_ts_49") private Double totS48; - @Column(name = "totS49") + @Column(name = "tot_ts_49") private Double totS49; - @Column(name = "totS50") + @Column(name = "tot_ts_50") private Double totS50; diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java index 9b567a4..989f9a8 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerPImpl.java @@ -192,6 +192,7 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerP.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.P, InfluxDbSqlConstant.P, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix("tot_tp_", "tot_tp_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmpowerP::getLineId, lineList) .select(DataHarmpowerP::getLineId) .select(DataHarmpowerP::getPhasicType) @@ -199,6 +200,9 @@ public class InfluxdbDataHarmpowerPImpl extends MppServiceImpl result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerQ.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.Q, InfluxDbSqlConstant.Q, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix("tot_tq_", "tot_tq_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmpowerQ::getLineId, lineList) .select(DataHarmpowerQ::getLineId) .select(DataHarmpowerQ::getPhasicType) .select(DataHarmpowerQ::getValueType) .select(DataHarmpowerQ::getQ) + .select(DataHarmpowerQ::getTotQ) .select(DataHarmpowerQ::getQualityFlag) .select(DataHarmpowerQ::getAbnormalFlag) .between(DataHarmpowerQ::getTime, startTime, endTime) diff --git a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java index 11df88a..80866ea 100644 --- a/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java +++ b/data-processing/data-processing-boot/src/main/java/com/njcn/dataProcess/service/impl/influxdb/InfluxdbDataHarmpowerSImpl.java @@ -187,11 +187,13 @@ public class InfluxdbDataHarmpowerSImpl extends MppServiceImpl result = new ArrayList<>(); InfluxQueryWrapper influxQueryWrapper = new InfluxQueryWrapper(DataHarmpowerS.class); influxQueryWrapper.samePrefixAndSuffix(InfluxDbSqlConstant.S, InfluxDbSqlConstant.S, HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); + influxQueryWrapper.samePrefixAndSuffix("tot_ts_", "tot_ts_", HarmonicTimesUtil.harmonicTimesList(1, 50, 1)); influxQueryWrapper.regular(DataHarmpowerS::getLineId, lineList) .select(DataHarmpowerS::getLineId) .select(DataHarmpowerS::getPhasicType) .select(DataHarmpowerS::getValueType) .select(DataHarmpowerS::getS) + .select(DataHarmpowerS::getTotS) .select(DataHarmpowerS::getQualityFlag) .select(DataHarmpowerS::getAbnormalFlag) .between(DataHarmpowerS::getTime, startTime, endTime)