From ad8fcd8d336e5daf0885ab4cb1dfb77d15f27a4f Mon Sep 17 00:00:00 2001 From: wr <1754607820@qq.com> Date: Sun, 2 Jun 2024 14:58:25 +0800 Subject: [PATCH] =?UTF-8?q?1.oracle=E5=90=8C=E6=AD=A5mysql=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=202.=E7=BC=96=E5=86=99=E6=9C=80=E5=A4=A7=E6=9C=80?= =?UTF-8?q?=E5=B0=8F=E9=99=90=E5=80=BC=EF=BC=8C=E8=B5=8B=E5=80=BC=E6=B3=A8?= =?UTF-8?q?=E8=A7=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/njcn/mysql/bo/po/RStatAssesD.java | 6 + .../com/njcn/mysql/bo/po/RStatComassesD.java | 31 ++ .../njcn/mysql/bo/po/RStatDataFlickerD.java | 10 +- .../njcn/mysql/bo/po/RStatDataHarmrateVD.java | 51 +++ .../com/njcn/mysql/bo/po/RStatDataID.java | 57 +++ .../njcn/mysql/bo/po/RStatDataInharmVD.java | 151 ++++--- .../com/njcn/mysql/bo/po/RStatDataPltD.java | 5 +- .../com/njcn/mysql/bo/po/RStatDataVD.java | 62 +++ .../com/njcn/mysql/bo/po/RStatLimitRateD.java | 73 +++ .../njcn/mysql/bo/po/RStatLimitTargetD.java | 73 +++ .../com/njcn/mysql/bo/util/CompareValue.java | 13 + .../njcn/mysql/service/OracleDataService.java | 22 + .../service/impl/OracleDataServiceImpl.java | 29 +- .../controller/OracleToMysqlController.java | 50 ++- .../njcn/mysql/job/OracleToMysqlDBJob.java | 52 +++ .../impl/OracleToMysqlServiceImpl.java | 259 +++++++++-- .../impl/RStatDataFlickerDServiceImpl.java | 2 + .../impl/RStatDataInharmVDServiceImpl.java | 2 + .../impl/RStatDataPltDServiceImpl.java | 2 + .../njcn/mysql/util/MaxValueProcessor.java | 64 +++ .../java/com/njcn/mysql/util/PubUtils.java | 51 ++- .../com/njcn/oracle/bo/po/DayFlicker.java | 4 +- .../main/java/com/njcn/oracle/bo/po/DayI.java | 4 +- .../com/njcn/oracle/bo/po/DayInharmV.java | 415 +++++++++--------- .../java/com/njcn/oracle/bo/po/DayPlt.java | 12 +- 25 files changed, 1188 insertions(+), 312 deletions(-) create mode 100644 mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/util/CompareValue.java create mode 100644 mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java create mode 100644 mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/MaxValueProcessor.java diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatAssesD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatAssesD.java index bb45f10..4eba4b9 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatAssesD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatAssesD.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; import java.io.Serializable; @@ -28,17 +29,22 @@ public class RStatAssesD implements Serializable { private String lineId; @TableField(value = "vu_dev") + @CompareValue() private Double vuDev; @TableField(value = "freq_dev") + @CompareValue() private Double freqDev; @TableField(value = "data_plt") + @CompareValue() private Double dataPlt; @TableField(value = "v_unbalance_cp95") + @CompareValue() private Double vUnbalanceCp95; @TableField(value = "v_thd_cp95") + @CompareValue() private Double vThdCp95; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatComassesD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatComassesD.java index 744efaa..baa65ce 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatComassesD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatComassesD.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; import java.io.Serializable; @@ -28,93 +29,123 @@ public class RStatComassesD implements Serializable { private String lineId; @TableField(value = "freq_dev1") + @CompareValue() private Double freqDev1; @TableField(value = "freq_dev2") + @CompareValue() private Double freqDev2; @TableField(value = "freq_dev3") + @CompareValue() private Double freqDev3; @TableField(value = "freq_dev4") + @CompareValue() private Double freqDev4; @TableField(value = "freq_dev5") + @CompareValue() private Double freqDev5; @TableField(value = "vu_dev1") + @CompareValue() private Double vuDev1; @TableField(value = "vu_dev2") + @CompareValue() private Double vuDev2; @TableField(value = "vu_dev3") + @CompareValue() private Double vuDev3; @TableField(value = "vu_dev4") + @CompareValue() private Double vuDev4; @TableField(value = "vu_dev5") + @CompareValue() private Double vuDev5; @TableField(value = "data_plt1") + @CompareValue() private Double dataPst1; @TableField(value = "data_plt2") + @CompareValue() private Double dataPst2; @TableField(value = "data_plt3") + @CompareValue() private Double dataPst3; @TableField(value = "data_plt4") + @CompareValue() private Double dataPst4; @TableField(value = "data_plt5") + @CompareValue() private Double dataPst5; @TableField(value = "v_unbalance1") + @CompareValue() private Double vUnbalance1; @TableField(value = "v_unbalance2") + @CompareValue() private Double vUnbalance2; @TableField(value = "v_unbalance3") + @CompareValue() private Double vUnbalance3; @TableField(value = "v_unbalance4") + @CompareValue() private Double vUnbalance4; @TableField(value = "v_unbalance5") + @CompareValue() private Double vUnbalance5; @TableField(value = "v_thd1") + @CompareValue() private Double vThd1; @TableField(value = "v_thd2") + @CompareValue() private Double vThd2; @TableField(value = "v_thd3") + @CompareValue() private Double vThd3; @TableField(value = "v_thd4") + @CompareValue() private Double vThd4; @TableField(value = "v_thd5") + @CompareValue() private Double vThd5; @TableField(value = "event1") + @CompareValue() private Double event1; @TableField(value = "event2") + @CompareValue() private Double event2; @TableField(value = "event3") + @CompareValue() private Double event3; @TableField(value = "event4") + @CompareValue() private Double event4; @TableField(value = "event5") + @CompareValue() private Double event5; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataFlickerD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataFlickerD.java index 16b0c20..92ab2c3 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataFlickerD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataFlickerD.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; import java.io.Serializable; @@ -39,12 +40,15 @@ public class RStatDataFlickerD implements Serializable { private Integer qualityFlag; @TableField(value = "fluc") - private Double fluc; + @CompareValue() + private Float fluc; @TableField(value = "plt") - private Double plt; + @CompareValue() + private Float plt; @TableField(value = "pst") - private Double pst; + @CompareValue() + private Float pst; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataHarmrateVD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataHarmrateVD.java index 5da37c6..fe55ce1 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataHarmrateVD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataHarmrateVD.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; import java.io.Serializable; @@ -39,152 +40,202 @@ public class RStatDataHarmrateVD implements Serializable { private Integer qualityFlag; @TableField(value = "v_1") + @CompareValue() private Float v1; @TableField(value = "v_2") + @CompareValue() private Float v2; @TableField(value = "v_3") + @CompareValue() private Float v3; @TableField(value = "v_4") + @CompareValue() private Float v4; @TableField(value = "v_5") + @CompareValue() private Float v5; @TableField(value = "v_6") + @CompareValue() private Float v6; @TableField(value = "v_7") + @CompareValue() private Float v7; @TableField(value = "v_8") + @CompareValue() private Float v8; @TableField(value = "v_9") + @CompareValue() private Float v9; @TableField(value = "v_10") + @CompareValue() private Float v10; @TableField(value = "v_11") + @CompareValue() private Float v11; @TableField(value = "v_12") + @CompareValue() private Float v12; @TableField(value = "v_13") + @CompareValue() private Float v13; @TableField(value = "v_14") + @CompareValue() private Float v14; @TableField(value = "v_15") + @CompareValue() private Float v15; @TableField(value = "v_16") + @CompareValue() private Float v16; @TableField(value = "v_17") + @CompareValue() private Float v17; @TableField(value = "v_18") + @CompareValue() private Float v18; @TableField(value = "v_19") + @CompareValue() private Float v19; @TableField(value = "v_20") + @CompareValue() private Float v20; @TableField(value = "v_21") + @CompareValue() private Float v21; @TableField(value = "v_22") + @CompareValue() private Float v22; @TableField(value = "v_23") + @CompareValue() private Float v23; @TableField(value = "v_24") + @CompareValue() private Float v24; @TableField(value = "v_25") + @CompareValue() private Float v25; @TableField(value = "v_26") + @CompareValue() private Float v26; @TableField(value = "v_27") + @CompareValue() private Float v27; @TableField(value = "v_28") + @CompareValue() private Float v28; @TableField(value = "v_29") + @CompareValue() private Float v29; @TableField(value = "v_30") + @CompareValue() private Float v30; @TableField(value = "v_31") + @CompareValue() private Float v31; @TableField(value = "v_32") + @CompareValue() private Float v32; @TableField(value = "v_33") + @CompareValue() private Float v33; @TableField(value = "v_34") + @CompareValue() private Float v34; @TableField(value = "v_35") + @CompareValue() private Float v35; @TableField(value = "v_36") + @CompareValue() private Float v36; @TableField(value = "v_37") + @CompareValue() private Float v37; @TableField(value = "v_38") + @CompareValue() private Float v38; @TableField(value = "v_39") + @CompareValue() private Float v39; @TableField(value = "v_40") + @CompareValue() private Float v40; @TableField(value = "v_41") + @CompareValue() private Float v41; @TableField(value = "v_42") + @CompareValue() private Float v42; @TableField(value = "v_43") + @CompareValue() private Float v43; @TableField(value = "v_44") + @CompareValue() private Float v44; @TableField(value = "v_45") + @CompareValue() private Float v45; @TableField(value = "v_46") + @CompareValue() private Float v46; @TableField(value = "v_47") + @CompareValue() private Float v47; @TableField(value = "v_48") + @CompareValue() private Float v48; @TableField(value = "v_49") + @CompareValue() private Float v49; @TableField(value = "v_50") + @CompareValue() private Float v50; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataID.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataID.java index 943dbd9..0ab5153 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataID.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataID.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; import java.io.Serializable; @@ -39,171 +40,227 @@ public class RStatDataID implements Serializable { private Integer qualityFlag; @TableField(value = "i_neg") + @CompareValue() private Float iNeg; @TableField(value = "i_pos") + @CompareValue() private Float iPos; @TableField(value = "i_thd") + @CompareValue() private Float iThd; @TableField(value = "i_unbalance") + @CompareValue() private Float iUnbalance; @TableField(value = "i_zero") + @CompareValue() private Float iZero; @TableField(value = "rms") + @CompareValue() private Float rms; @TableField(value = "i_1") + @CompareValue() private Float i1; @TableField(value = "i_2") + @CompareValue() private Float i2; @TableField(value = "i_3") + @CompareValue() private Float i3; @TableField(value = "i_4") + @CompareValue() private Float i4; @TableField(value = "i_5") + @CompareValue() private Float i5; @TableField(value = "i_6") + @CompareValue() private Float i6; @TableField(value = "i_7") + @CompareValue() private Float i7; @TableField(value = "i_8") + @CompareValue() private Float i8; @TableField(value = "i_9") + @CompareValue() private Float i9; @TableField(value = "i_10") + @CompareValue() private Float i10; @TableField(value = "i_11") + @CompareValue() private Float i11; @TableField(value = "i_12") + @CompareValue() private Float i12; @TableField(value = "i_13") + @CompareValue() private Float i13; @TableField(value = "i_14") + @CompareValue() private Float i14; @TableField(value = "i_15") + @CompareValue() private Float i15; @TableField(value = "i_16") + @CompareValue() private Float i16; @TableField(value = "i_17") + @CompareValue() private Float i17; @TableField(value = "i_18") + @CompareValue() private Float i18; @TableField(value = "i_19") + @CompareValue() private Float i19; @TableField(value = "i_20") + @CompareValue() private Float i20; @TableField(value = "i_21") + @CompareValue() private Float i21; @TableField(value = "i_22") + @CompareValue() private Float i22; @TableField(value = "i_23") + @CompareValue() private Float i23; @TableField(value = "i_24") + @CompareValue() private Float i24; @TableField(value = "i_25") + @CompareValue() private Float i25; @TableField(value = "i_26") + @CompareValue() private Float i26; @TableField(value = "i_27") + @CompareValue() private Float i27; @TableField(value = "i_28") + @CompareValue() private Float i28; @TableField(value = "i_29") + @CompareValue() private Float i29; @TableField(value = "i_30") + @CompareValue() private Float i30; @TableField(value = "i_31") + @CompareValue() private Float i31; @TableField(value = "i_32") + @CompareValue() private Float i32; @TableField(value = "i_33") + @CompareValue() private Float i33; @TableField(value = "i_34") + @CompareValue() private Float i34; @TableField(value = "i_35") + @CompareValue() private Float i35; @TableField(value = "i_36") + @CompareValue() private Float i36; @TableField(value = "i_37") + @CompareValue() private Float i37; @TableField(value = "i_38") + @CompareValue() private Float i38; @TableField(value = "i_39") + @CompareValue() private Float i39; @TableField(value = "i_40") + @CompareValue() private Float i40; @TableField(value = "i_41") + @CompareValue() private Float i41; @TableField(value = "i_42") + @CompareValue() private Float i42; @TableField(value = "i_43") + @CompareValue() private Float i43; @TableField(value = "i_44") + @CompareValue() private Float i44; @TableField(value = "i_45") + @CompareValue() private Float i45; @TableField(value = "i_46") + @CompareValue() private Float i46; @TableField(value = "i_47") + @CompareValue() private Float i47; @TableField(value = "i_48") + @CompareValue() private Float i48; @TableField(value = "i_49") + @CompareValue() private Float i49; @TableField(value = "i_50") + @CompareValue() private Float i50; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataInharmVD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataInharmVD.java index a977524..97c0138 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataInharmVD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataInharmVD.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; import java.io.Serializable; @@ -39,153 +40,203 @@ public class RStatDataInharmVD implements Serializable { private Integer qualityFlag; @TableField(value = "v_1") - private Double v1; + @CompareValue() + private Float v1; @TableField(value = "v_2") - private Double v2; + @CompareValue() + private Float v2; @TableField(value = "v_3") - private Double v3; + @CompareValue() + private Float v3; @TableField(value = "v_4") - private Double v4; + @CompareValue() + private Float v4; @TableField(value = "v_5") - private Double v5; + @CompareValue() + private Float v5; @TableField(value = "v_6") - private Double v6; + @CompareValue() + private Float v6; @TableField(value = "v_7") - private Double v7; + @CompareValue() + private Float v7; @TableField(value = "v_8") - private Double v8; + @CompareValue() + private Float v8; @TableField(value = "v_9") - private Double v9; + @CompareValue() + private Float v9; @TableField(value = "v_10") - private Double v10; + @CompareValue() + private Float v10; @TableField(value = "v_11") - private Double v11; + @CompareValue() + private Float v11; @TableField(value = "v_12") - private Double v12; + @CompareValue() + private Float v12; @TableField(value = "v_13") - private Double v13; + @CompareValue() + private Float v13; @TableField(value = "v_14") - private Double v14; + @CompareValue() + private Float v14; @TableField(value = "v_15") - private Double v15; + @CompareValue() + private Float v15; @TableField(value = "v_16") - private Double v16; + @CompareValue() + private Float v16; @TableField(value = "v_17") - private Double v17; + @CompareValue() + private Float v17; @TableField(value = "v_18") - private Double v18; + @CompareValue() + private Float v18; @TableField(value = "v_19") - private Double v19; + @CompareValue() + private Float v19; @TableField(value = "v_20") - private Double v20; + @CompareValue() + private Float v20; @TableField(value = "v_21") - private Double v21; + @CompareValue() + private Float v21; @TableField(value = "v_22") - private Double v22; + @CompareValue() + private Float v22; @TableField(value = "v_23") - private Double v23; + @CompareValue() + private Float v23; @TableField(value = "v_24") - private Double v24; + @CompareValue() + private Float v24; @TableField(value = "v_25") - private Double v25; + @CompareValue() + private Float v25; @TableField(value = "v_26") - private Double v26; + @CompareValue() + private Float v26; @TableField(value = "v_27") - private Double v27; + @CompareValue() + private Float v27; @TableField(value = "v_28") - private Double v28; + @CompareValue() + private Float v28; @TableField(value = "v_29") - private Double v29; + @CompareValue() + private Float v29; @TableField(value = "v_30") - private Double v30; + @CompareValue() + private Float v30; @TableField(value = "v_31") - private Double v31; + @CompareValue() + private Float v31; @TableField(value = "v_32") - private Double v32; + @CompareValue() + private Float v32; @TableField(value = "v_33") - private Double v33; + @CompareValue() + private Float v33; @TableField(value = "v_34") - private Double v34; + @CompareValue() + private Float v34; @TableField(value = "v_35") - private Double v35; + @CompareValue() + private Float v35; @TableField(value = "v_36") - private Double v36; + @CompareValue() + private Float v36; @TableField(value = "v_37") - private Double v37; + @CompareValue() + private Float v37; @TableField(value = "v_38") - private Double v38; + @CompareValue() + private Float v38; @TableField(value = "v_39") - private Double v39; + @CompareValue() + private Float v39; @TableField(value = "v_40") - private Double v40; + @CompareValue() + private Float v40; @TableField(value = "v_41") - private Double v41; + @CompareValue() + private Float v41; @TableField(value = "v_42") - private Double v42; + @CompareValue() + private Float v42; @TableField(value = "v_43") - private Double v43; + @CompareValue() + private Float v43; @TableField(value = "v_44") - private Double v44; + @CompareValue() + private Float v44; @TableField(value = "v_45") - private Double v45; + @CompareValue() + private Float v45; @TableField(value = "v_46") - private Double v46; + @CompareValue() + private Float v46; @TableField(value = "v_47") - private Double v47; + @CompareValue() + private Float v47; @TableField(value = "v_48") - private Double v48; + @CompareValue() + private Float v48; @TableField(value = "v_49") - private Double v49; + @CompareValue() + private Float v49; @TableField(value = "v_50") - private Double v50; + @CompareValue() + private Float v50; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataPltD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataPltD.java index c5ecae0..d3fa1ee 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataPltD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataPltD.java @@ -3,8 +3,10 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; +import javax.validation.constraints.Max; import java.io.Serializable; import java.time.LocalDate; @@ -39,6 +41,7 @@ public class RStatDataPltD implements Serializable { private Integer qualityFlag; @TableField(value = "plt") - private Double plt; + @CompareValue() + private Float plt; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataVD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataVD.java index b96025f..f072731 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataVD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatDataVD.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.Data; import java.io.Serializable; @@ -39,186 +40,247 @@ public class RStatDataVD implements Serializable { private Integer qualityFlag; @TableField(value = "freq") + @CompareValue() private Float freq; @TableField(value = "freq_dev") + @CompareValue() private Float freqDev; @TableField(value = "rms") + @CompareValue() private Float rms; @TableField(value = "rms_lvr") + @CompareValue() private Float rmsLvr; @TableField(value = "v_neg") + @CompareValue() private Float vNeg; @TableField(value = "v_pos") + @CompareValue() private Float vPos; @TableField(value = "v_thd") + @CompareValue() private Float vThd; @TableField(value = "v_unbalance") + @CompareValue() private Float vUnbalance; @TableField(value = "v_zero") + @CompareValue() private Float vZero; @TableField(value = "vl_dev") + @CompareValue() private Float vlDev; @TableField(value = "vu_dev") + @CompareValue() private Float vuDev; @TableField(value = "v_1") + @CompareValue() private Float v1; @TableField(value = "v_2") + @CompareValue() private Float v2; @TableField(value = "v_3") + @CompareValue() private Float v3; @TableField(value = "v_4") + @CompareValue() private Float v4; @TableField(value = "v_5") + @CompareValue() private Float v5; @TableField(value = "v_6") + @CompareValue() private Float v6; @TableField(value = "v_7") + @CompareValue() private Float v7; @TableField(value = "v_8") + @CompareValue() private Float v8; @TableField(value = "v_9") + @CompareValue() private Float v9; @TableField(value = "v_10") + @CompareValue() private Float v10; @TableField(value = "v_11") + @CompareValue() private Float v11; @TableField(value = "v_12") + @CompareValue() private Float v12; @TableField(value = "v_13") + @CompareValue() private Float v13; @TableField(value = "v_14") + @CompareValue() private Float v14; @TableField(value = "v_15") + @CompareValue() private Float v15; @TableField(value = "v_16") + @CompareValue() private Float v16; @TableField(value = "v_17") + @CompareValue() private Float v17; @TableField(value = "v_18") + @CompareValue() private Float v18; @TableField(value = "v_19") + @CompareValue() private Float v19; @TableField(value = "v_20") + @CompareValue() private Float v20; @TableField(value = "v_21") + @CompareValue() private Float v21; @TableField(value = "v_22") + @CompareValue() private Float v22; @TableField(value = "v_23") + @CompareValue() private Float v23; @TableField(value = "v_24") + @CompareValue() private Float v24; @TableField(value = "v_25") + @CompareValue() private Float v25; @TableField(value = "v_26") + @CompareValue() private Float v26; @TableField(value = "v_27") + @CompareValue() private Float v27; @TableField(value = "v_28") + @CompareValue() private Float v28; @TableField(value = "v_29") + @CompareValue() private Float v29; @TableField(value = "v_30") + @CompareValue() private Float v30; @TableField(value = "v_31") + @CompareValue() private Float v31; @TableField(value = "v_32") + @CompareValue() private Float v32; @TableField(value = "v_33") + @CompareValue() private Float v33; @TableField(value = "v_34") + @CompareValue() private Float v34; @TableField(value = "v_35") + @CompareValue() private Float v35; @TableField(value = "v_36") + @CompareValue() private Float v36; @TableField(value = "v_37") + @CompareValue() private Float v37; @TableField(value = "v_38") + @CompareValue() private Float v38; @TableField(value = "v_39") + @CompareValue() private Float v39; @TableField(value = "v_40") + @CompareValue() private Float v40; @TableField(value = "v_41") + @CompareValue() private Float v41; @TableField(value = "v_42") + @CompareValue() private Float v42; @TableField(value = "v_43") + @CompareValue() private Float v43; @TableField(value = "v_44") + @CompareValue() private Float v44; @TableField(value = "v_45") + @CompareValue() private Float v45; @TableField(value = "v_46") + @CompareValue() private Float v46; @TableField(value = "v_47") + @CompareValue() private Float v47; @TableField(value = "v_48") + @CompareValue() private Float v48; @TableField(value = "v_49") + @CompareValue() private Float v49; @TableField(value = "v_50") + @CompareValue() private Float v50; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitRateD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitRateD.java index 0bf255b..8627f7c 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitRateD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitRateD.java @@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -41,48 +42,56 @@ public class RStatLimitRateD { * 总计算次数 */ @TableField(value = "all_time") + @CompareValue() private Integer allTime; /** * 闪变越限次数 */ @TableField(value = "flicker_overtime") + @CompareValue() private Integer flickerOvertime; /** * 闪变总计算次数 */ @TableField(value = "flicker_all_time") + @CompareValue() private Integer flickerAllTime; /** * 频率偏差越限次数 */ @TableField(value = "freq_dev_overtime") + @CompareValue() private Integer freqDevOvertime; /** * 电压偏差越限次数 */ @TableField(value = "voltage_dev_overtime") + @CompareValue() private Integer voltageDevOvertime; /** * 三相电压不平衡度越限次数 */ @TableField(value = "ubalance_overtime") + @CompareValue() private Integer ubalanceOvertime; /** * 电压谐波畸变率越限次数 */ @TableField(value = "uaberrance_overtime") + @CompareValue() private Integer uaberranceOvertime; /** * 负序电流限值次数 */ @TableField(value = "i_neg_overtime") + @CompareValue() private Integer iNegOvertime; /** @@ -90,6 +99,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_2_overtime") + @CompareValue() private Integer uharm2Overtime; /** @@ -97,6 +107,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_3_overtime") + @CompareValue() private Integer uharm3Overtime; /** @@ -104,6 +115,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_4_overtime") + @CompareValue() private Integer uharm4Overtime; /** @@ -111,6 +123,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_5_overtime") + @CompareValue() private Integer uharm5Overtime; /** @@ -118,6 +131,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_6_overtime") + @CompareValue() private Integer uharm6Overtime; /** @@ -125,6 +139,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_7_overtime") + @CompareValue() private Integer uharm7Overtime; /** @@ -132,6 +147,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_8_overtime") + @CompareValue() private Integer uharm8Overtime; /** @@ -139,6 +155,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_9_overtime") + @CompareValue() private Integer uharm9Overtime; /** @@ -146,6 +163,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_10_overtime") + @CompareValue() private Integer uharm10Overtime; /** @@ -153,6 +171,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_11_overtime") + @CompareValue() private Integer uharm11Overtime; /** @@ -160,6 +179,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_12_overtime") + @CompareValue() private Integer uharm12Overtime; /** @@ -167,6 +187,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_13_overtime") + @CompareValue() private Integer uharm13Overtime; /** @@ -174,6 +195,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_14_overtime") + @CompareValue() private Integer uharm14Overtime; /** @@ -181,6 +203,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_15_overtime") + @CompareValue() private Integer uharm15Overtime; /** @@ -188,6 +211,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_16_overtime") + @CompareValue() private Integer uharm16Overtime; /** @@ -195,6 +219,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_17_overtime") + @CompareValue() private Integer uharm17Overtime; /** @@ -202,6 +227,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_18_overtime") + @CompareValue() private Integer uharm18Overtime; /** @@ -209,6 +235,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_19_overtime") + @CompareValue() private Integer uharm19Overtime; /** @@ -216,6 +243,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_20_overtime") + @CompareValue() private Integer uharm20Overtime; /** @@ -223,6 +251,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_21_overtime") + @CompareValue() private Integer uharm21Overtime; /** @@ -230,6 +259,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_22_overtime") + @CompareValue() private Integer uharm22Overtime; /** @@ -237,6 +267,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_23_overtime") + @CompareValue() private Integer uharm23Overtime; /** @@ -244,6 +275,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_24_overtime") + @CompareValue() private Integer uharm24Overtime; /** @@ -251,6 +283,7 @@ public class RStatLimitRateD { */ @TableField(value = "uharm_25_overtime") + @CompareValue() private Integer uharm25Overtime; /** @@ -258,6 +291,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_2_overtime") + @CompareValue() private Integer iharm2Overtime; /** @@ -265,6 +299,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_3_overtime") + @CompareValue() private Integer iharm3Overtime; /** @@ -272,6 +307,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_4_overtime") + @CompareValue() private Integer iharm4Overtime; /** @@ -279,6 +315,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_5_overtime") + @CompareValue() private Integer iharm5Overtime; /** @@ -286,6 +323,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_6_overtime") + @CompareValue() private Integer iharm6Overtime; /** @@ -293,6 +331,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_7_overtime") + @CompareValue() private Integer iharm7Overtime; /** @@ -300,6 +339,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_8_overtime") + @CompareValue() private Integer iharm8Overtime; /** @@ -307,6 +347,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_9_overtime") + @CompareValue() private Integer iharm9Overtime; /** @@ -314,6 +355,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_10_overtime") + @CompareValue() private Integer iharm10Overtime; /** @@ -321,6 +363,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_11_overtime") + @CompareValue() private Integer iharm11Overtime; /** @@ -328,6 +371,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_12_overtime") + @CompareValue() private Integer iharm12Overtime; /** @@ -335,6 +379,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_13_overtime") + @CompareValue() private Integer iharm13Overtime; /** @@ -342,6 +387,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_14_overtime") + @CompareValue() private Integer iharm14Overtime; /** @@ -349,6 +395,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_15_overtime") + @CompareValue() private Integer iharm15Overtime; /** @@ -356,6 +403,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_16_overtime") + @CompareValue() private Integer iharm16Overtime; /** @@ -363,6 +411,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_17_overtime") + @CompareValue() private Integer iharm17Overtime; /** @@ -370,6 +419,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_18_overtime") + @CompareValue() private Integer iharm18Overtime; /** @@ -377,6 +427,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_19_overtime") + @CompareValue() private Integer iharm19Overtime; /** @@ -384,6 +435,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_20_overtime") + @CompareValue() private Integer iharm20Overtime; /** @@ -391,6 +443,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_21_overtime") + @CompareValue() private Integer iharm21Overtime; /** @@ -398,6 +451,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_22_overtime") + @CompareValue() private Integer iharm22Overtime; /** @@ -405,6 +459,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_23_overtime") + @CompareValue() private Integer iharm23Overtime; /** @@ -412,6 +467,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_24_overtime") + @CompareValue() private Integer iharm24Overtime; /** @@ -419,6 +475,7 @@ public class RStatLimitRateD { */ @TableField(value = "iharm_25_overtime") + @CompareValue() private Integer iharm25Overtime; /** @@ -426,6 +483,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_1_overtime") + @CompareValue() private Integer inuharm1Overtime; /** @@ -433,6 +491,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_2_overtime") + @CompareValue() private Integer inuharm2Overtime; /** @@ -440,6 +499,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_3_overtime") + @CompareValue() private Integer inuharm3Overtime; /** @@ -447,6 +507,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_4_overtime") + @CompareValue() private Integer inuharm4Overtime; /** @@ -454,6 +515,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_5_overtime") + @CompareValue() private Integer inuharm5Overtime; /** @@ -461,6 +523,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_6_overtime") + @CompareValue() private Integer inuharm6Overtime; /** @@ -468,6 +531,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_7_overtime") + @CompareValue() private Integer inuharm7Overtime; /** @@ -475,6 +539,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_8_overtime") + @CompareValue() private Integer inuharm8Overtime; /** @@ -482,6 +547,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_9_overtime") + @CompareValue() private Integer inuharm9Overtime; /** @@ -489,6 +555,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_10_overtime") + @CompareValue() private Integer inuharm10Overtime; /** @@ -496,6 +563,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_11_overtime") + @CompareValue() private Integer inuharm11Overtime; /** @@ -503,6 +571,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_12_overtime") + @CompareValue() private Integer inuharm12Overtime; /** @@ -510,6 +579,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_13_overtime") + @CompareValue() private Integer inuharm13Overtime; /** @@ -517,6 +587,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_14_overtime") + @CompareValue() private Integer inuharm14Overtime; /** @@ -524,6 +595,7 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_15_overtime") + @CompareValue() private Integer inuharm15Overtime; /** @@ -531,5 +603,6 @@ public class RStatLimitRateD { */ @TableField(value = "inuharm_16_overtime") + @CompareValue() private Integer inuharm16Overtime; } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitTargetD.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitTargetD.java index ea07d20..c7b0d87 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitTargetD.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/po/RStatLimitTargetD.java @@ -3,6 +3,7 @@ package com.njcn.mysql.bo.po; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.github.jeffreyning.mybatisplus.anno.MppMultiId; +import com.njcn.mysql.bo.util.CompareValue; import lombok.AllArgsConstructor; import lombok.Data; import lombok.NoArgsConstructor; @@ -39,431 +40,503 @@ public class RStatLimitTargetD { * 总计算次数 */ @TableField(value = "all_time") + @CompareValue() private Integer allTime; /** * 闪变总计算次数 */ @TableField(value = "flicker_all_time") + @CompareValue() private Integer flickerAllTime; /** * 闪变越限次数 */ @TableField(value = "flicker_overtime") + @CompareValue() private Integer flickerOvertime; /** * 频率偏差越限次数 */ @TableField(value = "freq_dev_overtime") + @CompareValue() private Integer freqDevOvertime; /** * 电压偏差越限次数 */ @TableField(value = "voltage_dev_overtime") + @CompareValue() private Integer voltageDevOvertime; /** * 电压不平衡度越限次数 */ @TableField(value = "ubalance_overtime") + @CompareValue() private Integer ubalanceOvertime; /** * 电压谐波畸变率越限次数 */ @TableField(value = "uaberrance_overtime") + @CompareValue() private Integer uaberranceOvertime; /** * 负序电流限值次数 */ @TableField(value = "i_neg_overtime") + @CompareValue() private Integer iNegOvertime; /** * 2次电压谐波含有率越限次数 */ @TableField(value = "uharm_2_overtime") + @CompareValue() private Integer uharm2Overtime; /** * 3次电压谐波含有率越限次数 */ @TableField(value = "uharm_3_overtime") + @CompareValue() private Integer uharm3Overtime; /** * 4次电压谐波含有率越限次数 */ @TableField(value = "uharm_4_overtime") + @CompareValue() private Integer uharm4Overtime; /** * 5次电压谐波含有率越限次数 */ @TableField(value = "uharm_5_overtime") + @CompareValue() private Integer uharm5Overtime; /** * 6次电压谐波含有率越限次数 */ @TableField(value = "uharm_6_overtime") + @CompareValue() private Integer uharm6Overtime; /** * 7次电压谐波含有率越限次数 */ @TableField(value = "uharm_7_overtime") + @CompareValue() private Integer uharm7Overtime; /** * 8次电压谐波含有率越限次数 */ @TableField(value = "uharm_8_overtime") + @CompareValue() private Integer uharm8Overtime; /** * 9次电压谐波含有率越限次数 */ @TableField(value = "uharm_9_overtime") + @CompareValue() private Integer uharm9Overtime; /** * 10次电压谐波含有率越限次数 */ @TableField(value = "uharm_10_overtime") + @CompareValue() private Integer uharm10Overtime; /** * 11次电压谐波含有率越限次数 */ @TableField(value = "uharm_11_overtime") + @CompareValue() private Integer uharm11Overtime; /** * 12次电压谐波含有率越限次数 */ @TableField(value = "uharm_12_overtime") + @CompareValue() private Integer uharm12Overtime; /** * 13次电压谐波含有率越限次数 */ @TableField(value = "uharm_13_overtime") + @CompareValue() private Integer uharm13Overtime; /** * 14次电压谐波含有率越限次数 */ @TableField(value = "uharm_14_overtime") + @CompareValue() private Integer uharm14Overtime; /** * 15次电压谐波含有率越限次数 */ @TableField(value = "uharm_15_overtime") + @CompareValue() private Integer uharm15Overtime; /** * 16次电压谐波含有率越限次数 */ @TableField(value = "uharm_16_overtime") + @CompareValue() private Integer uharm16Overtime; /** * 17次电压谐波含有率越限次数 */ @TableField(value = "uharm_17_overtime") + @CompareValue() private Integer uharm17Overtime; /** * 18次电压谐波含有率越限次数 */ @TableField(value = "uharm_18_overtime") + @CompareValue() private Integer uharm18Overtime; /** * 19次电压谐波含有率越限次数 */ @TableField(value = "uharm_19_overtime") + @CompareValue() private Integer uharm19Overtime; /** * 20次电压谐波含有率越限次数 */ @TableField(value = "uharm_20_overtime") + @CompareValue() private Integer uharm20Overtime; /** * 21次电压谐波含有率越限次数 */ @TableField(value = "uharm_21_overtime") + @CompareValue() private Integer uharm21Overtime; /** * 22次电压谐波含有率越限次数 */ @TableField(value = "uharm_22_overtime") + @CompareValue() private Integer uharm22Overtime; /** * 23次电压谐波含有率越限次数 */ @TableField(value = "uharm_23_overtime") + @CompareValue() private Integer uharm23Overtime; /** * 24次电压谐波含有率越限次数 */ @TableField(value = "uharm_24_overtime") + @CompareValue() private Integer uharm24Overtime; /** * 25次电压谐波含有率越限次数 */ @TableField(value = "uharm_25_overtime") + @CompareValue() private Integer uharm25Overtime; /** * 2次电流谐波幅值越限次数 */ @TableField(value = "iharm_2_overtime") + @CompareValue() private Integer iharm2Overtime; /** * 3次电流谐波幅值越限次数 */ @TableField(value = "iharm_3_overtime") + @CompareValue() private Integer iharm3Overtime; /** * 4次电流谐波幅值越限次数 */ @TableField(value = "iharm_4_overtime") + @CompareValue() private Integer iharm4Overtime; /** * 5次电流谐波幅值越限次数 */ @TableField(value = "iharm_5_overtime") + @CompareValue() private Integer iharm5Overtime; /** * 6次电流谐波幅值越限次数 */ @TableField(value = "iharm_6_overtime") + @CompareValue() private Integer iharm6Overtime; /** * 7次电流谐波幅值越限次数 */ @TableField(value = "iharm_7_overtime") + @CompareValue() private Integer iharm7Overtime; /** * 8次电流谐波幅值越限次数 */ @TableField(value = "iharm_8_overtime") + @CompareValue() private Integer iharm8Overtime; /** * 9次电流谐波幅值越限次数 */ @TableField(value = "iharm_9_overtime") + @CompareValue() private Integer iharm9Overtime; /** * 10次电流谐波幅值越限次数 */ @TableField(value = "iharm_10_overtime") + @CompareValue() private Integer iharm10Overtime; /** * 11次电流谐波幅值越限次数 */ @TableField(value = "iharm_11_overtime") + @CompareValue() private Integer iharm11Overtime; /** * 12次电流谐波幅值越限次数 */ @TableField(value = "iharm_12_overtime") + @CompareValue() private Integer iharm12Overtime; /** * 13次电流谐波幅值越限次数 */ @TableField(value = "iharm_13_overtime") + @CompareValue() private Integer iharm13Overtime; /** * 14次电流谐波幅值越限次数 */ @TableField(value = "iharm_14_overtime") + @CompareValue() private Integer iharm14Overtime; /** * 15次电流谐波幅值越限次数 */ @TableField(value = "iharm_15_overtime") + @CompareValue() private Integer iharm15Overtime; /** * 16次电流谐波幅值越限次数 */ @TableField(value = "iharm_16_overtime") + @CompareValue() private Integer iharm16Overtime; /** * 17次电流谐波幅值越限次数 */ @TableField(value = "iharm_17_overtime") + @CompareValue() private Integer iharm17Overtime; /** * 18次电流谐波幅值越限次数 */ @TableField(value = "iharm_18_overtime") + @CompareValue() private Integer iharm18Overtime; /** * 19次电流谐波幅值越限次数 */ @TableField(value = "iharm_19_overtime") + @CompareValue() private Integer iharm19Overtime; /** * 20次电流谐波幅值越限次数 */ @TableField(value = "iharm_20_overtime") + @CompareValue() private Integer iharm20Overtime; /** * 21次电流谐波幅值越限次数 */ @TableField(value = "iharm_21_overtime") + @CompareValue() private Integer iharm21Overtime; /** * 22次电流谐波幅值越限次数 */ @TableField(value = "iharm_22_overtime") + @CompareValue() private Integer iharm22Overtime; /** * 23次电流谐波幅值越限次数 */ @TableField(value = "iharm_23_overtime") + @CompareValue() private Integer iharm23Overtime; /** * 24次电流谐波幅值越限次数 */ @TableField(value = "iharm_24_overtime") + @CompareValue() private Integer iharm24Overtime; /** * 25次电流谐波幅值越限次数 */ @TableField(value = "iharm_25_overtime") + @CompareValue() private Integer iharm25Overtime; /** * 0.5次间谐波电压限值次数 */ @TableField(value = "inuharm_1_overtime") + @CompareValue() private Integer inuharm1Overtime; /** * 1.5次间谐波电压限值次数 */ @TableField(value = "inuharm_2_overtime") + @CompareValue() private Integer inuharm2Overtime; /** * 2.5次间谐波电压限值次数 */ @TableField(value = "inuharm_3_overtime") + @CompareValue() private Integer inuharm3Overtime; /** * 3.5次间谐波电压限值次数 */ @TableField(value = "inuharm_4_overtime") + @CompareValue() private Integer inuharm4Overtime; /** * 4.5次间谐波电压限值次数 */ @TableField(value = "inuharm_5_overtime") + @CompareValue() private Integer inuharm5Overtime; /** * 5.5次间谐波电压限值次数 */ @TableField(value = "inuharm_6_overtime") + @CompareValue() private Integer inuharm6Overtime; /** * 6.5次间谐波电压限值次数 */ @TableField(value = "inuharm_7_overtime") + @CompareValue() private Integer inuharm7Overtime; /** * 7.5次间谐波电压限值次数 */ @TableField(value = "inuharm_8_overtime") + @CompareValue() private Integer inuharm8Overtime; /** * 8.5次间谐波电压限值次数 */ @TableField(value = "inuharm_9_overtime") + @CompareValue() private Integer inuharm9Overtime; /** * 9.5次间谐波电压限值次数 */ @TableField(value = "inuharm_10_overtime") + @CompareValue() private Integer inuharm10Overtime; /** * 10.5次间谐波电压限值次数 */ @TableField(value = "inuharm_11_overtime") + @CompareValue() private Integer inuharm11Overtime; /** * 11.5次间谐波电压限值次数 */ @TableField(value = "inuharm_12_overtime") + @CompareValue() private Integer inuharm12Overtime; /** * 12.5次间谐波电压限值次数 */ @TableField(value = "inuharm_13_overtime") + @CompareValue() private Integer inuharm13Overtime; /** * 13.5次间谐波电压限值次数 */ @TableField(value = "inuharm_14_overtime") + @CompareValue() private Integer inuharm14Overtime; /** * 14.5次间谐波电压限值次数 */ @TableField(value = "inuharm_15_overtime") + @CompareValue() private Integer inuharm15Overtime; /** * 15.5次间谐波电压限值次数 */ @TableField(value = "inuharm_16_overtime") + @CompareValue() private Integer inuharm16Overtime; } \ No newline at end of file diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/util/CompareValue.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/util/CompareValue.java new file mode 100644 index 0000000..e39023c --- /dev/null +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/bo/util/CompareValue.java @@ -0,0 +1,13 @@ +package com.njcn.mysql.bo.util; + +import java.lang.annotation.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Target(ElementType.FIELD) +@Retention(RetentionPolicy.RUNTIME) +public @interface CompareValue { + float maxValue() default 999999.0f; + float minValue() default -999999.0f; +} \ No newline at end of file diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java index b97c405..7c3123b 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/OracleDataService.java @@ -1,6 +1,7 @@ package com.njcn.mysql.service; import com.njcn.oracle.bo.po.*; +import com.njcn.oracle.mapper.DayInharmVMapper; import java.util.List; @@ -59,4 +60,25 @@ public interface OracleDataService { * @return */ List getDayI(String time); + + /** + * 查询oracle中DAY_PLT数据 + * @param time + * @return + */ + List getDayPlt(String time); + + /** + * 查询oracle中DAY_FLICKER数据 + * @param time + * @return + */ + List getDayFlicker(String time); + + /** + * 查询oracle中DAY_INHARM_V数据 + * @param time + * @return + */ + List getDayInHarmV(String time); } diff --git a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java index 0aec736..38c9a40 100644 --- a/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java +++ b/mysql-data/mysql-source/src/main/java/com/njcn/mysql/service/impl/OracleDataServiceImpl.java @@ -23,10 +23,14 @@ public class OracleDataServiceImpl implements OracleDataService { private final PqsComAssesMapper pqsComAssesMapper; private final PqsAssesMapper pqsAssesMapper; private final DayIMapper dayIMapper; - private final LimitRateMapper limitRateMapper; - private final LimitTargetMapper limitTargetMapper; + private final DayPltMapper dayPltMapper; + private final DayFlickerMapper dayFlickerMapper; + private final DayInharmVMapper dayInharmVMapper; + + + @Override public List getDayHarmRate(String time) { @@ -83,4 +87,25 @@ public class OracleDataServiceImpl implements OracleDataService { lambdaQueryWrapper.apply("TIMEID = to_date({0},'yyyy-mm-dd')",time); return dayIMapper.selectList(lambdaQueryWrapper); } + + @Override + public List getDayPlt(String time) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.apply("TIMEID = to_date({0},'yyyy-mm-dd')",time); + return dayPltMapper.selectList(lambdaQueryWrapper); + } + + @Override + public List getDayFlicker(String time) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.apply("TIMEID = to_date({0},'yyyy-mm-dd')",time); + return dayFlickerMapper.selectList(lambdaQueryWrapper); + } + + @Override + public List getDayInHarmV(String time) { + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.apply("TIMEID = to_date({0},'yyyy-mm-dd')",time); + return dayInharmVMapper.selectList(lambdaQueryWrapper); + } } diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java index 40d7d40..3270ba9 100644 --- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/controller/OracleToMysqlController.java @@ -2,11 +2,14 @@ package com.njcn.mysql.controller; import cn.hutool.core.date.DatePattern; import cn.hutool.core.date.LocalDateTimeUtil; +import com.njcn.mysql.bo.po.RStatDataPltD; import com.njcn.mysql.service.OracleToMysqlService; +import com.njcn.mysql.util.MaxValueProcessor; import com.njcn.oracle.bo.param.DataAsynParam; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; +import lombok.Data; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.GetMapping; @@ -95,7 +98,7 @@ public class OracleToMysqlController { } @GetMapping("/dayISync") - @ApiOperation("day_v转成r_stat_data_i_d") + @ApiOperation("day_i转成r_stat_data_i_d") public Boolean dayISync(@RequestParam("startDateTime")String startDateTime, @RequestParam("endDateTime")String endDateTime) { DataAsynParam dataAsynParam = new DataAsynParam(); dataAsynParam.setStartDateTime(LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATE_PATTERN)); @@ -103,4 +106,49 @@ public class OracleToMysqlController { oracleToMysqlService.insertDataI(startDateTime,endDateTime); return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步"); } + + @GetMapping("/dayPltSync") + @ApiOperation("day_plt转成r_stat_data_plt_d") + public Boolean dayPltSync(@RequestParam("startDateTime")String startDateTime, @RequestParam("endDateTime")String endDateTime) { + DataAsynParam dataAsynParam = new DataAsynParam(); + dataAsynParam.setStartDateTime(LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATE_PATTERN)); + dataAsynParam.setEndDateTime(LocalDateTimeUtil.parse(endDateTime, DatePattern.NORM_DATE_PATTERN)); + oracleToMysqlService.insertPlt(startDateTime,endDateTime); + return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步"); + } + + @GetMapping("/dayFlickerSync") + @ApiOperation("day_flicker转成r_stat_data_flicker_d") + public Boolean dayFlickerSync(@RequestParam("startDateTime")String startDateTime, @RequestParam("endDateTime")String endDateTime) { + DataAsynParam dataAsynParam = new DataAsynParam(); + dataAsynParam.setStartDateTime(LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATE_PATTERN)); + dataAsynParam.setEndDateTime(LocalDateTimeUtil.parse(endDateTime, DatePattern.NORM_DATE_PATTERN)); + oracleToMysqlService.insertFlicker(startDateTime,endDateTime); + return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步"); + } + + + @GetMapping("/dayInHarmVSync") + @ApiOperation("day_inharm_v转成r_stat_data_inharm_v_d") + public Boolean dayInHarmVSync(@RequestParam("startDateTime")String startDateTime, @RequestParam("endDateTime")String endDateTime) { + DataAsynParam dataAsynParam = new DataAsynParam(); + dataAsynParam.setStartDateTime(LocalDateTimeUtil.parse(startDateTime, DatePattern.NORM_DATE_PATTERN)); + dataAsynParam.setEndDateTime(LocalDateTimeUtil.parse(endDateTime, DatePattern.NORM_DATE_PATTERN)); + oracleToMysqlService.insertInHarmV(startDateTime,endDateTime); + return true;// HttpResultUtil.assembleCommonResponseResult(CommonResponseEnum.SUCCESS, true, "数据同步"); + } + + + public static void main(String[] args) { + RStatDataPltD user = new RStatDataPltD(); + user.setPlt(1101111.0f); + try { + MaxValueProcessor.process(user); + System.out.println(user.getPlt()); + } catch (Exception e) { + System.out.println("Validation failed: " + e.getMessage()); + } + } + + } diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java new file mode 100644 index 0000000..74b63cb --- /dev/null +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/job/OracleToMysqlDBJob.java @@ -0,0 +1,52 @@ +package com.njcn.mysql.job; + +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import cn.hutool.core.date.LocalDateTimeUtil; +import com.njcn.mysql.service.OracleToMysqlService; +import lombok.RequiredArgsConstructor; +import lombok.extern.slf4j.Slf4j; +import org.springframework.scheduling.annotation.EnableScheduling; +import org.springframework.scheduling.annotation.Scheduled; +import org.springframework.stereotype.Component; + +import java.time.LocalDateTime; +import java.time.temporal.ChronoUnit; + + +/** + * Description: + * Date: 2024/1/18 10:15【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +@Component +@EnableScheduling +@RequiredArgsConstructor +@Slf4j +public class OracleToMysqlDBJob { + + private final OracleToMysqlService oracleToMysqlService; + + + @Scheduled(cron="0 0 7 * * ?") + public void executeEvent() { + // 获取当前时间 + String date = DateUtil.format(LocalDateTime.now(), DatePattern.NORM_DATE_PATTERN); + System.out.println("-----------------------------------------------------------------------"); + oracleToMysqlService.insertDayHarmRateV(date,date); + oracleToMysqlService.insertPqsIntegrity(date,date); + oracleToMysqlService.insertDayV(date,date); + oracleToMysqlService.insertLimitRate(date,date); + oracleToMysqlService.insertLimitTarget(date,date); + oracleToMysqlService.insertComAsses(date,date); + oracleToMysqlService.insertAsses(date,date); + oracleToMysqlService.insertDataI(date,date); + oracleToMysqlService.insertPlt(date,date); + oracleToMysqlService.insertFlicker(date,date); + oracleToMysqlService.insertInHarmV(date,date); + System.out.println("-----------------------------------------------------------------------\n"); + } + +} diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java index ce298da..f119039 100644 --- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/OracleToMysqlServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.util.ObjUtil; import com.njcn.mysql.bo.enums.TargetEnum; import com.njcn.mysql.bo.po.*; import com.njcn.mysql.service.*; +import com.njcn.mysql.util.MaxValueProcessor; import com.njcn.mysql.util.PubUtils; import com.njcn.oracle.bo.po.*; import lombok.AllArgsConstructor; @@ -32,8 +33,10 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { private final IRStatAssesDService statAssesDService; private final IRStatDataIDService statDataIDService; private final IRStatLimitRateDService rLimitRateDService; - private final IRStatLimitTargetDService rStatLimitTargetDService; + private final IRStatDataPltDService statDataPltDService; + private final IRStatDataFlickerDService statDataFlickerDService; + private final IRStatDataInharmVDService statDataInharmVDService; @Override @@ -43,7 +46,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item->{ - System.out.println("当前执行日期:"+ item); + System.out.println("insertDayHarmRateV->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List list = oracleDataService.getDayHarmRate(item); @@ -61,17 +64,21 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { RStatDataHarmrateVD po4 = getData1(data,oracleRelationMysql,"CP95"); PubUtils.setValuesUsingReflection(po4,data,true,"getV","setV","Cp95"); + MaxValueProcessor.process(po1); + MaxValueProcessor.process(po2); + MaxValueProcessor.process(po3); + MaxValueProcessor.process(po4); result.addAll(Arrays.asList(po1,po2,po3,po4)); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertDayHarmRateV->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ rStatDataHarmRateVDService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertDayHarmRateV->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -84,7 +91,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); ZoneId zoneId = ZoneId.systemDefault(); timeList.forEach(item->{ - System.out.println("当前执行日期:"+ item); + System.out.println("insertPqsIntegrity->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List list = oracleDataService.getPqsIntegrity(item); @@ -96,17 +103,18 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po.setLineIndex(oracleRelationMysql.get(data.getLineIndex())); po.setDueTime(data.getDue()); po.setRealTime(data.getReal()); + MaxValueProcessor.process(po); result.add(po); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertPqsIntegrity->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ integrityService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertPqsIntegrity->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -118,7 +126,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item->{ - System.out.println("当前执行日期:"+ item); + System.out.println("insertDayV->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List list = oracleDataService.getDayV(item); @@ -175,17 +183,21 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po4.setRmsLvr(0.0f); } PubUtils.setValuesUsingReflection(po4,data,true,"getV","setV","Cp95"); + MaxValueProcessor.process(po1); + MaxValueProcessor.process(po2); + MaxValueProcessor.process(po3); + MaxValueProcessor.process(po4); result.addAll(Arrays.asList(po1,po2,po3,po4)); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertDayV->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ rStatDataVDService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertDayV->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -198,7 +210,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item->{ - System.out.println("当前执行日期:"+ item); + System.out.println("insertLimitRate->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List list = oracleDataService.getLimitRate(item); @@ -211,17 +223,18 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po.setAllTime(data.getAlltime()); po.setFlickerAllTime(data.getFlicketAlltime()); BeanUtils.copyProperties(data,po); + MaxValueProcessor.process(po); result.add(po); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertLimitRate->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ rLimitRateDService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertLimitRate->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -234,7 +247,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item->{ - System.out.println("当前执行日期:"+ item); + System.out.println("insertLimitTarget->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List list = oracleDataService.getLimitTarget(item); @@ -247,17 +260,18 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po.setAllTime(data.getAlltime()); po.setFlickerAllTime(data.getFlicketAlltime()); BeanUtils.copyProperties(data,po); + MaxValueProcessor.process(po); result.add(po); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertLimitTarget->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ rStatLimitTargetDService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertLimitTarget->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -269,7 +283,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item-> { - System.out.println("当前执行日期:"+ item); + System.out.println("insertComAsses->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List pqsComAsses = oracleDataService.getPqsComAsses(item); @@ -309,17 +323,18 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { comAsses.setEvent3(data.getEvent3()); comAsses.setEvent4(data.getEvent4()); comAsses.setEvent5(data.getEvent5()); + MaxValueProcessor.process(comAsses); result.add(comAsses); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertComAsses->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ statComassesDService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(pqsComAsses)?pqsComAsses.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertComAsses->查询oracle数据:"+(CollUtil.isNotEmpty(pqsComAsses)?pqsComAsses.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -331,7 +346,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item-> { - System.out.println("当前执行日期:"+ item); + System.out.println("insertAsses->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List pqsComAsses = oracleDataService.getPqsAsses(item); @@ -346,17 +361,18 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { assesD.setDataPlt(data.getDataPlt()); assesD.setVUnbalanceCp95(data.getVUnbalanceCP95()); assesD.setVThdCp95(data.getVThdCP95()); + MaxValueProcessor.process(assesD); result.add(assesD); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertAsses->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ statAssesDService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(pqsComAsses)?pqsComAsses.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertAsses->查询oracle数据:"+(CollUtil.isNotEmpty(pqsComAsses)?pqsComAsses.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -368,7 +384,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item-> { - System.out.println("当前执行日期:"+ item); + System.out.println("insertDataI->当前执行日期:"+ item); List result = new ArrayList<>(); long system1 = System.currentTimeMillis(); List list = oracleDataService.getDayI(item); @@ -386,17 +402,21 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { RStatDataID po4 = getDataI(data,oracleRelationMysql,"CP95"); PubUtils.setValuesUsingReflection(po4,data,true,"getI","setI","Cp95"); + MaxValueProcessor.process(po1); + MaxValueProcessor.process(po2); + MaxValueProcessor.process(po3); + MaxValueProcessor.process(po4); result.addAll(Arrays.asList(po1,po2,po3,po4)); } }); } else { long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertDataI->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); } if(CollUtil.isNotEmpty(result)){ statDataIDService.insert(result); long system2 = System.currentTimeMillis(); - System.out.println("查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + System.out.println("insertDataI->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); } }); } @@ -408,7 +428,29 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item-> { - + System.out.println("insertPlt->当前执行日期:"+ item); + List result = new ArrayList<>(); + long system1 = System.currentTimeMillis(); + List list = oracleDataService.getDayPlt(item); + if(CollUtil.isNotEmpty(list)){ + list.forEach(data->{ + if (ObjUtil.isNotNull(oracleRelationMysql.get(data.getLineid()))) { + RStatDataPltD po1 = getDataPlt(data,oracleRelationMysql,"AVG"); + RStatDataPltD po2 = getDataPlt(data,oracleRelationMysql,"MAX"); + RStatDataPltD po3 = getDataPlt(data,oracleRelationMysql,"MIN"); + RStatDataPltD po4 = getDataPlt(data,oracleRelationMysql,"CP95"); + result.addAll(Arrays.asList(po1,po2,po3,po4)); + } + }); + } else { + long system2 = System.currentTimeMillis(); + System.out.println("insertPlt->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + } + if(CollUtil.isNotEmpty(result)){ + statDataPltDService.insert(result); + long system2 = System.currentTimeMillis(); + System.out.println("insertPlt->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + } }); } @@ -419,7 +461,29 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item-> { - + System.out.println("insertFlicker->当前执行日期:"+ item); + List result = new ArrayList<>(); + long system1 = System.currentTimeMillis(); + List list = oracleDataService.getDayFlicker(item); + if(CollUtil.isNotEmpty(list)){ + list.forEach(data->{ + if (ObjUtil.isNotNull(oracleRelationMysql.get(data.getLineid()))) { + RStatDataFlickerD po1 = getDataFlicker(data,oracleRelationMysql,"AVG"); + RStatDataFlickerD po2 = getDataFlicker(data,oracleRelationMysql,"MAX"); + RStatDataFlickerD po3 = getDataFlicker(data,oracleRelationMysql,"MIN"); + RStatDataFlickerD po4 = getDataFlicker(data,oracleRelationMysql,"CP95"); + result.addAll(Arrays.asList(po1,po2,po3,po4)); + } + }); + } else { + long system2 = System.currentTimeMillis(); + System.out.println("insertFlicker->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + } + if(CollUtil.isNotEmpty(result)){ + statDataFlickerDService.insert(result); + long system2 = System.currentTimeMillis(); + System.out.println("insertFlicker->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + } }); } @@ -430,6 +494,29 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //lineId:Oracle监测点ID id:Mysql监测点ID Map oracleRelationMysql = bakList.stream().collect(Collectors.toMap(PqLineBak::getLineId, PqLineBak::getId)); timeList.forEach(item-> { + System.out.println("insertInHarmV->当前执行日期:"+ item); + List result = new ArrayList<>(); + long system1 = System.currentTimeMillis(); + List list = oracleDataService.getDayInHarmV(item); + if(CollUtil.isNotEmpty(list)){ + list.forEach(data->{ + if (ObjUtil.isNotNull(oracleRelationMysql.get(data.getLineid()))) { + RStatDataInharmVD po1 = getDataInHarmV(data,oracleRelationMysql,"AVG"); + RStatDataInharmVD po2 = getDataInHarmV(data,oracleRelationMysql,"MAX"); + RStatDataInharmVD po3 = getDataInHarmV(data,oracleRelationMysql,"MIN"); + RStatDataInharmVD po4 = getDataInHarmV(data,oracleRelationMysql,"CP95"); + result.addAll(Arrays.asList(po1,po2,po3,po4)); + } + }); + } else { + long system2 = System.currentTimeMillis(); + System.out.println("insertInHarmV->查询oracle数据:0,执行时间:" + (system2-system1)/1000.0 + "s"); + } + if(CollUtil.isNotEmpty(result)){ + statDataInharmVDService.insert(result); + long system2 = System.currentTimeMillis(); + System.out.println("insertInHarmV->查询oracle数据:"+(CollUtil.isNotEmpty(list)?list.size():0)+",插入mysql数据:"+ result.size() + ",执行时间:" + (system2-system1)/1000.0 + "s"); + } }); } @@ -443,6 +530,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po1.setValueType(valueType); //异常数据判断 po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_HARM_RATE_V.getCode(),data,null)); + MaxValueProcessor.process(po1); return po1; } @@ -506,13 +594,14 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { //异常数据判断 po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_V.getCode(),data,"Cp95")); } + MaxValueProcessor.process(po1); return po1; } public RStatDataID getDataI(DayI data, Map oracleRelationMysql, String valueType) { ZoneId zoneId = ZoneId.systemDefault(); RStatDataID po1 = new RStatDataID(); - po1.setTime(data.getTimeid().atZone(zoneId).toLocalDate()); + po1.setTime(data.getTimeid().toInstant().atZone(zoneId).toLocalDate()); po1.setLineId(oracleRelationMysql.get(data.getLineid())); po1.setPhaseType(data.getPhasicType()); po1.setValueType(valueType); @@ -523,6 +612,8 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po1.setIThd(data.getIThd()); po1.setIUnbalance(data.getIUnbalance()); po1.setIZero(data.getIZero()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_I.getCode(),data,null)); } else if (Objects.equals(valueType,"MAX")) { po1.setRms(data.getRmsMax()); po1.setINeg(data.getINegMax()); @@ -531,6 +622,7 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po1.setIUnbalance(data.getIUnbalanceMax()); po1.setIZero(data.getIZeroMax()); //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_I.getCode(),data,"Max")); } else if (Objects.equals(valueType,"MIN")) { po1.setRms(data.getRmsMin()); po1.setINeg(data.getINegMin()); @@ -538,6 +630,8 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po1.setIThd(data.getIThdMin()); po1.setIUnbalance(data.getIUnbalanceMin()); po1.setIZero(data.getIZeroMin()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_I.getCode(),data,"Min")); } else if (Objects.equals(valueType,"CP95")) { po1.setRms(data.getRmsCp95()); po1.setINeg(data.getINegCp95()); @@ -545,27 +639,102 @@ public class OracleToMysqlServiceImpl implements OracleToMysqlService { po1.setIThd(data.getIThdCp95()); po1.setIUnbalance(data.getIUnbalanceCp95()); po1.setIZero(data.getIZeroCp95()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_I.getCode(),data,"Cp95")); } + MaxValueProcessor.process(po1); return po1; } - public void getRmsLvrData(List list) { - Map> map = new HashMap<>(); - Map> dayMap = list.stream().collect(Collectors.groupingBy(DayV::getLineid)); - List tList = list.stream().filter(type ->Objects.equals(type.getPhasicType(),"T")).collect(Collectors.toList()); - tList.forEach(item->{ - if (CollUtil.isNotEmpty(dayMap.get(item.getLineid()))){ - DayV dayV = dayMap.get(item.getLineid()).stream().filter(type ->Objects.equals(type.getPhasicType(),"T")).collect(Collectors.toList()).get(0); - dayMap.get(item.getLineid()).forEach(day->{ - if (Objects.equals(day.getPhasicType(),"A")) { - } else if (Objects.equals(day.getPhasicType(),"B")) { - - } else if (Objects.equals(day.getPhasicType(),"C")) { - - } - }); - } - }); + public RStatDataPltD getDataPlt(DayPlt data, Map oracleRelationMysql, String valueType) { + ZoneId zoneId = ZoneId.systemDefault(); + RStatDataPltD po1 = new RStatDataPltD(); + po1.setTime(data.getTimeid().toInstant().atZone(zoneId).toLocalDate()); + po1.setLineId(oracleRelationMysql.get(data.getLineid())); + po1.setPhaseType(data.getPhasicType()); + po1.setValueType(valueType); + if (Objects.equals(valueType,"AVG")) { + po1.setPlt(data.getPlt()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_PLT.getCode(),data,null)); + } else if (Objects.equals(valueType,"MAX")) { + po1.setPlt(data.getPltMax()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_PLT.getCode(),data,"Max")); + } else if (Objects.equals(valueType,"MIN")) { + po1.setPlt(data.getPltMin()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_PLT.getCode(),data,"Min")); + } else if (Objects.equals(valueType,"CP95")) { + po1.setPlt(data.getPltCp95()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_PLT.getCode(),data,"Cp95")); + } + MaxValueProcessor.process(po1); + return po1; } + public RStatDataFlickerD getDataFlicker(DayFlicker data, Map oracleRelationMysql, String valueType) { + ZoneId zoneId = ZoneId.systemDefault(); + RStatDataFlickerD po1 = new RStatDataFlickerD(); + po1.setTime(data.getTimeid().toInstant().atZone(zoneId).toLocalDate()); + po1.setLineId(oracleRelationMysql.get(data.getLineid())); + po1.setPhaseType(data.getPhasicType()); + po1.setValueType(valueType); + if (Objects.equals(valueType,"AVG")) { + po1.setFluc(data.getFluc()); + po1.setPlt(data.getPlt()); + po1.setPst(data.getPst()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_FLICKER.getCode(),data,null)); + } else if (Objects.equals(valueType,"MAX")) { + po1.setFluc(data.getFlucMax()); + po1.setPlt(data.getPltMax()); + po1.setPst(data.getPstMax()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_FLICKER.getCode(),data,"Max")); + } else if (Objects.equals(valueType,"MIN")) { + po1.setFluc(data.getFlucMin()); + po1.setPlt(data.getPltMin()); + po1.setPst(data.getPstMin()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_FLICKER.getCode(),data,"Min")); + } else if (Objects.equals(valueType,"CP95")) { + po1.setFluc(data.getFlucCp95()); + po1.setPlt(data.getPltCp95()); + po1.setPst(data.getPstCp95()); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_FLICKER.getCode(),data,"Cp95")); + } + MaxValueProcessor.process(po1); + return po1; + } + + public RStatDataInharmVD getDataInHarmV(DayInharmV data, Map oracleRelationMysql, String valueType) { + ZoneId zoneId = ZoneId.systemDefault(); + RStatDataInharmVD po1 = new RStatDataInharmVD(); + po1.setTime(data.getTimeid().toInstant().atZone(zoneId).toLocalDate()); + po1.setLineId(oracleRelationMysql.get(data.getLineid())); + po1.setPhaseType(data.getPhasicType()); + po1.setValueType(valueType); + if (Objects.equals(valueType,"AVG")) { + PubUtils.setValuesUsingReflection(po1,data,false,"getV","setV",null); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_IN_HARM_V.getCode(),data,null)); + } else if (Objects.equals(valueType,"MAX")) { + PubUtils.setValuesUsingReflection(po1,data,true,"getV","setV","Max"); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_IN_HARM_V.getCode(),data,"Max")); + } else if (Objects.equals(valueType,"MIN")) { + PubUtils.setValuesUsingReflection(po1,data,true,"getV","setV","Min"); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_IN_HARM_V.getCode(),data,"Min")); + } else if (Objects.equals(valueType,"CP95")) { + PubUtils.setValuesUsingReflection(po1,data,true,"getV","setV","Cp95"); + //异常数据判断 + po1.setQualityFlag(PubUtils.judgeData(TargetEnum.DAY_IN_HARM_V.getCode(),data,"Cp95")); + } + MaxValueProcessor.process(po1); + return po1; + } } diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataFlickerDServiceImpl.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataFlickerDServiceImpl.java index fc65eb4..75356bc 100644 --- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataFlickerDServiceImpl.java +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataFlickerDServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.mysql.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.mysql.bo.po.RStatDataFlickerD; import com.njcn.mysql.mapper.RStatDataFlickerDMapper; @@ -16,6 +17,7 @@ import java.util.List; * @createTime 2023/3/24 9:53 */ @Service +@DS("target") public class RStatDataFlickerDServiceImpl extends MppServiceImpl implements IRStatDataFlickerDService { @Override public void insert(List list) { diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataInharmVDServiceImpl.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataInharmVDServiceImpl.java index 2b8d3ba..2388c32 100644 --- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataInharmVDServiceImpl.java +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataInharmVDServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.mysql.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.mysql.bo.po.RStatDataInharmVD; import com.njcn.mysql.mapper.RStatDataInHarmVDMapper; @@ -16,6 +17,7 @@ import java.util.List; * @createTime 2023/3/24 9:53 */ @Service +@DS("target") public class RStatDataInharmVDServiceImpl extends MppServiceImpl implements IRStatDataInharmVDService { @Override diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataPltDServiceImpl.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataPltDServiceImpl.java index 93fc8ac..673283b 100644 --- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataPltDServiceImpl.java +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/service/impl/RStatDataPltDServiceImpl.java @@ -1,5 +1,6 @@ package com.njcn.mysql.service.impl; +import com.baomidou.dynamic.datasource.annotation.DS; import com.github.jeffreyning.mybatisplus.service.MppServiceImpl; import com.njcn.mysql.bo.po.RStatDataPltD; import com.njcn.mysql.mapper.RStatDataPltDMapper; @@ -16,6 +17,7 @@ import java.util.List; * @createTime 2023/3/24 9:53 */ @Service +@DS("target") public class RStatDataPltDServiceImpl extends MppServiceImpl implements IRStatDataPltDService { @Override diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/MaxValueProcessor.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/MaxValueProcessor.java new file mode 100644 index 0000000..f925652 --- /dev/null +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/MaxValueProcessor.java @@ -0,0 +1,64 @@ +package com.njcn.mysql.util; + +import cn.hutool.core.util.ObjectUtil; +import com.njcn.mysql.bo.util.CompareValue; + +import java.lang.reflect.Field; + +//防止数据过大 +public class MaxValueProcessor { + public static void process(Object obj) { + Field[] fields = obj.getClass().getDeclaredFields(); + for (Field field : fields) { + if (field.isAnnotationPresent(CompareValue.class)) { + CompareValue compareValue = field.getAnnotation(CompareValue.class); + field.setAccessible(true); + Class type = field.getType(); + try { + if (type == Float.class) { + Float fieldValue = (Float) field.get(obj); + float minValue = compareValue.minValue(); + float maxValue = compareValue.maxValue(); + if(ObjectUtil.isNotNull(fieldValue)){ + if (fieldValue > maxValue) { + field.set(obj, maxValue); + } + if (fieldValue < minValue) { + field.set(obj, minValue); + } + } + } + if (type == Double.class) { + Double fieldValue = (Double) field.get(obj); + double minValue = compareValue.minValue(); + double maxValue = compareValue.maxValue(); + if(ObjectUtil.isNotNull(fieldValue)){ + if (fieldValue > maxValue) { + field.set(obj, maxValue); + } + if (fieldValue < minValue) { + field.set(obj, minValue); + } + } + } + if (type == Integer.class) { + Integer fieldValue = (Integer) field.get(obj); + int minValue = (int) compareValue.minValue(); + int maxValue = (int) compareValue.maxValue(); + if(ObjectUtil.isNotNull(fieldValue)){ + if (fieldValue > maxValue) { + field.set(obj, maxValue); + } + if (fieldValue < minValue) { + field.set(obj, minValue); + } + } + } + } catch (IllegalAccessException e) { + e.printStackTrace(); + } + } + } + } + +} \ No newline at end of file diff --git a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/PubUtils.java b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/PubUtils.java index 78c1aff..fe552f4 100644 --- a/mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/PubUtils.java +++ b/mysql-data/mysql-target/src/main/java/com/njcn/mysql/util/PubUtils.java @@ -2,9 +2,9 @@ package com.njcn.mysql.util; import cn.hutool.core.date.DatePattern; import com.fasterxml.jackson.databind.ObjectMapper; -import com.njcn.oracle.bo.po.DayHarmrateV; -import com.njcn.oracle.bo.po.DayV; +import com.njcn.oracle.bo.po.*; +import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.math.BigDecimal; import java.text.SimpleDateFormat; @@ -111,6 +111,53 @@ public class PubUtils { e.getMessage(); } return result; + case 2: + try { + DayFlicker data2 = new ObjectMapper().convertValue(object, DayFlicker.class); + String methodName1 = "getFluc" + (Objects.isNull(type)?"":type); + Method method1=data2.getClass().getMethod(methodName1); + float value = (Float) method1.invoke(data2); + + String methodName2 = "getPlt" + (Objects.isNull(type)?"":type); + Method method2=data2.getClass().getMethod(methodName2); + float value2 = (Float) method2.invoke(data2); + + String methodName3 = "getPst" + (Objects.isNull(type)?"":type); + Method method3=data2.getClass().getMethod(methodName3); + float value3 = (Float) method3.invoke(data2); + + //电压波动值判断 + if ( (value > 40.0|| value < 0)){ + result = 1; + } + //短时闪变值判断 + if ( (value2 > 20.0|| value2 < 0)){ + result = 1; + } + //长时闪变值判断 + if ( (value3 > 20.0|| value3 < 0)){ + result = 1; + } + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + e.getMessage(); + } + return result; + case 3: + //长时闪变 + DayPlt data3 = new ObjectMapper().convertValue(object, DayPlt.class); + String methodName1 = "getPlt" + (Objects.isNull(type)?"":type); + Method method1 = null; + try { + method1 = data3.getClass().getMethod(methodName1); + float value = (Float) method1.invoke(data3); + //长时闪变值判断 + if ( (value > 20.0|| value < 0)){ + result = 1; + } + } catch (NoSuchMethodException | IllegalAccessException | InvocationTargetException e) { + e.getMessage(); + } + return result; case 4: DayHarmrateV data4 = new ObjectMapper().convertValue(object, DayHarmrateV.class); List avgData4 = getData(data4); diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java index 7a1f155..13bd2fb 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayFlicker.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; + import lombok.Getter; import lombok.Setter; @@ -23,7 +25,7 @@ public class DayFlicker implements Serializable{ private static final long serialVersionUID = 1L; @TableField("TIMEID") - private LocalDateTime timeid; + private Date timeid; @TableField("LINEID") private String lineid; @TableField("PHASIC_TYPE") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java index 7d67720..1a51364 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayI.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; + import lombok.Getter; import lombok.Setter; @@ -23,7 +25,7 @@ public class DayI implements Serializable { private static final long serialVersionUID = 1L; @TableField("TIMEID") - private LocalDateTime timeid; + private Date timeid; @TableField("LINEID") private String lineid; @TableField("PHASIC_TYPE") diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java index b0a2f90..39c14de 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayInharmV.java @@ -5,12 +5,14 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; + import lombok.Getter; import lombok.Setter; /** *

- * + * *

* * @author hongawen @@ -22,411 +24,414 @@ import lombok.Setter; public class DayInharmV implements Serializable { private static final long serialVersionUID = 1L; - @TableField("TIMEID") - private LocalDateTime timeid; - @TableField("LINEID") + @TableField("TIMEID") + private Date timeid; + + @TableField("LINEID") private String lineid; - @TableField("PHASIC_TYPE") + + @TableField("PHASIC_TYPE") private String phasicType; - @TableField("V_1") + + @TableField("V_1") private Float v1; - @TableField("V_2") + @TableField("V_2") private Float v2; - @TableField("V_3") + @TableField("V_3") private Float v3; - @TableField("V_4") + @TableField("V_4") private Float v4; - @TableField("V_5") + @TableField("V_5") private Float v5; - @TableField("V_6") + @TableField("V_6") private Float v6; - @TableField("V_7") + @TableField("V_7") private Float v7; - @TableField("V_8") + @TableField("V_8") private Float v8; - @TableField("V_9") + @TableField("V_9") private Float v9; - @TableField("V_10") + @TableField("V_10") private Float v10; - @TableField("V_11") + @TableField("V_11") private Float v11; - @TableField("V_12") + @TableField("V_12") private Float v12; - @TableField("V_13") + @TableField("V_13") private Float v13; - @TableField("V_14") + @TableField("V_14") private Float v14; - @TableField("V_15") + @TableField("V_15") private Float v15; - @TableField("V_16") + @TableField("V_16") private Float v16; - @TableField("V_17") + @TableField("V_17") private Float v17; - @TableField("V_18") + @TableField("V_18") private Float v18; - @TableField("V_19") + @TableField("V_19") private Float v19; - @TableField("V_20") + @TableField("V_20") private Float v20; - @TableField("V_21") + @TableField("V_21") private Float v21; - @TableField("V_22") + @TableField("V_22") private Float v22; - @TableField("V_23") + @TableField("V_23") private Float v23; - @TableField("V_24") + @TableField("V_24") private Float v24; - @TableField("V_25") + @TableField("V_25") private Float v25; - @TableField("V_26") + @TableField("V_26") private Float v26; - @TableField("V_27") + @TableField("V_27") private Float v27; - @TableField("V_28") + @TableField("V_28") private Float v28; - @TableField("V_29") + @TableField("V_29") private Float v29; - @TableField("V_30") + @TableField("V_30") private Float v30; - @TableField("V_31") + @TableField("V_31") private Float v31; - @TableField("V_32") + @TableField("V_32") private Float v32; - @TableField("V_33") + @TableField("V_33") private Float v33; - @TableField("V_34") + @TableField("V_34") private Float v34; - @TableField("V_35") + @TableField("V_35") private Float v35; - @TableField("V_36") + @TableField("V_36") private Float v36; - @TableField("V_37") + @TableField("V_37") private Float v37; - @TableField("V_38") + @TableField("V_38") private Float v38; - @TableField("V_39") + @TableField("V_39") private Float v39; - @TableField("V_40") + @TableField("V_40") private Float v40; - @TableField("V_41") + @TableField("V_41") private Float v41; - @TableField("V_42") + @TableField("V_42") private Float v42; - @TableField("V_43") + @TableField("V_43") private Float v43; - @TableField("V_44") + @TableField("V_44") private Float v44; - @TableField("V_45") + @TableField("V_45") private Float v45; - @TableField("V_46") + @TableField("V_46") private Float v46; - @TableField("V_47") + @TableField("V_47") private Float v47; - @TableField("V_48") + @TableField("V_48") private Float v48; - @TableField("V_49") + @TableField("V_49") private Float v49; - @TableField("V_50") + @TableField("V_50") private Float v50; - @TableField("V_1_MAX") + @TableField("V_1_MAX") private Float v1Max; - @TableField("V_2_MAX") + @TableField("V_2_MAX") private Float v2Max; - @TableField("V_3_MAX") + @TableField("V_3_MAX") private Float v3Max; - @TableField("V_4_MAX") + @TableField("V_4_MAX") private Float v4Max; - @TableField("V_5_MAX") + @TableField("V_5_MAX") private Float v5Max; - @TableField("V_6_MAX") + @TableField("V_6_MAX") private Float v6Max; - @TableField("V_7_MAX") + @TableField("V_7_MAX") private Float v7Max; - @TableField("V_8_MAX") + @TableField("V_8_MAX") private Float v8Max; - @TableField("V_9_MAX") + @TableField("V_9_MAX") private Float v9Max; - @TableField("V_10_MAX") + @TableField("V_10_MAX") private Float v10Max; - @TableField("V_11_MAX") + @TableField("V_11_MAX") private Float v11Max; - @TableField("V_12_MAX") + @TableField("V_12_MAX") private Float v12Max; - @TableField("V_13_MAX") + @TableField("V_13_MAX") private Float v13Max; - @TableField("V_14_MAX") + @TableField("V_14_MAX") private Float v14Max; - @TableField("V_15_MAX") + @TableField("V_15_MAX") private Float v15Max; - @TableField("V_16_MAX") + @TableField("V_16_MAX") private Float v16Max; - @TableField("V_17_MAX") + @TableField("V_17_MAX") private Float v17Max; - @TableField("V_18_MAX") + @TableField("V_18_MAX") private Float v18Max; - @TableField("V_19_MAX") + @TableField("V_19_MAX") private Float v19Max; - @TableField("V_20_MAX") + @TableField("V_20_MAX") private Float v20Max; - @TableField("V_21_MAX") + @TableField("V_21_MAX") private Float v21Max; - @TableField("V_22_MAX") + @TableField("V_22_MAX") private Float v22Max; - @TableField("V_23_MAX") + @TableField("V_23_MAX") private Float v23Max; - @TableField("V_24_MAX") + @TableField("V_24_MAX") private Float v24Max; - @TableField("V_25_MAX") + @TableField("V_25_MAX") private Float v25Max; - @TableField("V_26_MAX") + @TableField("V_26_MAX") private Float v26Max; - @TableField("V_27_MAX") + @TableField("V_27_MAX") private Float v27Max; - @TableField("V_28_MAX") + @TableField("V_28_MAX") private Float v28Max; - @TableField("V_29_MAX") + @TableField("V_29_MAX") private Float v29Max; - @TableField("V_30_MAX") + @TableField("V_30_MAX") private Float v30Max; - @TableField("V_31_MAX") + @TableField("V_31_MAX") private Float v31Max; - @TableField("V_32_MAX") + @TableField("V_32_MAX") private Float v32Max; - @TableField("V_33_MAX") + @TableField("V_33_MAX") private Float v33Max; - @TableField("V_34_MAX") + @TableField("V_34_MAX") private Float v34Max; - @TableField("V_35_MAX") + @TableField("V_35_MAX") private Float v35Max; - @TableField("V_36_MAX") + @TableField("V_36_MAX") private Float v36Max; - @TableField("V_37_MAX") + @TableField("V_37_MAX") private Float v37Max; - @TableField("V_38_MAX") + @TableField("V_38_MAX") private Float v38Max; - @TableField("V_39_MAX") + @TableField("V_39_MAX") private Float v39Max; - @TableField("V_40_MAX") + @TableField("V_40_MAX") private Float v40Max; - @TableField("V_41_MAX") + @TableField("V_41_MAX") private Float v41Max; - @TableField("V_42_MAX") + @TableField("V_42_MAX") private Float v42Max; - @TableField("V_43_MAX") + @TableField("V_43_MAX") private Float v43Max; - @TableField("V_44_MAX") + @TableField("V_44_MAX") private Float v44Max; - @TableField("V_45_MAX") + @TableField("V_45_MAX") private Float v45Max; - @TableField("V_46_MAX") + @TableField("V_46_MAX") private Float v46Max; - @TableField("V_47_MAX") + @TableField("V_47_MAX") private Float v47Max; - @TableField("V_48_MAX") + @TableField("V_48_MAX") private Float v48Max; - @TableField("V_49_MAX") + @TableField("V_49_MAX") private Float v49Max; - @TableField("V_50_MAX") + @TableField("V_50_MAX") private Float v50Max; - @TableField("V_1_MIN") + @TableField("V_1_MIN") private Float v1Min; - @TableField("V_2_MIN") + @TableField("V_2_MIN") private Float v2Min; - @TableField("V_3_MIN") + @TableField("V_3_MIN") private Float v3Min; - @TableField("V_4_MIN") + @TableField("V_4_MIN") private Float v4Min; - @TableField("V_5_MIN") + @TableField("V_5_MIN") private Float v5Min; - @TableField("V_6_MIN") + @TableField("V_6_MIN") private Float v6Min; - @TableField("V_7_MIN") + @TableField("V_7_MIN") private Float v7Min; - @TableField("V_8_MIN") + @TableField("V_8_MIN") private Float v8Min; - @TableField("V_9_MIN") + @TableField("V_9_MIN") private Float v9Min; - @TableField("V_10_MIN") + @TableField("V_10_MIN") private Float v10Min; - @TableField("V_11_MIN") + @TableField("V_11_MIN") private Float v11Min; - @TableField("V_12_MIN") + @TableField("V_12_MIN") private Float v12Min; - @TableField("V_13_MIN") + @TableField("V_13_MIN") private Float v13Min; - @TableField("V_14_MIN") + @TableField("V_14_MIN") private Float v14Min; - @TableField("V_15_MIN") + @TableField("V_15_MIN") private Float v15Min; - @TableField("V_16_MIN") + @TableField("V_16_MIN") private Float v16Min; - @TableField("V_17_MIN") + @TableField("V_17_MIN") private Float v17Min; - @TableField("V_18_MIN") + @TableField("V_18_MIN") private Float v18Min; - @TableField("V_19_MIN") + @TableField("V_19_MIN") private Float v19Min; - @TableField("V_20_MIN") + @TableField("V_20_MIN") private Float v20Min; - @TableField("V_21_MIN") + @TableField("V_21_MIN") private Float v21Min; - @TableField("V_22_MIN") + @TableField("V_22_MIN") private Float v22Min; - @TableField("V_23_MIN") + @TableField("V_23_MIN") private Float v23Min; - @TableField("V_24_MIN") + @TableField("V_24_MIN") private Float v24Min; - @TableField("V_25_MIN") + @TableField("V_25_MIN") private Float v25Min; - @TableField("V_26_MIN") + @TableField("V_26_MIN") private Float v26Min; - @TableField("V_27_MIN") + @TableField("V_27_MIN") private Float v27Min; - @TableField("V_28_MIN") + @TableField("V_28_MIN") private Float v28Min; - @TableField("V_29_MIN") + @TableField("V_29_MIN") private Float v29Min; - @TableField("V_30_MIN") + @TableField("V_30_MIN") private Float v30Min; - @TableField("V_31_MIN") + @TableField("V_31_MIN") private Float v31Min; - @TableField("V_32_MIN") + @TableField("V_32_MIN") private Float v32Min; - @TableField("V_33_MIN") + @TableField("V_33_MIN") private Float v33Min; - @TableField("V_34_MIN") + @TableField("V_34_MIN") private Float v34Min; - @TableField("V_35_MIN") + @TableField("V_35_MIN") private Float v35Min; - @TableField("V_36_MIN") + @TableField("V_36_MIN") private Float v36Min; - @TableField("V_37_MIN") + @TableField("V_37_MIN") private Float v37Min; - @TableField("V_38_MIN") + @TableField("V_38_MIN") private Float v38Min; - @TableField("V_39_MIN") + @TableField("V_39_MIN") private Float v39Min; - @TableField("V_40_MIN") + @TableField("V_40_MIN") private Float v40Min; - @TableField("V_41_MIN") + @TableField("V_41_MIN") private Float v41Min; - @TableField("V_42_MIN") + @TableField("V_42_MIN") private Float v42Min; - @TableField("V_43_MIN") + @TableField("V_43_MIN") private Float v43Min; - @TableField("V_44_MIN") + @TableField("V_44_MIN") private Float v44Min; - @TableField("V_45_MIN") + @TableField("V_45_MIN") private Float v45Min; - @TableField("V_46_MIN") + @TableField("V_46_MIN") private Float v46Min; - @TableField("V_47_MIN") + @TableField("V_47_MIN") private Float v47Min; - @TableField("V_48_MIN") + @TableField("V_48_MIN") private Float v48Min; - @TableField("V_49_MIN") + @TableField("V_49_MIN") private Float v49Min; - @TableField("V_50_MIN") + @TableField("V_50_MIN") private Float v50Min; - @TableField("V_1_CP95") + @TableField("V_1_CP95") private Float v1Cp95; - @TableField("V_2_CP95") + @TableField("V_2_CP95") private Float v2Cp95; - @TableField("V_3_CP95") + @TableField("V_3_CP95") private Float v3Cp95; - @TableField("V_4_CP95") + @TableField("V_4_CP95") private Float v4Cp95; - @TableField("V_5_CP95") + @TableField("V_5_CP95") private Float v5Cp95; - @TableField("V_6_CP95") + @TableField("V_6_CP95") private Float v6Cp95; - @TableField("V_7_CP95") + @TableField("V_7_CP95") private Float v7Cp95; - @TableField("V_8_CP95") + @TableField("V_8_CP95") private Float v8Cp95; - @TableField("V_9_CP95") + @TableField("V_9_CP95") private Float v9Cp95; - @TableField("V_10_CP95") + @TableField("V_10_CP95") private Float v10Cp95; - @TableField("V_11_CP95") + @TableField("V_11_CP95") private Float v11Cp95; - @TableField("V_12_CP95") + @TableField("V_12_CP95") private Float v12Cp95; - @TableField("V_13_CP95") + @TableField("V_13_CP95") private Float v13Cp95; - @TableField("V_14_CP95") + @TableField("V_14_CP95") private Float v14Cp95; - @TableField("V_15_CP95") + @TableField("V_15_CP95") private Float v15Cp95; - @TableField("V_16_CP95") + @TableField("V_16_CP95") private Float v16Cp95; - @TableField("V_17_CP95") + @TableField("V_17_CP95") private Float v17Cp95; - @TableField("V_18_CP95") + @TableField("V_18_CP95") private Float v18Cp95; - @TableField("V_19_CP95") + @TableField("V_19_CP95") private Float v19Cp95; - @TableField("V_20_CP95") + @TableField("V_20_CP95") private Float v20Cp95; - @TableField("V_21_CP95") + @TableField("V_21_CP95") private Float v21Cp95; - @TableField("V_22_CP95") + @TableField("V_22_CP95") private Float v22Cp95; - @TableField("V_23_CP95") + @TableField("V_23_CP95") private Float v23Cp95; - @TableField("V_24_CP95") + @TableField("V_24_CP95") private Float v24Cp95; - @TableField("V_25_CP95") + @TableField("V_25_CP95") private Float v25Cp95; - @TableField("V_26_CP95") + @TableField("V_26_CP95") private Float v26Cp95; - @TableField("V_27_CP95") + @TableField("V_27_CP95") private Float v27Cp95; - @TableField("V_28_CP95") + @TableField("V_28_CP95") private Float v28Cp95; - @TableField("V_29_CP95") + @TableField("V_29_CP95") private Float v29Cp95; - @TableField("V_30_CP95") + @TableField("V_30_CP95") private Float v30Cp95; - @TableField("V_31_CP95") + @TableField("V_31_CP95") private Float v31Cp95; - @TableField("V_32_CP95") + @TableField("V_32_CP95") private Float v32Cp95; - @TableField("V_33_CP95") + @TableField("V_33_CP95") private Float v33Cp95; - @TableField("V_34_CP95") + @TableField("V_34_CP95") private Float v34Cp95; - @TableField("V_35_CP95") + @TableField("V_35_CP95") private Float v35Cp95; - @TableField("V_36_CP95") + @TableField("V_36_CP95") private Float v36Cp95; - @TableField("V_37_CP95") + @TableField("V_37_CP95") private Float v37Cp95; - @TableField("V_38_CP95") + @TableField("V_38_CP95") private Float v38Cp95; - @TableField("V_39_CP95") + @TableField("V_39_CP95") private Float v39Cp95; - @TableField("V_40_CP95") + @TableField("V_40_CP95") private Float v40Cp95; - @TableField("V_41_CP95") + @TableField("V_41_CP95") private Float v41Cp95; - @TableField("V_42_CP95") + @TableField("V_42_CP95") private Float v42Cp95; - @TableField("V_43_CP95") + @TableField("V_43_CP95") private Float v43Cp95; - @TableField("V_44_CP95") + @TableField("V_44_CP95") private Float v44Cp95; - @TableField("V_45_CP95") + @TableField("V_45_CP95") private Float v45Cp95; - @TableField("V_46_CP95") + @TableField("V_46_CP95") private Float v46Cp95; - @TableField("V_47_CP95") + @TableField("V_47_CP95") private Float v47Cp95; - @TableField("V_48_CP95") + @TableField("V_48_CP95") private Float v48Cp95; - @TableField("V_49_CP95") + @TableField("V_49_CP95") private Float v49Cp95; - @TableField("V_50_CP95") + @TableField("V_50_CP95") private Float v50Cp95; diff --git a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java index 67dec66..067a468 100644 --- a/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java +++ b/oracle-data/oracle-source/src/main/java/com/njcn/oracle/bo/po/DayPlt.java @@ -5,8 +5,11 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.time.LocalDateTime; +import java.util.Date; + import lombok.Getter; import lombok.Setter; +import org.springframework.format.annotation.DateTimeFormat; /** *

@@ -22,18 +25,25 @@ import lombok.Setter; public class DayPlt implements Serializable { private static final long serialVersionUID = 1L; + @TableField("TIMEID") - private LocalDateTime timeid; + private Date timeid; + @TableField("LINEID") private String lineid; + @TableField("PHASIC_TYPE") private String phasicType; + @TableField("PLT") private Float plt; + @TableField("PLT_MAX") private Float pltMax; + @TableField("PLT_MIN") private Float pltMin; + @TableField("PLT_CP95") private Float pltCp95;