diff --git a/pqs-device/device-boot/pom.xml b/pqs-device/device-boot/pom.xml index 84f608761..e068e8a2e 100644 --- a/pqs-device/device-boot/pom.xml +++ b/pqs-device/device-boot/pom.xml @@ -19,18 +19,18 @@ - - com.njcn - pq-device-boot - ${project.version} - - - + + + com.njcn + pms-device-boot + ${project.version} + + com.njcn common-swagger diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java index a3b42cd62..dc2c316cc 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpInharmonicVRateReportD.java @@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName; import java.io.Serializable; import java.util.Date; +import com.github.jeffreyning.mybatisplus.anno.MppMultiId; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -23,1028 +24,1421 @@ public class RMpInharmonicVRateReportD implements Serializable { /** * 监测点ID */ - @ApiModelProperty(name = "measurementPointId", value = "监测点id") + @MppMultiId(value = "measurement_point_id") + @ApiModelProperty(value = "监测点ID") private String measurementPointId; /** * 生成数据的时间,每日统计一次 */ - @ApiModelProperty(name = "dataDate", value = "dataDate") + @MppMultiId(value = "data_date") + @ApiModelProperty(value = "生成数据的时间,每日统计一次") private Date dataDate; /** * 相别："A" "B" "C" "ABC" "T" 配网部分相别的数据采用T标志存储 */ - @ApiModelProperty(name = "phase", value = "相别") + @MppMultiId(value = "phase") + @ApiModelProperty(value = "相别：'A' 'B' 'C' 'ABC' 'T' 配网部分相别的数据采用T标志存储") private String phase; /** * 0.5次间谐波电压含有率最大值 */ - @ApiModelProperty(name = "inharmV1Max", value = "0.5次间谐波电压含有率最大值") - private Double inharmV1Max; + @TableField(value = "centre_harmonic_voltage_content1_max") + @ApiModelProperty(value = "0.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent1Max; /** * 0.5次间谐波电压含有率最小值 */ - @ApiModelProperty(name = "inharmV1Min", value = "0.5次间谐波电压含有率最小值") - private Double inharmV1Min; + @TableField(value = "centre_harmonic_voltage_content1_min") + @ApiModelProperty(value = "0.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent1Min; /** * 0.5次间谐波电压含有率平均值 */ - @ApiModelProperty(name = "inharmV1Avg", value = "0.5次间谐波电压含有率平均值") - private Double inharmV1Avg; + @TableField(value = "centre_harmonic_voltage_content1_avg") + @ApiModelProperty(value = "0.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent1Avg; /** * 0.5次间谐波电压含有率95值 */ - @ApiModelProperty(name = "inharmV1Cp95", value = "0.5次间谐波电压含有率95值") - private Double inharmV1Cp95; + @TableField(value = "centre_harmonic_voltage_content1_cp95") + @ApiModelProperty(value = "0.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent1Cp95; /** * 1.5次间谐波电压含有率最大值 */ - @ApiModelProperty(name = "inharmV2Max", value = "1.5次间谐波电压含有率最大值") - private Double inharmV2Max; + @TableField(value = "centre_harmonic_voltage_content2_max") + @ApiModelProperty(value = "1.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent2Max; /** * 1.5次间谐波电压含有率最小值 */ - @ApiModelProperty(name = "inharmV2Min", value = "1.5次间谐波电压含有率最小值") - private Double inharmV2Min; + @TableField(value = "centre_harmonic_voltage_content2_min") + @ApiModelProperty(value = "1.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent2Min; /** * 1.5次间谐波电压含有率平均值 */ - @ApiModelProperty(name = "inharmV2Avg", value = "1.5次间谐波电压含有率平均值") - private Double inharmV2Avg; + @TableField(value = "centre_harmonic_voltage_content2_avg") + @ApiModelProperty(value = "1.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent2Avg; /** * 1.5次间谐波电压含有率95值 */ - @ApiModelProperty(name = "inharmV2Cp95", value = "1.5次间谐波电压含有率95值") - private Double inharmV2Cp95; + @TableField(value = "centre_harmonic_voltage_content2_cp95") + @ApiModelProperty(value = "1.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent2Cp95; /** * 2.5次间谐波电压含有率最大值 */ - private Double inharmV3Max; + @TableField(value = "centre_harmonic_voltage_content3_max") + @ApiModelProperty(value = "2.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent3Max; /** * 2.5次间谐波电压含有率最小值 */ - private Double inharmV3Min; + @TableField(value = "centre_harmonic_voltage_content3_min") + @ApiModelProperty(value = "2.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent3Min; /** * 2.5次间谐波电压含有率平均值 */ - private Double inharmV3Avg; + @TableField(value = "centre_harmonic_voltage_content3_avg") + @ApiModelProperty(value = "2.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent3Avg; /** * 2.5次间谐波电压含有率95值 */ - private Double inharmV3Cp95; + @TableField(value = "centre_harmonic_voltage_content3_cp95") + @ApiModelProperty(value = "2.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent3Cp95; /** * 3.5次间谐波电压含有率最大值 */ - private Double inharmV4Max; + @TableField(value = "centre_harmonic_voltage_content4_max") + @ApiModelProperty(value = "3.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent4Max; /** * 3.5次间谐波电压含有率最小值 */ - private Double inharmV4Min; + @TableField(value = "centre_harmonic_voltage_content4_min") + @ApiModelProperty(value = "3.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent4Min; /** * 3.5次间谐波电压含有率平均值 */ - private Double inharmV4Avg; + @TableField(value = "centre_harmonic_voltage_content4_avg") + @ApiModelProperty(value = "3.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent4Avg; /** * 3.5次间谐波电压含有率95值 */ - private Double inharmV4Cp95; + @TableField(value = "centre_harmonic_voltage_content4_cp95") + @ApiModelProperty(value = "3.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent4Cp95; /** * 4.5次间谐波电压含有率最大值 */ - private Double inharmV5Max; + @TableField(value = "centre_harmonic_voltage_content5_max") + @ApiModelProperty(value = "4.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent5Max; /** * 4.5次间谐波电压含有率最小值 */ - private Double inharmV5Min; + @TableField(value = "centre_harmonic_voltage_content5_min") + @ApiModelProperty(value = "4.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent5Min; /** * 4.5次间谐波电压含有率平均值 */ - private Double inharmV5Avg; + @TableField(value = "centre_harmonic_voltage_content5_avg") + @ApiModelProperty(value = "4.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent5Avg; /** * 4.5次间谐波电压含有率95值 */ - private Double inharmV5Cp95; + @TableField(value = "centre_harmonic_voltage_content5_cp95") + @ApiModelProperty(value = "4.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent5Cp95; /** * 5.5次间谐波电压含有率最大值 */ - private Double inharmV6Max; + @TableField(value = "centre_harmonic_voltage_content6_max") + @ApiModelProperty(value = "5.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent6Max; /** * 5.5次间谐波电压含有率最小值 */ - private Double inharmV6Min; + @TableField(value = "centre_harmonic_voltage_content6_min") + @ApiModelProperty(value = "5.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent6Min; /** * 5.5次间谐波电压含有率平均值 */ - private Double inharmV6Avg; + @TableField(value = "centre_harmonic_voltage_content6_avg") + @ApiModelProperty(value = "5.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent6Avg; /** * 5.5次间谐波电压含有率95值 */ - private Double inharmV6Cp95; + @TableField(value = "centre_harmonic_voltage_content6_cp95") + @ApiModelProperty(value = "5.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent6Cp95; /** * 6.5次间谐波电压含有率最大值 */ - private Double inharmV7Max; + @TableField(value = "centre_harmonic_voltage_content7_max") + @ApiModelProperty(value = "6.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent7Max; /** * 6.5次间谐波电压含有率最小值 */ - private Double inharmV7Min; + @TableField(value = "centre_harmonic_voltage_content7_min") + @ApiModelProperty(value = "6.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent7Min; /** * 6.5次间谐波电压含有率平均值 */ - private Double inharmV7Avg; + @TableField(value = "centre_harmonic_voltage_content7_avg") + @ApiModelProperty(value = "6.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent7Avg; /** * 6.5次间谐波电压含有率95值 */ - private Double inharmV7Cp95; + @TableField(value = "centre_harmonic_voltage_content7_cp95") + @ApiModelProperty(value = "6.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent7Cp95; /** * 7.5次间谐波电压含有率最大值 */ - private Double inharmV8Max; + @TableField(value = "centre_harmonic_voltage_content8_max") + @ApiModelProperty(value = "7.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent8Max; /** * 7.5次间谐波电压含有率最小值 */ - private Double inharmV8Min; + @TableField(value = "centre_harmonic_voltage_content8_min") + @ApiModelProperty(value = "7.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent8Min; /** * 7.5次间谐波电压含有率平均值 */ - private Double inharmV8Avg; + @TableField(value = "centre_harmonic_voltage_content8_avg") + @ApiModelProperty(value = "7.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent8Avg; /** * 7.5次间谐波电压含有率95值 */ - private Double inharmV8Cp95; + @TableField(value = "centre_harmonic_voltage_content8_cp95") + @ApiModelProperty(value = "7.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent8Cp95; /** * 8.5次间谐波电压含有率最大值 */ - private Double inharmV9Max; + @TableField(value = "centre_harmonic_voltage_content9_max") + @ApiModelProperty(value = "8.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent9Max; /** * 8.5次间谐波电压含有率最小值 */ - private Double inharmV9Min; + @TableField(value = "centre_harmonic_voltage_content9_min") + @ApiModelProperty(value = "8.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent9Min; /** * 8.5次间谐波电压含有率平均值 */ - private Double inharmV9Avg; + @TableField(value = "centre_harmonic_voltage_content9_avg") + @ApiModelProperty(value = "8.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent9Avg; /** * 8.5次间谐波电压含有率95值 */ - private Double inharmV9Cp95; + @TableField(value = "centre_harmonic_voltage_content9_cp95") + @ApiModelProperty(value = "8.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent9Cp95; /** * 9.5次间谐波电压含有率最大值 */ - private Double inharmV10Max; + @TableField(value = "centre_harmonic_voltage_content10_max") + @ApiModelProperty(value = "9.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent10Max; /** * 9.5次间谐波电压含有率最小值 */ - private Double inharmV10Min; + @TableField(value = "centre_harmonic_voltage_content10_min") + @ApiModelProperty(value = "9.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent10Min; /** * 9.5次间谐波电压含有率平均值 */ - private Double inharmV10Avg; + @TableField(value = "centre_harmonic_voltage_content10_avg") + @ApiModelProperty(value = "9.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent10Avg; /** * 9.5次间谐波电压含有率95值 */ - private Double inharmV10Cp95; + @TableField(value = "centre_harmonic_voltage_content10_cp95") + @ApiModelProperty(value = "9.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent10Cp95; /** * 10.5次间谐波电压含有率最大值 */ - private Double inharmV11Max; + @TableField(value = "centre_harmonic_voltage_content11_max") + @ApiModelProperty(value = "10.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent11Max; /** * 10.5次间谐波电压含有率最小值 */ - private Double inharmV11Min; + @TableField(value = "centre_harmonic_voltage_content11_min") + @ApiModelProperty(value = "10.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent11Min; /** * 10.5次间谐波电压含有率平均值 */ - private Double inharmV11Avg; + @TableField(value = "centre_harmonic_voltage_content11_avg") + @ApiModelProperty(value = "10.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent11Avg; /** * 10.5次间谐波电压含有率95值 */ - private Double inharmV11Cp95; + @TableField(value = "centre_harmonic_voltage_content11_cp95") + @ApiModelProperty(value = "10.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent11Cp95; /** * 11.5次间谐波电压含有率最大值 */ - private Double inharmV12Max; + @TableField(value = "centre_harmonic_voltage_content12_max") + @ApiModelProperty(value = "11.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent12Max; /** * 11.5次间谐波电压含有率最小值 */ - private Double inharmV12Min; + @TableField(value = "centre_harmonic_voltage_content12_min") + @ApiModelProperty(value = "11.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent12Min; /** * 11.5次间谐波电压含有率平均值 */ - private Double inharmV12Avg; + @TableField(value = "centre_harmonic_voltage_content12_avg") + @ApiModelProperty(value = "11.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent12Avg; /** * 11.5次间谐波电压含有率95值 */ - private Double inharmV12Cp95; + @TableField(value = "centre_harmonic_voltage_content12_cp95") + @ApiModelProperty(value = "11.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent12Cp95; /** * 12.5次间谐波电压含有率最大值 */ - private Double inharmV13Max; + @TableField(value = "centre_harmonic_voltage_content13_max") + @ApiModelProperty(value = "12.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent13Max; /** * 12.5次间谐波电压含有率最小值 */ - private Double inharmV13Min; + @TableField(value = "centre_harmonic_voltage_content13_min") + @ApiModelProperty(value = "12.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent13Min; /** * 12.5次间谐波电压含有率平均值 */ - private Double inharmV13Avg; + @TableField(value = "centre_harmonic_voltage_content13_avg") + @ApiModelProperty(value = "12.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent13Avg; /** * 12.5次间谐波电压含有率95值 */ - private Double inharmV13Cp95; + @TableField(value = "centre_harmonic_voltage_content13_cp95") + @ApiModelProperty(value = "12.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent13Cp95; /** * 13.5次间谐波电压含有率最大值 */ - private Double inharmV14Max; + @TableField(value = "centre_harmonic_voltage_content14_max") + @ApiModelProperty(value = "13.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent14Max; /** * 13.5次间谐波电压含有率最小值 */ - private Double inharmV14Min; + @TableField(value = "centre_harmonic_voltage_content14_min") + @ApiModelProperty(value = "13.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent14Min; /** * 13.5次间谐波电压含有率平均值 */ - private Double inharmV14Avg; + @TableField(value = "centre_harmonic_voltage_content14_avg") + @ApiModelProperty(value = "13.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent14Avg; /** * 13.5次间谐波电压含有率95值 */ - private Double inharmV14Cp95; + @TableField(value = "centre_harmonic_voltage_content14_cp95") + @ApiModelProperty(value = "13.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent14Cp95; /** * 14.5次间谐波电压含有率最大值 */ - private Double inharmV15Max; + @TableField(value = "centre_harmonic_voltage_content15_max") + @ApiModelProperty(value = "14.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent15Max; /** * 14.5次间谐波电压含有率最小值 */ - private Double inharmV15Min; + @TableField(value = "centre_harmonic_voltage_content15_min") + @ApiModelProperty(value = "14.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent15Min; /** * 14.5次间谐波电压含有率平均值 */ - private Double inharmV15Avg; + @TableField(value = "centre_harmonic_voltage_content15_avg") + @ApiModelProperty(value = "14.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent15Avg; /** * 14.5次间谐波电压含有率95值 */ - private Double inharmV15Cp95; + @TableField(value = "centre_harmonic_voltage_content15_cp95") + @ApiModelProperty(value = "14.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent15Cp95; /** * 15.5次间谐波电压含有率最大值 */ - private Double inharmV16Max; + @TableField(value = "centre_harmonic_voltage_content16_max") + @ApiModelProperty(value = "15.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent16Max; /** * 15.5次间谐波电压含有率最小值 */ - private Double inharmV16Min; + @TableField(value = "centre_harmonic_voltage_content16_min") + @ApiModelProperty(value = "15.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent16Min; /** * 15.5次间谐波电压含有率平均值 */ - private Double inharmV16Avg; + @TableField(value = "centre_harmonic_voltage_content16_avg") + @ApiModelProperty(value = "15.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent16Avg; /** * 15.5次间谐波电压含有率95值 */ - private Double inharmV16Cp95; + @TableField(value = "centre_harmonic_voltage_content16_cp95") + @ApiModelProperty(value = "15.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent16Cp95; /** * 16.5次间谐波电压含有率最大值 */ - private Double inharmV17Max; + @TableField(value = "centre_harmonic_voltage_content17_max") + @ApiModelProperty(value = "16.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent17Max; /** * 16.5次间谐波电压含有率最小值 */ - private Double inharmV17Min; + @TableField(value = "centre_harmonic_voltage_content17_min") + @ApiModelProperty(value = "16.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent17Min; /** * 16.5次间谐波电压含有率平均值 */ - private Double inharmV17Avg; + @TableField(value = "centre_harmonic_voltage_content17_avg") + @ApiModelProperty(value = "16.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent17Avg; /** * 16.5次间谐波电压含有率95值 */ - private Double inharmV17Cp95; + @TableField(value = "centre_harmonic_voltage_content17_cp95") + @ApiModelProperty(value = "16.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent17Cp95; /** * 17.5次间谐波电压含有率最大值 */ - private Double inharmV18Max; + @TableField(value = "centre_harmonic_voltage_content18_max") + @ApiModelProperty(value = "17.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent18Max; /** * 17.5次间谐波电压含有率最小值 */ - private Double inharmV18Min; + @TableField(value = "centre_harmonic_voltage_content18_min") + @ApiModelProperty(value = "17.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent18Min; /** * 17.5次间谐波电压含有率平均值 */ - private Double inharmV18Avg; + @TableField(value = "centre_harmonic_voltage_content18_avg") + @ApiModelProperty(value = "17.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent18Avg; /** * 17.5次间谐波电压含有率95值 */ - private Double inharmV18Cp95; + @TableField(value = "centre_harmonic_voltage_content18_cp95") + @ApiModelProperty(value = "17.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent18Cp95; /** * 18.5次间谐波电压含有率最大值 */ - private Double inharmV19Max; + @TableField(value = "centre_harmonic_voltage_content19_max") + @ApiModelProperty(value = "18.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent19Max; /** * 18.5次间谐波电压含有率最小值 */ - private Double inharmV19Min; + @TableField(value = "centre_harmonic_voltage_content19_min") + @ApiModelProperty(value = "18.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent19Min; /** * 18.5次间谐波电压含有率平均值 */ - private Double inharmV19Avg; + @TableField(value = "centre_harmonic_voltage_content19_avg") + @ApiModelProperty(value = "18.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent19Avg; /** * 18.5次间谐波电压含有率95值 */ - private Double inharmV19Cp95; + @TableField(value = "centre_harmonic_voltage_content19_cp95") + @ApiModelProperty(value = "18.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent19Cp95; /** * 19.5次间谐波电压含有率最大值 */ - private Double inharmV20Max; + @TableField(value = "centre_harmonic_voltage_content20_max") + @ApiModelProperty(value = "19.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent20Max; /** * 19.5次间谐波电压含有率最小值 */ - private Double inharmV20Min; + @TableField(value = "centre_harmonic_voltage_content20_min") + @ApiModelProperty(value = "19.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent20Min; /** * 19.5次间谐波电压含有率平均值 */ - private Double inharmV20Avg; + @TableField(value = "centre_harmonic_voltage_content20_avg") + @ApiModelProperty(value = "19.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent20Avg; /** * 19.5次间谐波电压含有率95值 */ - private Double inharmV20Cp95; + @TableField(value = "centre_harmonic_voltage_content20_cp95") + @ApiModelProperty(value = "19.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent20Cp95; /** * 20.5次间谐波电压含有率最大值 */ - private Double inharmV21Max; + @TableField(value = "centre_harmonic_voltage_content21_max") + @ApiModelProperty(value = "20.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent21Max; /** * 20.5次间谐波电压含有率最小值 */ - private Double inharmV21Min; + @TableField(value = "centre_harmonic_voltage_content21_min") + @ApiModelProperty(value = "20.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent21Min; /** * 20.5次间谐波电压含有率平均值 */ - private Double inharmV21Avg; + @TableField(value = "centre_harmonic_voltage_content21_avg") + @ApiModelProperty(value = "20.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent21Avg; /** * 20.5次间谐波电压含有率95值 */ - private Double inharmV21Cp95; + @TableField(value = "centre_harmonic_voltage_content21_cp95") + @ApiModelProperty(value = "20.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent21Cp95; /** * 21.5次间谐波电压含有率最大值 */ - private Double inharmV22Max; + @TableField(value = "centre_harmonic_voltage_content22_max") + @ApiModelProperty(value = "21.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent22Max; /** * 21.5次间谐波电压含有率最小值 */ - private Double inharmV22Min; + @TableField(value = "centre_harmonic_voltage_content22_min") + @ApiModelProperty(value = "21.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent22Min; /** * 21.5次间谐波电压含有率平均值 */ - private Double inharmV22Avg; + @TableField(value = "centre_harmonic_voltage_content22_avg") + @ApiModelProperty(value = "21.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent22Avg; /** * 21.5次间谐波电压含有率95值 */ - private Double inharmV22Cp95; + @TableField(value = "centre_harmonic_voltage_content22_cp95") + @ApiModelProperty(value = "21.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent22Cp95; /** * 22.5次间谐波电压含有率最大值 */ - private Double inharmV23Max; + @TableField(value = "centre_harmonic_voltage_content23_max") + @ApiModelProperty(value = "22.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent23Max; /** * 22.5次间谐波电压含有率最小值 */ - private Double inharmV23Min; + @TableField(value = "centre_harmonic_voltage_content23_min") + @ApiModelProperty(value = "22.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent23Min; /** * 22.5次间谐波电压含有率平均值 */ - private Double inharmV23Avg; + @TableField(value = "centre_harmonic_voltage_content23_avg") + @ApiModelProperty(value = "22.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent23Avg; /** * 22.5次间谐波电压含有率95值 */ - private Double inharmV23Cp95; + @TableField(value = "centre_harmonic_voltage_content23_cp95") + @ApiModelProperty(value = "22.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent23Cp95; /** * 23.5次间谐波电压含有率最大值 */ - private Double inharmV24Max; + @TableField(value = "centre_harmonic_voltage_content24_max") + @ApiModelProperty(value = "23.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent24Max; /** * 23.5次间谐波电压含有率最小值 */ - private Double inharmV24Min; + @TableField(value = "centre_harmonic_voltage_content24_min") + @ApiModelProperty(value = "23.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent24Min; /** * 23.5次间谐波电压含有率平均值 */ - private Double inharmV24Avg; + @TableField(value = "centre_harmonic_voltage_content24_avg") + @ApiModelProperty(value = "23.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent24Avg; /** * 23.5次间谐波电压含有率95值 */ - private Double inharmV24Cp95; + @TableField(value = "centre_harmonic_voltage_content24_cp95") + @ApiModelProperty(value = "23.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent24Cp95; /** * 24.5次间谐波电压含有率最大值 */ - private Double inharmV25Max; + @TableField(value = "centre_harmonic_voltage_content25_max") + @ApiModelProperty(value = "24.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent25Max; /** * 24.5次间谐波电压含有率最小值 */ - private Double inharmV25Min; + @TableField(value = "centre_harmonic_voltage_content25_min") + @ApiModelProperty(value = "24.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent25Min; /** * 24.5次间谐波电压含有率平均值 */ - private Double inharmV25Avg; + @TableField(value = "centre_harmonic_voltage_content25_avg") + @ApiModelProperty(value = "24.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent25Avg; /** * 24.5次间谐波电压含有率95值 */ - private Double inharmV25Cp95; + @TableField(value = "centre_harmonic_voltage_content25_cp95") + @ApiModelProperty(value = "24.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent25Cp95; /** * 25.5次间谐波电压含有率最大值 */ - private Double inharmV26Max; + @TableField(value = "centre_harmonic_voltage_content26_max") + @ApiModelProperty(value = "25.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent26Max; /** * 25.5次间谐波电压含有率最小值 */ - private Double inharmV26Min; + @TableField(value = "centre_harmonic_voltage_content26_min") + @ApiModelProperty(value = "25.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent26Min; /** * 25.5次间谐波电压含有率平均值 */ - private Double inharmV26Avg; + @TableField(value = "centre_harmonic_voltage_content26_avg") + @ApiModelProperty(value = "25.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent26Avg; /** * 25.5次间谐波电压含有率95值 */ - private Double inharmV26Cp95; + @TableField(value = "centre_harmonic_voltage_content26_cp95") + @ApiModelProperty(value = "25.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent26Cp95; /** * 26.5次间谐波电压含有率最大值 */ - private Double inharmV27Max; + @TableField(value = "centre_harmonic_voltage_content27_max") + @ApiModelProperty(value = "26.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent27Max; /** * 26.5次间谐波电压含有率最小值 */ - private Double inharmV27Min; + @TableField(value = "centre_harmonic_voltage_content27_min") + @ApiModelProperty(value = "26.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent27Min; /** * 26.5次间谐波电压含有率平均值 */ - private Double inharmV27Avg; + @TableField(value = "centre_harmonic_voltage_content27_avg") + @ApiModelProperty(value = "26.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent27Avg; /** * 26.5次间谐波电压含有率95值 */ - private Double inharmV27Cp95; + @TableField(value = "centre_harmonic_voltage_content27_cp95") + @ApiModelProperty(value = "26.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent27Cp95; /** * 27.5次间谐波电压含有率最大值 */ - private Double inharmV28Max; + @TableField(value = "centre_harmonic_voltage_content28_max") + @ApiModelProperty(value = "27.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent28Max; /** * 27.5次间谐波电压含有率最小值 */ - private Double inharmV28Min; + @TableField(value = "centre_harmonic_voltage_content28_min") + @ApiModelProperty(value = "27.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent28Min; /** * 27.5次间谐波电压含有率平均值 */ - private Double inharmV28Avg; + @TableField(value = "centre_harmonic_voltage_content28_avg") + @ApiModelProperty(value = "27.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent28Avg; /** * 27.5次间谐波电压含有率95值 */ - private Double inharmV28Cp95; + @TableField(value = "centre_harmonic_voltage_content28_cp95") + @ApiModelProperty(value = "27.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent28Cp95; /** * 28.5次间谐波电压含有率最大值 */ - private Double inharmV29Max; + @TableField(value = "centre_harmonic_voltage_content29_max") + @ApiModelProperty(value = "28.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent29Max; /** * 28.5次间谐波电压含有率最小值 */ - private Double inharmV29Min; + @TableField(value = "centre_harmonic_voltage_content29_min") + @ApiModelProperty(value = "28.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent29Min; /** * 28.5次间谐波电压含有率平均值 */ - private Double inharmV29Avg; + @TableField(value = "centre_harmonic_voltage_content29_avg") + @ApiModelProperty(value = "28.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent29Avg; /** * 28.5次间谐波电压含有率95值 */ - private Double inharmV29Cp95; + @TableField(value = "centre_harmonic_voltage_content29_cp95") + @ApiModelProperty(value = "28.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent29Cp95; /** * 29.5次间谐波电压含有率最大值 */ - private Double inharmV30Max; + @TableField(value = "centre_harmonic_voltage_content30_max") + @ApiModelProperty(value = "29.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent30Max; /** * 29.5次间谐波电压含有率最小值 */ - private Double inharmV30Min; + @TableField(value = "centre_harmonic_voltage_content30_min") + @ApiModelProperty(value = "29.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent30Min; /** * 29.5次间谐波电压含有率平均值 */ - private Double inharmV30Avg; + @TableField(value = "centre_harmonic_voltage_content30_avg") + @ApiModelProperty(value = "29.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent30Avg; /** * 29.5次间谐波电压含有率95值 */ - private Double inharmV30Cp95; + @TableField(value = "centre_harmonic_voltage_content30_cp95") + @ApiModelProperty(value = "29.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent30Cp95; /** * 30.5次间谐波电压含有率最大值 */ - private Double inharmV31Max; + @TableField(value = "centre_harmonic_voltage_content31_max") + @ApiModelProperty(value = "30.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent31Max; /** * 30.5次间谐波电压含有率最小值 */ - private Double inharmV31Min; + @TableField(value = "centre_harmonic_voltage_content31_min") + @ApiModelProperty(value = "30.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent31Min; /** * 30.5次间谐波电压含有率平均值 */ - private Double inharmV31Avg; + @TableField(value = "centre_harmonic_voltage_content31_avg") + @ApiModelProperty(value = "30.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent31Avg; /** * 30.5次间谐波电压含有率95值 */ - private Double inharmV31Cp95; + @TableField(value = "centre_harmonic_voltage_content31_cp95") + @ApiModelProperty(value = "30.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent31Cp95; /** * 31.5次间谐波电压含有率最大值 */ - private Double inharmV32Max; + @TableField(value = "centre_harmonic_voltage_content32_max") + @ApiModelProperty(value = "31.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent32Max; /** * 31.5次间谐波电压含有率最小值 */ - private Double inharmV32Min; + @TableField(value = "centre_harmonic_voltage_content32_min") + @ApiModelProperty(value = "31.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent32Min; /** * 31.5次间谐波电压含有率平均值 */ - private Double inharmV32Avg; + @TableField(value = "centre_harmonic_voltage_content32_avg") + @ApiModelProperty(value = "31.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent32Avg; /** * 31.5次间谐波电压含有率95值 */ - private Double inharmV32Cp95; + @TableField(value = "centre_harmonic_voltage_content32_cp95") + @ApiModelProperty(value = "31.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent32Cp95; /** * 32.5次间谐波电压含有率最大值 */ - private Double inharmV33Max; + @TableField(value = "centre_harmonic_voltage_content33_max") + @ApiModelProperty(value = "32.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent33Max; /** * 32.5次间谐波电压含有率最小值 */ - private Double inharmV33Min; + @TableField(value = "centre_harmonic_voltage_content33_min") + @ApiModelProperty(value = "32.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent33Min; /** * 32.5次间谐波电压含有率平均值 */ - private Double inharmV33Avg; + @TableField(value = "centre_harmonic_voltage_content33_avg") + @ApiModelProperty(value = "32.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent33Avg; /** * 32.5次间谐波电压含有率95值 */ - private Double inharmV33Cp95; + @TableField(value = "centre_harmonic_voltage_content33_cp95") + @ApiModelProperty(value = "32.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent33Cp95; /** * 33.5次间谐波电压含有率最大值 */ - private Double inharmV34Max; + @TableField(value = "centre_harmonic_voltage_content34_max") + @ApiModelProperty(value = "33.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent34Max; /** * 33.5次间谐波电压含有率最小值 */ - private Double inharmV34Min; + @TableField(value = "centre_harmonic_voltage_content34_min") + @ApiModelProperty(value = "33.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent34Min; /** * 33.5次间谐波电压含有率平均值 */ - private Double inharmV34Avg; + @TableField(value = "centre_harmonic_voltage_content34_avg") + @ApiModelProperty(value = "33.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent34Avg; /** * 33.5次间谐波电压含有率95值 */ - private Double inharmV34Cp95; + @TableField(value = "centre_harmonic_voltage_content34_cp95") + @ApiModelProperty(value = "33.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent34Cp95; /** * 34.5次间谐波电压含有率最大值 */ - private Double inharmV35Max; + @TableField(value = "centre_harmonic_voltage_content35_max") + @ApiModelProperty(value = "34.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent35Max; /** * 34.5次间谐波电压含有率最小值 */ - private Double inharmV35Min; + @TableField(value = "centre_harmonic_voltage_content35_min") + @ApiModelProperty(value = "34.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent35Min; /** * 34.5次间谐波电压含有率平均值 */ - private Double inharmV35Avg; + @TableField(value = "centre_harmonic_voltage_content35_avg") + @ApiModelProperty(value = "34.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent35Avg; /** * 34.5次间谐波电压含有率95值 */ - private Double inharmV35Cp95; + @TableField(value = "centre_harmonic_voltage_content35_cp95") + @ApiModelProperty(value = "34.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent35Cp95; /** * 35.5次间谐波电压含有率最大值 */ - private Double inharmV36Max; + @TableField(value = "centre_harmonic_voltage_content36_max") + @ApiModelProperty(value = "35.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent36Max; /** * 35.5次间谐波电压含有率最小值 */ - private Double inharmV36Min; + @TableField(value = "centre_harmonic_voltage_content36_min") + @ApiModelProperty(value = "35.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent36Min; /** * 35.5次间谐波电压含有率平均值 */ - private Double inharmV36Avg; + @TableField(value = "centre_harmonic_voltage_content36_avg") + @ApiModelProperty(value = "35.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent36Avg; /** * 35.5次间谐波电压含有率95值 */ - private Double inharmV36Cp95; + @TableField(value = "centre_harmonic_voltage_content36_cp95") + @ApiModelProperty(value = "35.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent36Cp95; /** * 36.5次间谐波电压含有率最大值 */ - private Double inharmV37Max; + @TableField(value = "centre_harmonic_voltage_content37_max") + @ApiModelProperty(value = "36.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent37Max; /** * 36.5次间谐波电压含有率最小值 */ - private Double inharmV37Min; + @TableField(value = "centre_harmonic_voltage_content37_min") + @ApiModelProperty(value = "36.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent37Min; /** * 36.5次间谐波电压含有率平均值 */ - private Double inharmV37Avg; + @TableField(value = "centre_harmonic_voltage_content37_avg") + @ApiModelProperty(value = "36.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent37Avg; /** * 36.5次间谐波电压含有率95值 */ - private Double inharmV37Cp95; + @TableField(value = "centre_harmonic_voltage_content37_cp95") + @ApiModelProperty(value = "36.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent37Cp95; /** * 37.5次间谐波电压含有率最大值 */ - private Double inharmV38Max; + @TableField(value = "centre_harmonic_voltage_content38_max") + @ApiModelProperty(value = "37.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent38Max; /** * 37.5次间谐波电压含有率最小值 */ - private Double inharmV38Min; + @TableField(value = "centre_harmonic_voltage_content38_min") + @ApiModelProperty(value = "37.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent38Min; /** * 37.5次间谐波电压含有率平均值 */ - private Double inharmV38Avg; + @TableField(value = "centre_harmonic_voltage_content38_avg") + @ApiModelProperty(value = "37.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent38Avg; /** * 37.5次间谐波电压含有率95值 */ - private Double inharmV38Cp95; + @TableField(value = "centre_harmonic_voltage_content38_cp95") + @ApiModelProperty(value = "37.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent38Cp95; /** * 38.5次间谐波电压含有率最大值 */ - private Double inharmV39Max; + @TableField(value = "centre_harmonic_voltage_content39_max") + @ApiModelProperty(value = "38.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent39Max; /** * 38.5次间谐波电压含有率最小值 */ - private Double inharmV39Min; + @TableField(value = "centre_harmonic_voltage_content39_min") + @ApiModelProperty(value = "38.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent39Min; /** * 38.5次间谐波电压含有率平均值 */ - private Double inharmV39Avg; + @TableField(value = "centre_harmonic_voltage_content39_avg") + @ApiModelProperty(value = "38.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent39Avg; /** * 38.5次间谐波电压含有率95值 */ - private Double inharmV39Cp95; + @TableField(value = "centre_harmonic_voltage_content39_cp95") + @ApiModelProperty(value = "38.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent39Cp95; /** * 39.5次间谐波电压含有率最大值 */ - private Double inharmV40Max; + @TableField(value = "centre_harmonic_voltage_content40_max") + @ApiModelProperty(value = "39.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent40Max; /** * 39.5次间谐波电压含有率最小值 */ - private Double inharmV40Min; + @TableField(value = "centre_harmonic_voltage_content40_min") + @ApiModelProperty(value = "39.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent40Min; /** * 39.5次间谐波电压含有率平均值 */ - private Double inharmV40Avg; + @TableField(value = "centre_harmonic_voltage_content40_avg") + @ApiModelProperty(value = "39.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent40Avg; /** * 39.5次间谐波电压含有率95值 */ - private Double inharmV40Cp95; + @TableField(value = "centre_harmonic_voltage_content40_cp95") + @ApiModelProperty(value = "39.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent40Cp95; /** * 40.5次间谐波电压含有率最大值 */ - private Double inharmV41Max; + @TableField(value = "centre_harmonic_voltage_content41_max") + @ApiModelProperty(value = "40.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent41Max; /** * 40.5次间谐波电压含有率最小值 */ - private Double inharmV41Min; + @TableField(value = "centre_harmonic_voltage_content41_min") + @ApiModelProperty(value = "40.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent41Min; /** * 40.5次间谐波电压含有率平均值 */ - private Double inharmV41Avg; + @TableField(value = "centre_harmonic_voltage_content41_avg") + @ApiModelProperty(value = "40.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent41Avg; /** * 40.5次间谐波电压含有率95值 */ - private Double inharmV41Cp95; + @TableField(value = "centre_harmonic_voltage_content41_cp95") + @ApiModelProperty(value = "40.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent41Cp95; /** * 41.5次间谐波电压含有率最大值 */ - private Double inharmV42Max; + @TableField(value = "centre_harmonic_voltage_content42_max") + @ApiModelProperty(value = "41.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent42Max; /** * 41.5次间谐波电压含有率最小值 */ - private Double inharmV42Min; + @TableField(value = "centre_harmonic_voltage_content42_min") + @ApiModelProperty(value = "41.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent42Min; /** * 41.5次间谐波电压含有率平均值 */ - private Double inharmV42Avg; + @TableField(value = "centre_harmonic_voltage_content42_avg") + @ApiModelProperty(value = "41.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent42Avg; /** * 41.5次间谐波电压含有率95值 */ - private Double inharmV42Cp95; + @TableField(value = "centre_harmonic_voltage_content42_cp95") + @ApiModelProperty(value = "41.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent42Cp95; /** * 42.5次间谐波电压含有率最大值 */ - private Double inharmV43Max; + @TableField(value = "centre_harmonic_voltage_content43_max") + @ApiModelProperty(value = "42.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent43Max; /** * 42.5次间谐波电压含有率最小值 */ - private Double inharmV43Min; + @TableField(value = "centre_harmonic_voltage_content43_min") + @ApiModelProperty(value = "42.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent43Min; /** * 42.5次间谐波电压含有率平均值 */ - private Double inharmV43Avg; + @TableField(value = "centre_harmonic_voltage_content43_avg") + @ApiModelProperty(value = "42.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent43Avg; /** * 42.5次间谐波电压含有率95值 */ - private Double inharmV43Cp95; + @TableField(value = "centre_harmonic_voltage_content43_cp95") + @ApiModelProperty(value = "42.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent43Cp95; /** * 43.5次间谐波电压含有率最大值 */ - private Double inharmV44Max; + @TableField(value = "centre_harmonic_voltage_content44_max") + @ApiModelProperty(value = "43.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent44Max; /** * 43.5次间谐波电压含有率最小值 */ - private Double inharmV44Min; + @TableField(value = "centre_harmonic_voltage_content44_min") + @ApiModelProperty(value = "43.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent44Min; /** * 43.5次间谐波电压含有率平均值 */ - private Double inharmV44Avg; + @TableField(value = "centre_harmonic_voltage_content44_avg") + @ApiModelProperty(value = "43.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent44Avg; /** * 43.5次间谐波电压含有率95值 */ - private Double inharmV44Cp95; + @TableField(value = "centre_harmonic_voltage_content44_cp95") + @ApiModelProperty(value = "43.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent44Cp95; /** * 44.5次间谐波电压含有率最大值 */ - private Double inharmV45Max; + @TableField(value = "centre_harmonic_voltage_content45_max") + @ApiModelProperty(value = "44.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent45Max; /** * 44.5次间谐波电压含有率最小值 */ - private Double inharmV45Min; + @TableField(value = "centre_harmonic_voltage_content45_min") + @ApiModelProperty(value = "44.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent45Min; /** * 44.5次间谐波电压含有率平均值 */ - private Double inharmV45Avg; + @TableField(value = "centre_harmonic_voltage_content45_avg") + @ApiModelProperty(value = "44.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent45Avg; /** * 44.5次间谐波电压含有率95值 */ - private Double inharmV45Cp95; + @TableField(value = "centre_harmonic_voltage_content45_cp95") + @ApiModelProperty(value = "44.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent45Cp95; /** * 45.5次间谐波电压含有率最大值 */ - private Double inharmV46Max; + @TableField(value = "centre_harmonic_voltage_content46_max") + @ApiModelProperty(value = "45.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent46Max; /** * 45.5次间谐波电压含有率最小值 */ - private Double inharmV46Min; + @TableField(value = "centre_harmonic_voltage_content46_min") + @ApiModelProperty(value = "45.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent46Min; /** * 45.5次间谐波电压含有率平均值 */ - private Double inharmV46Avg; + @TableField(value = "centre_harmonic_voltage_content46_avg") + @ApiModelProperty(value = "45.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent46Avg; /** * 45.5次间谐波电压含有率95值 */ - private Double inharmV46Cp95; + @TableField(value = "centre_harmonic_voltage_content46_cp95") + @ApiModelProperty(value = "45.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent46Cp95; /** * 46.5次间谐波电压含有率最大值 */ - private Double inharmV47Max; + @TableField(value = "centre_harmonic_voltage_content47_max") + @ApiModelProperty(value = "46.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent47Max; /** * 46.5次间谐波电压含有率最小值 */ - private Double inharmV47Min; + @TableField(value = "centre_harmonic_voltage_content47_min") + @ApiModelProperty(value = "46.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent47Min; /** * 46.5次间谐波电压含有率平均值 */ - private Double inharmV47Avg; + @TableField(value = "centre_harmonic_voltage_content47_avg") + @ApiModelProperty(value = "46.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent47Avg; /** * 46.5次间谐波电压含有率95值 */ - private Double inharmV47Cp95; + @TableField(value = "centre_harmonic_voltage_content47_cp95") + @ApiModelProperty(value = "46.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent47Cp95; /** * 47.5次间谐波电压含有率最大值 */ - private Double inharmV48Max; + @TableField(value = "centre_harmonic_voltage_content48_max") + @ApiModelProperty(value = "47.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent48Max; /** * 47.5次间谐波电压含有率最小值 */ - private Double inharmV48Min; + @TableField(value = "centre_harmonic_voltage_content48_min") + @ApiModelProperty(value = "47.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent48Min; /** * 47.5次间谐波电压含有率平均值 */ - private Double inharmV48Avg; + @TableField(value = "centre_harmonic_voltage_content48_avg") + @ApiModelProperty(value = "47.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent48Avg; /** * 47.5次间谐波电压含有率95值 */ - private Double inharmV48Cp95; + @TableField(value = "centre_harmonic_voltage_content48_cp95") + @ApiModelProperty(value = "47.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent48Cp95; /** * 48.5次间谐波电压含有率最大值 */ - private Double inharmV49Max; + @TableField(value = "centre_harmonic_voltage_content49_max") + @ApiModelProperty(value = "48.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent49Max; /** * 48.5次间谐波电压含有率最小值 */ - private Double inharmV49Min; + @TableField(value = "centre_harmonic_voltage_content49_min") + @ApiModelProperty(value = "48.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent49Min; /** * 48.5次间谐波电压含有率平均值 */ - private Double inharmV49Avg; + @TableField(value = "centre_harmonic_voltage_content49_avg") + @ApiModelProperty(value = "48.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent49Avg; /** * 48.5次间谐波电压含有率95值 */ - private Double inharmV49Cp95; + @TableField(value = "centre_harmonic_voltage_content49_cp95") + @ApiModelProperty(value = "48.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent49Cp95; /** * 49.5次间谐波电压含有率最大值 */ - private Double inharmV50Max; + @TableField(value = "centre_harmonic_voltage_content50_max") + @ApiModelProperty(value = "49.5次间谐波电压含有率最大值") + private Double centreHarmonicVoltageContent50Max; /** * 49.5次间谐波电压含有率最小值 */ - private Double inharmV50Min; + @TableField(value = "centre_harmonic_voltage_content50_min") + @ApiModelProperty(value = "49.5次间谐波电压含有率最小值") + private Double centreHarmonicVoltageContent50Min; /** * 49.5次间谐波电压含有率平均值 */ - private Double inharmV50Avg; + @TableField(value = "centre_harmonic_voltage_content50_avg") + @ApiModelProperty(value = "49.5次间谐波电压含有率平均值") + private Double centreHarmonicVoltageContent50Avg; /** * 49.5次间谐波电压含有率95值 */ - private Double inharmV50Cp95; - - + @TableField(value = "centre_harmonic_voltage_content50_cp95") + @ApiModelProperty(value = "49.5次间谐波电压含有率95值") + private Double centreHarmonicVoltageContent50Cp95; } \ No newline at end of file diff --git a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPollutionDPO.java b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPollutionDPO.java index e70b445f5..d146c5843 100644 --- a/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPollutionDPO.java +++ b/pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RMpPollutionDPO.java @@ -24,7 +24,6 @@ import java.util.Date; /** * 单位污区图统计日表 */ -@ApiModel(value = "com-njcn-harmonic-pojo-po-RMpPollutionDPO") @Data @AllArgsConstructor @NoArgsConstructor diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java deleted file mode 100644 index 7417cf3dd..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/CoustmReportFeignClient.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.CoustomReportFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 自定义报表 - * @author qijian - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/report",//对应controller请求类 - fallbackFactory = CoustomReportFeignClientFallbackFactory.class//服务降级处理类 -) -public interface CoustmReportFeignClient { - - /** - * 批量处理报表 - * @author qijian - * @date 2022/10/19 - */ - @PostMapping("/batchReport") - HttpResult batchReport(@RequestBody LineParam reportParam); - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java deleted file mode 100644 index ba9b051f7..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DayDataFeignClient.java +++ /dev/null @@ -1,31 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.DayDataFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 自定义报表 - * @author qijian - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/daydata",//对应controller请求类 - fallbackFactory = DayDataFeignClientFallbackFactory.class//服务降级处理类 -) -public interface DayDataFeignClient { - - /** - * 批量处理报表 - * @author qijian - * @date 2022/10/19 - */ - @PostMapping("/dayDataHanlder") - HttpResult dayDataHanlder(@RequestBody LineParam jobParam); - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java deleted file mode 100644 index 300711029..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/DistortionRateFeignClient.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 谐波畸变率 - * @author xiaoyao - * @version 1.0.0 - * @createTime 2022/11/4 15:58 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE, - path = "/distortion", - fallbackFactory = DistortionRateFeignClientFallbackFactory.class -) -public interface DistortionRateFeignClient { - - @PostMapping("/distortionRate") - HttpResult distortionRate(@RequestBody @Validated LineParam lineParam); -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java deleted file mode 100644 index 783fef079..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicGeneralFeignClient.java +++ /dev/null @@ -1,28 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.DistortionRateFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 稳态综合评估 - * @author xiaoyao - * @version 1.0.0 - * @createTime 2022/11/7 15:11 - */ - -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE, - path = "/general", - fallbackFactory = DistortionRateFeignClientFallbackFactory.class -) -public interface HarmonicGeneralFeignClient { - - @PostMapping("/generalData") - HttpResult generalData(@RequestBody @Validated LineParam lineParam); -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java deleted file mode 100644 index 9733f79de..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/HarmonicMetricFeignClient.java +++ /dev/null @@ -1,27 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.HarmonicMetricFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * @author xiaoyao - * @version 1.0.0 - * @createTime 2022/11/7 15:12 - */ - -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE, - path = "/metric", - fallbackFactory = HarmonicMetricFeignClientFallbackFactory.class -) -public interface HarmonicMetricFeignClient { - - @PostMapping("/metricData") - HttpResult metricData(@RequestBody @Validated LineParam lineParam); -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java deleted file mode 100644 index d0bfd73a4..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/IntegrityFeignClient.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.IntegrityFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 自定义报表 - * @author qijian - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/integrity",//对应controller请求类 - fallbackFactory = IntegrityFeignClientFallbackFactory.class//服务降级处理类 -) -public interface IntegrityFeignClient { - - /** - * 批量处理报表 - * @author qijian - * @date 2022/10/19 - */ - @PostMapping("/computeDataIntegrity") - HttpResult computeDataIntegrity(@RequestBody @Validated LineParam lineParam); - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java deleted file mode 100644 index 51341caa4..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitTargetFeignClient.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.LimitTargetFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 自定义报表 - * @author qijian - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/limitTarget",//对应controller请求类 - fallbackFactory = LimitTargetFeignClientFallbackFactory.class//服务降级处理类 -) -public interface LimitTargetFeignClient { - - /** - * 批量处理报表 - * @author qijian - * @date 2022/10/19 - */ - @PostMapping("/getLimitTargetData") - HttpResult getLimitTargetData(@RequestBody @Validated LineParam lineParam); - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java deleted file mode 100644 index b6135bd1c..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/LimitrateFeignClient.java +++ /dev/null @@ -1,29 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.LimitrateFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 自定义报表 - * @author qijian - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/limitrate",//对应controller请求类 - fallbackFactory = LimitrateFeignClientFallbackFactory.class//服务降级处理类 -) -public interface LimitrateFeignClient { - - /** - * 越限 - */ - @PostMapping("/LimitRateHanlder") - HttpResult limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ); - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java deleted file mode 100644 index dd3b1a80a..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/NormalLimitFeignClient.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.NormalFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * - * @author denghaujun - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/normalLimit",//对应controller请求类 - fallbackFactory = NormalFeignClientFallbackFactory.class//服务降级处理类 -) -public interface NormalLimitFeignClient { - - /** - * - * @author denghaujun - * @date 2022/10/19 - */ - @PostMapping("/getNormLimitData") - HttpResult getNormLimitData(@RequestBody @Validated LineParam lineParam) ; - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java deleted file mode 100644 index 586c7d11e..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/OnlineRateFeignClient.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.OnlineRateFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 自定义报表 - * @author qijian - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/onlineRate",//对应controller请求类 - fallbackFactory = OnlineRateFeignClientFallbackFactory.class//服务降级处理类 -) -public interface OnlineRateFeignClient { - - /** - * 在线率 - */ - @PostMapping("/getOnlineRateData") - HttpResult getOnlineRateData(@RequestBody @Validated LineParam lineParam); - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java deleted file mode 100644 index 3cccf3d4d..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/PollutionFeignClient.java +++ /dev/null @@ -1,30 +0,0 @@ -package com.njcn.prepare.harmonic.api.line; - -import com.njcn.common.pojo.constant.ServerInfo; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.prepare.harmonic.api.line.fallback.PollutionFeignClientFallbackFactory; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import org.springframework.cloud.openfeign.FeignClient; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * 自定义报表 - * @author qijian - * @date 2022/10/20 - */ -@FeignClient( - value = ServerInfo.HARMONIC_PREPARE,//对应模块名 - path = "/pollution",//对应controller请求类 - fallbackFactory = PollutionFeignClientFallbackFactory.class//服务降级处理类 -) -public interface PollutionFeignClient { - - /** - * 污区 - */ - @PostMapping("/processPollutionData") - HttpResult processPollutionData(@RequestBody @Validated LineParam lineParam); - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java deleted file mode 100644 index a88d40d8a..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/CoustomReportFeignClientFallbackFactory.java +++ /dev/null @@ -1,44 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.CoustmReportFeignClient; -import com.njcn.prepare.harmonic.api.line.DayDataFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LimitRateHanlderParam; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * ReportFeignClientFallbackFactory - * - * @author qijian - * @version 1.0.0 - * @createTime 2022/10/24 - 9:52 - */ -@Slf4j -@Component -public class CoustomReportFeignClientFallbackFactory implements FallbackFactory { - - @Override - public CoustmReportFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new CoustmReportFeignClient() { - @Override - public HttpResult batchReport(@RequestBody LineParam reportParam){ - log.error("{}异常，降级处理，异常为：{}", "生成自定义报表: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java deleted file mode 100644 index 0e772755f..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DayDataFeignClientFallbackFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.DayDataFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * ReportFeignClientFallbackFactory - * - * @author qijian - * @version 1.0.0 - * @createTime 2022/10/24 - 9:52 - */ -@Slf4j -@Component -public class DayDataFeignClientFallbackFactory implements FallbackFactory { - - @Override - public DayDataFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new DayDataFeignClient() { - @Override - public HttpResult dayDataHanlder(@RequestBody LineParam jobParam){ - log.error("{}异常，降级处理，异常为：{}", "Date数据转Day数据: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java deleted file mode 100644 index f9e83540f..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/DistortionRateFeignClientFallbackFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.DistortionRateFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * @author xiaoyao - * @version 1.0.0 - * @createTime 2022/11/7 14:37 - */ -@Slf4j -@Component -public class DistortionRateFeignClientFallbackFactory implements FallbackFactory { - @Override - public DistortionRateFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new DistortionRateFeignClient() { - @Override - public HttpResult distortionRate(@RequestBody @Validated LineParam lineParam){ - log.error("{}异常，降级处理，异常为：{}", "谐波畸变率: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java deleted file mode 100644 index 01c971378..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicGeneralFeignClientFallbackFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.HarmonicGeneralFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * @author xiaoyao - * @version 1.0.0 - * @createTime 2022/11/7 15:17 - */ -@Slf4j -@Component -public class HarmonicGeneralFeignClientFallbackFactory implements FallbackFactory { - @Override - public HarmonicGeneralFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new HarmonicGeneralFeignClient() { - @Override - public HttpResult generalData(@RequestBody @Validated LineParam lineParam){ - log.error("{}异常，降级处理，异常为：{}", "稳态综合评估: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java deleted file mode 100644 index 0acf887c1..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/HarmonicMetricFeignClientFallbackFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.HarmonicMetricFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * @author xiaoyao - * @version 1.0.0 - * @createTime 2022/11/7 15:14 - */ -@Slf4j -@Component -public class HarmonicMetricFeignClientFallbackFactory implements FallbackFactory { - @Override - public HarmonicMetricFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new HarmonicMetricFeignClient() { - @Override - public HttpResult metricData(@RequestBody @Validated LineParam lineParam){ - log.error("{}异常，降级处理，异常为：{}", "稳态指标评估: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java deleted file mode 100644 index bdd909121..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/IntegrityFeignClientFallbackFactory.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.IntegrityFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * IntegrityFeignClientFallbackFactory - */ -@Slf4j -@Component -public class IntegrityFeignClientFallbackFactory implements FallbackFactory { - - @Override - public IntegrityFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new IntegrityFeignClient() { - @Override - public HttpResult computeDataIntegrity(@RequestBody @Validated LineParam lineParam) { - log.error("{}异常，降级处理，异常为：{}", "数据完整性处理: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java deleted file mode 100644 index 2c6844bd3..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitTargetFeignClientFallbackFactory.java +++ /dev/null @@ -1,43 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.LimitTargetFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * ReportFeignClientFallbackFactory - * - * @author qijian - * @version 1.0.0 - * @createTime 2022/10/24 - 9:52 - */ -@Slf4j -@Component -public class LimitTargetFeignClientFallbackFactory implements FallbackFactory { - - @Override - public LimitTargetFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new LimitTargetFeignClient() { - @Override - public HttpResult getLimitTargetData(@RequestBody @Validated LineParam lineParam) { - log.error("{}异常，降级处理，异常为：{}", "越限数据: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java deleted file mode 100644 index 93780ce7f..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/LimitrateFeignClientFallbackFactory.java +++ /dev/null @@ -1,42 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.LimitrateFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * ReportFeignClientFallbackFactory - * - * @author qijian - * @version 1.0.0 - * @createTime 2022/10/24 - 9:52 - */ -@Slf4j -@Component -public class LimitrateFeignClientFallbackFactory implements FallbackFactory { - - @Override - public LimitrateFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new LimitrateFeignClient() { - @Override - public HttpResult limitRateHanlder(@RequestBody LineParam limitRateHanlderParam ){ - log.error("{}异常，降级处理，异常为：{}", "越限数据处理: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java deleted file mode 100644 index 5cef19e96..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/NormalFeignClientFallbackFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.NormalLimitFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; - -/** - * NormalFeignClientFallbackFactory - */ -@Slf4j -@Component -public class NormalFeignClientFallbackFactory implements FallbackFactory { - - @Override - public NormalLimitFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new NormalLimitFeignClient() { - @Override - public HttpResult getNormLimitData(LineParam lineParam) { - log.error("{}异常，降级处理，异常为：{}", "告警数据: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java deleted file mode 100644 index b3f509d66..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/OnlineRateFeignClientFallbackFactory.java +++ /dev/null @@ -1,39 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.OnlineRateFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * OnlineRateFeignClientFallbackFactory - */ -@Slf4j -@Component -public class OnlineRateFeignClientFallbackFactory implements FallbackFactory { - - @Override - public OnlineRateFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new OnlineRateFeignClient() { - @Override - public HttpResult getOnlineRateData(@RequestBody @Validated LineParam lineParam){ - log.error("{}异常，降级处理，异常为：{}", "在线率: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java deleted file mode 100644 index c7063a0f8..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/line/fallback/PollutionFeignClientFallbackFactory.java +++ /dev/null @@ -1,40 +0,0 @@ -package com.njcn.prepare.harmonic.api.line.fallback; - -import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.exception.BusinessException; -import com.njcn.common.pojo.response.HttpResult; -import com.njcn.device.pq.utils.DeviceEnumUtil; -import com.njcn.prepare.harmonic.api.line.PollutionFeignClient; -import com.njcn.prepare.harmonic.pojo.param.LineParam; -import feign.hystrix.FallbackFactory; -import lombok.extern.slf4j.Slf4j; -import org.springframework.stereotype.Component; -import org.springframework.validation.annotation.Validated; -import org.springframework.web.bind.annotation.RequestBody; - -/** - * PollutionFeignClientFallbackFactory - * - */ -@Slf4j -@Component -public class PollutionFeignClientFallbackFactory implements FallbackFactory { - - @Override - public PollutionFeignClient create(Throwable throwable) { - Enum exceptionEnum = CommonResponseEnum.SERVICE_FALLBACK; - if (throwable.getCause() instanceof BusinessException) { - BusinessException businessException = (BusinessException)throwable.getCause(); - exceptionEnum = DeviceEnumUtil.getExceptionEnum(businessException.getResult()); - } - - Enum finalExceptionEnum = exceptionEnum; - return new PollutionFeignClient() { - @Override - public HttpResult processPollutionData(@RequestBody @Validated LineParam lineParam){ - log.error("{}异常，降级处理，异常为：{}", "污区数据: ", throwable.toString()); - throw new BusinessException(finalExceptionEnum); - } - }; - } -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java deleted file mode 100644 index 943bc253a..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/api/voltage/VoltageFeignClient.java +++ /dev/null @@ -1,10 +0,0 @@ -package com.njcn.prepare.harmonic.api.voltage; - -/** - * @author qijian - * @version 1.0.0 - * @date 2022年10月24日 20:13 - */ -public interface VoltageFeignClient { - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java index 3d53a630d..80ca65c9a 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/constant/InfluxdbPOConverter.java @@ -1,7 +1,9 @@ package com.njcn.prepare.harmonic.constant; -import com.njcn.prepare.harmonic.pojo.po.*; -import com.njcn.prepare.harmonic.pojo.po.line.*; +import com.njcn.harmonic.pojo.po.*; +import com.njcn.prepare.harmonic.pojo.influxdb.po.*; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpFlickerReportDPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpInharmonicIMagReportDPO; import org.mapstruct.Mapper; import org.mapstruct.Mapping; import org.mapstruct.factory.Mappers; @@ -73,7 +75,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v49", target = "harmonicVoltageContent49Max") @Mapping(source = "v50", target = "harmonicVoltageContent50Max") - public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPOMax(DataHarmRateVPO dataVPO); + public RMpHarmonicVRateReportD dataVPOTORMpHarmonicPReportDPOMax(DataHarmRateVPO dataVPO); @Mapping(source = "v1", target = "fundamentalVoltageMin") @Mapping(source = "v2", target = "harmonicVoltageContent2Min") @@ -125,7 +127,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v48", target = "harmonicVoltageContent48Min") @Mapping(source = "v49", target = "harmonicVoltageContent49Min") @Mapping(source = "v50", target = "harmonicVoltageContent50Min") - public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPOMin(DataHarmRateVPO dataVPO); + public RMpHarmonicVRateReportD dataVPOTORMpHarmonicPReportDPOMin(DataHarmRateVPO dataVPO); @Mapping(source = "v1", target = "fundamentalVoltageAvg") @@ -178,7 +180,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v48", target = "harmonicVoltageContent48Avg") @Mapping(source = "v49", target = "harmonicVoltageContent49Avg") @Mapping(source = "v50", target = "harmonicVoltageContent50Avg") - public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPOAvg(DataHarmRateVPO dataVPO); + public RMpHarmonicVRateReportD dataVPOTORMpHarmonicPReportDPOAvg(DataHarmRateVPO dataVPO); @Mapping(source = "v1", target = "fundamentalVoltage95") @@ -231,7 +233,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v48", target = "harmonicVoltageContent4895") @Mapping(source = "v49", target = "harmonicVoltageContent4995") @Mapping(source = "v50", target = "harmonicVoltageContent5095") - public RMpHarmonicVRateReportDPO dataVPOTORMpHarmonicPReportDPO95(DataHarmRateVPO dataVPO); + public RMpHarmonicVRateReportD dataVPOTORMpHarmonicPReportDPO95(DataHarmRateVPO dataVPO); /*DataIPO*/ @@ -286,7 +288,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "harmonicCurrentEffective48Max") @Mapping(source = "i49", target = "harmonicCurrentEffective49Max") @Mapping(source = "i50", target = "harmonicCurrentEffective50Max") - public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPOMax(DataIPO dataIPO); + public RMpHarmonicIMagReportD dataIPOTORMpHarmonicIMagReportDPOMax(DataIPO dataIPO); @Mapping(source = "IThd", target = "harmonicCurrentThdMin") @Mapping(source = "i1", target = "fundamentalCurrentMin") @@ -339,7 +341,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "harmonicCurrentEffective48Min") @Mapping(source = "i49", target = "harmonicCurrentEffective49Min") @Mapping(source = "i50", target = "harmonicCurrentEffective50Min") - public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPOMin(DataIPO dataIPO); + public RMpHarmonicIMagReportD dataIPOTORMpHarmonicIMagReportDPOMin(DataIPO dataIPO); @Mapping(source = "IThd", target = "harmonicCurrentThdAvg") @@ -393,7 +395,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "harmonicCurrentEffective48Avg") @Mapping(source = "i49", target = "harmonicCurrentEffective49Avg") @Mapping(source = "i50", target = "harmonicCurrentEffective50Avg") - public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPOAvg(DataIPO dataIPO); + public RMpHarmonicIMagReportD dataIPOTORMpHarmonicIMagReportDPOAvg(DataIPO dataIPO); @Mapping(source = "IThd", target = "harmonicCurrentThd95") @@ -447,7 +449,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "harmonicCurrentEffective4895") @Mapping(source = "i49", target = "harmonicCurrentEffective4995") @Mapping(source = "i50", target = "harmonicCurrentEffective5095") - public RMpHarmonicIMagReportDPO dataIPOTORMpHarmonicIMagReportDPO95(DataIPO dataIPO); + public RMpHarmonicIMagReportD dataIPOTORMpHarmonicIMagReportDPO95(DataIPO dataIPO); /*RMpFlickerReportDPO*/ @@ -517,7 +519,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "i48Min") @Mapping(source = "i49", target = "i49Min") @Mapping(source = "i50", target = "i50Min") - public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverterMin(DataHarmRateIPO dataHarmRateIPO); + public RMpHarmonicIRateReportD RMpHarmonicIRateReportDPOConverterMin(DataHarmRateIPO dataHarmRateIPO); @Mapping(source = "i2", target = "i2Max") @Mapping(source = "i3", target = "i3Max") @@ -568,7 +570,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "i48Max") @Mapping(source = "i49", target = "i49Max") @Mapping(source = "i50", target = "i50Max") - public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverterMax(DataHarmRateIPO dataHarmRateIPO); + public RMpHarmonicIRateReportD RMpHarmonicIRateReportDPOConverterMax(DataHarmRateIPO dataHarmRateIPO); @Mapping(source = "i2", target = "i2Avg") @@ -620,7 +622,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "i48Avg") @Mapping(source = "i49", target = "i49Avg") @Mapping(source = "i50", target = "i50Avg") - public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverterAvg(DataHarmRateIPO dataHarmRateIPO); + public RMpHarmonicIRateReportD RMpHarmonicIRateReportDPOConverterAvg(DataHarmRateIPO dataHarmRateIPO); @Mapping(source = "i2", target = "i2Cp95") @Mapping(source = "i3", target = "i3Cp95") @@ -671,7 +673,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "i48Cp95") @Mapping(source = "i49", target = "i49Cp95") @Mapping(source = "i50", target = "i50Cp95") - public RMpHarmonicIRateReportDPO RMpHarmonicIRateReportDPOConverter95(DataHarmRateIPO dataHarmRateIPO); + public RMpHarmonicIRateReportD RMpHarmonicIRateReportDPOConverter95(DataHarmRateIPO dataHarmRateIPO); /*RMpInharmonicIRateReportDPO*/ @Mapping(source = "i2", target = "inharmI2Min") @Mapping(source = "i3", target = "inharmI3Min") @@ -722,7 +724,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "inharmI48Min") @Mapping(source = "i49", target = "inharmI49Min") @Mapping(source = "i50", target = "inharmI50Min") - public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverterMin(DataInHarmRateIPO temp); + public RMpInharmonicIRateReportD RMpInharmonicIRateReportDPOConverterMin(DataInHarmRateIPO temp); @Mapping(source = "i2", target = "inharmI2Max") @Mapping(source = "i3", target = "inharmI3Max") @@ -773,7 +775,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "inharmI48Max") @Mapping(source = "i49", target = "inharmI49Max") @Mapping(source = "i50", target = "inharmI50Max") - public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverterMax(DataInHarmRateIPO temp); + public RMpInharmonicIRateReportD RMpInharmonicIRateReportDPOConverterMax(DataInHarmRateIPO temp); @Mapping(source = "i2", target = "inharmI2Avg") @@ -825,7 +827,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "inharmI48Avg") @Mapping(source = "i49", target = "inharmI49Avg") @Mapping(source = "i50", target = "inharmI50Avg") - public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverterAvg(DataInHarmRateIPO temp); + public RMpInharmonicIRateReportD RMpInharmonicIRateReportDPOConverterAvg(DataInHarmRateIPO temp); @Mapping(source = "i2", target = "inharmI2Cp95") @Mapping(source = "i3", target = "inharmI3Cp95") @@ -876,7 +878,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "i48", target = "inharmI48Cp95") @Mapping(source = "i49", target = "inharmI49Cp95") @Mapping(source = "i50", target = "inharmI50Cp95") - public RMpInharmonicIRateReportDPO RMpInharmonicIRateReportDPOConverter95(DataInHarmRateIPO temp); + public RMpInharmonicIRateReportD RMpInharmonicIRateReportDPOConverter95(DataInHarmRateIPO temp); /*RMpInharmonicIMagReportDPO*/ @Mapping(source = "i1", target = "simpleHarmonicCurrentEffective1Min") @@ -1137,7 +1139,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Min") @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Min") @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Min") - public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverterMin(DataInHarmRateVPO temp); + public RMpInharmonicVRateReportD RMpInharmonicVRateReportDPOConverterMin(DataInHarmRateVPO temp); @Mapping(source = "v1", target = "centreHarmonicVoltageContent1Max") @Mapping(source = "v2", target = "centreHarmonicVoltageContent2Max") @@ -1189,7 +1191,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Max") @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Max") @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Max") - public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverterMax(DataInHarmRateVPO temp); + public RMpInharmonicVRateReportD RMpInharmonicVRateReportDPOConverterMax(DataInHarmRateVPO temp); @Mapping(source = "v1", target = "centreHarmonicVoltageContent1Avg") @Mapping(source = "v2", target = "centreHarmonicVoltageContent2Avg") @@ -1241,7 +1243,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Avg") @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Avg") @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Avg") - public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverterAvg(DataInHarmRateVPO temp); + public RMpInharmonicVRateReportD RMpInharmonicVRateReportDPOConverterAvg(DataInHarmRateVPO temp); @Mapping(source = "v1", target = "centreHarmonicVoltageContent1Cp95") @Mapping(source = "v2", target = "centreHarmonicVoltageContent2Cp95") @@ -1293,7 +1295,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "v48", target = "centreHarmonicVoltageContent48Cp95") @Mapping(source = "v49", target = "centreHarmonicVoltageContent49Cp95") @Mapping(source = "v50", target = "centreHarmonicVoltageContent50Cp95") - public RMpInharmonicVRateReportDPO RMpInharmonicVRateReportDPOConverter95(DataInHarmRateVPO temp); + public RMpInharmonicVRateReportD RMpInharmonicVRateReportDPOConverter95(DataInHarmRateVPO temp); /*RMpInharmonicVRateReportDPO*/ @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Min") @@ -1346,7 +1348,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Min") @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Min") @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Min") - public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverterMin(DataHarmPowerPPO temp); + public RMpInharmonicVRateReportD RMpHarmonicPReportDPOConverterMin(DataHarmPowerPPO temp); @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Max") @Mapping(source = "p2", target = "centreHarmonicVoltageContent2Max") @@ -1398,7 +1400,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Max") @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Max") @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Max") - public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverterMax(DataHarmPowerPPO temp); + public RMpInharmonicVRateReportD RMpHarmonicPReportDPOConverterMax(DataHarmPowerPPO temp); @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Avg") @Mapping(source = "p2", target = "centreHarmonicVoltageContent2Avg") @@ -1450,7 +1452,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Avg") @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Avg") @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Avg") - public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverterAvg(DataHarmPowerPPO temp); + public RMpInharmonicVRateReportD RMpHarmonicPReportDPOConverterAvg(DataHarmPowerPPO temp); @Mapping(source = "p1", target = "centreHarmonicVoltageContent1Cp95") @@ -1503,7 +1505,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "p48", target = "centreHarmonicVoltageContent48Cp95") @Mapping(source = "p49", target = "centreHarmonicVoltageContent49Cp95") @Mapping(source = "p50", target = "centreHarmonicVoltageContent50Cp95") - public RMpInharmonicVRateReportDPO RMpHarmonicPReportDPOConverter95(DataHarmPowerPPO temp); + public RMpInharmonicVRateReportD RMpHarmonicPReportDPOConverter95(DataHarmPowerPPO temp); /*RMpMeasurePhaseReportDPO*/ @Mapping(source = "max.rms", target = "phaseVoltageEffectiveMax") @@ -1516,7 +1518,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "max3.s", target = "spApparentPowerMax") @Mapping(source = "max2.pf", target = "spPowerFactorMax") @Mapping(source = "max2.df", target = "spFundamentalPowerFactorMax") - public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterMax(DataVPO max, DataIPO max1, DataHarmPowerPPO max2, DataHarmPowerSPO max3, DataHarmPowerQPO max4); + public RMpMeasurePhaseReportD RMpMeasurePhaseReportDPOConverterMax(DataVPO max, DataIPO max1, DataHarmPowerPPO max2, DataHarmPowerSPO max3, DataHarmPowerQPO max4); @Mapping(source = "min.rms", target = "phaseVoltageEffectiveMin") @Mapping(source = "min.rmsLvr", target = "lineVoltageEffectiveMin") @@ -1528,7 +1530,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "min3.s", target = "spApparentPowerMin") @Mapping(source = "min2.pf", target = "spPowerFactorMin") @Mapping(source = "min2.df", target = "spFundamentalPowerFactorMin") - public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterMin(DataVPO min, DataIPO min1, DataHarmPowerPPO min2, DataHarmPowerSPO min3, DataHarmPowerQPO min4); + public RMpMeasurePhaseReportD RMpMeasurePhaseReportDPOConverterMin(DataVPO min, DataIPO min1, DataHarmPowerPPO min2, DataHarmPowerSPO min3, DataHarmPowerQPO min4); @Mapping(source = "avg.rms", target = "phaseVoltageEffectiveAvg") @@ -1541,7 +1543,7 @@ public interface InfluxdbPOConverter { @Mapping(source = "avg3.s", target = "spApparentPowerAvg") @Mapping(source = "avg2.pf", target = "spPowerFactorAvg") @Mapping(source = "avg2.df", target = "spFundamentalPowerFactorAvg") - public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterAVg(DataVPO avg, DataIPO avg1, DataHarmPowerPPO avg2, DataHarmPowerSPO avg3, DataHarmPowerQPO avg4); + public RMpMeasurePhaseReportD RMpMeasurePhaseReportDPOConverterAVg(DataVPO avg, DataIPO avg1, DataHarmPowerPPO avg2, DataHarmPowerSPO avg3, DataHarmPowerQPO avg4); @Mapping(source = "cp95.rms", target = "phaseVoltageEffective95") @@ -1554,5 +1556,5 @@ public interface InfluxdbPOConverter { @Mapping(source = "cp953.s", target = "spApparentPower95") @Mapping(source = "cp952.pf", target = "spPowerFactor95") @Mapping(source = "cp952.df", target = "spFundamentalPowerFactor95") - public RMpMeasurePhaseReportDPO RMpMeasurePhaseReportDPOConverterCp95(DataVPO cp95, DataIPO cp951, DataHarmPowerPPO cp952, DataHarmPowerSPO cp953, DataHarmPowerQPO cp954); + public RMpMeasurePhaseReportD RMpMeasurePhaseReportDPOConverterCp95(DataVPO cp95, DataIPO cp951, DataHarmPowerPPO cp952, DataHarmPowerSPO cp953, DataHarmPowerQPO cp954); } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java index 6e7308d99..f8a7c8317 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/LimitRateServiceTest.java @@ -1,10 +1,10 @@ package com.njcn.prepare.harmonic.controller; +import com.njcn.harmonic.pojo.po.ExcelRptTemp; import com.njcn.influxdb.utils.InfluxDbUtils; -import com.njcn.prepare.harmonic.mapper.line.ExcelRptTempMapper; -import com.njcn.prepare.harmonic.pojo.po.DataVPO; -import com.njcn.prepare.harmonic.pojo.po.ExcelRptTemp; -import com.njcn.prepare.harmonic.service.Impl.line.LimitRateService; +import com.njcn.prepare.harmonic.mapper.mysql.line.ExcelRptTempMapper; +import com.njcn.prepare.harmonic.pojo.influxdb.po.DataVPO; +import com.njcn.prepare.harmonic.service.mysql.Impl.line.LimitRateService; import org.influxdb.dto.QueryResult; import org.influxdb.impl.InfluxDBResultMapper; import org.junit.Test; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/AreaController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/AreaController.java deleted file mode 100644 index e70d8cab4..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/area/AreaController.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.prepare.harmonic.controller.area; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022年10月17日 20:13 - */ -public class AreaController { -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceController.java deleted file mode 100644 index 4cf88d517..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/device/DeviceController.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.prepare.harmonic.controller.device; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022年10月17日 20:13 - */ -public class DeviceController { -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java index d5f1861f9..26a5b0e06 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DayDataController.java @@ -7,7 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.DayDataService; +import com.njcn.prepare.harmonic.service.mysql.line.DayDataService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java index fe0ab38b3..0c8dd1963 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/DistortionRateController.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.DistortionRateService; +import com.njcn.prepare.harmonic.service.mysql.line.DistortionRateService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java index ace376049..f10fbeabd 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicGeneralController.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.HarmonicGeneralService; +import com.njcn.prepare.harmonic.service.mysql.line.HarmonicGeneralService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java index 3e6e288b7..74e0048c8 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/HarmonicMetricController.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.HarmonicMetricService; +import com.njcn.prepare.harmonic.service.mysql.line.HarmonicMetricService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java index 7b7b00cbb..4ade79d25 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/IntegrityController.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.IntegrityService; +import com.njcn.prepare.harmonic.service.mysql.line.IntegrityService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java index 1f45f03f3..35476a974 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitTargetController.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.LimitTargetService; +import com.njcn.prepare.harmonic.service.mysql.line.LimitTargetService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java index d0c71a76c..e28f48ee2 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/LimitrateController.java @@ -7,7 +7,7 @@ import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.device.pq.api.LineFeignClient; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.Impl.line.LimitRateService; +import com.njcn.prepare.harmonic.service.mysql.Impl.line.LimitRateService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java index 769f0c6d4..50357e4a0 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/NormalLimitController.java @@ -6,20 +6,17 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.NormalLimitService; +import com.njcn.prepare.harmonic.service.mysql.line.NormalLimitService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; -import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import java.time.LocalDateTime; - /** * @author denghuajun * @version 1.0.0 diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java index 5fe0daa0f..f71167f1b 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/OnlineRateController.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.OnlineRateService; +import com.njcn.prepare.harmonic.service.mysql.line.OnlineRateService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java index a4ea96534..024d3a301 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/PollutionController.java @@ -3,16 +3,14 @@ package com.njcn.prepare.harmonic.controller.line; import com.njcn.common.pojo.annotation.OperateInfo; import com.njcn.common.pojo.enums.common.LogEnum; import com.njcn.common.pojo.enums.response.CommonResponseEnum; -import com.njcn.common.pojo.param.StatisticsBizBaseParam; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.PollutionService; +import com.njcn.prepare.harmonic.service.mysql.line.PollutionService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; -import lombok.AllArgsConstructor; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.validation.annotation.Validated; @@ -21,8 +19,6 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import javax.servlet.http.HttpServletResponse; - /** * 监测点污染指标 diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java index 25daf78b8..100910f5b 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/line/ReportController.java @@ -6,7 +6,7 @@ import com.njcn.common.pojo.enums.response.CommonResponseEnum; import com.njcn.common.pojo.response.HttpResult; import com.njcn.common.utils.HttpResultUtil; import com.njcn.prepare.harmonic.pojo.param.LineParam; -import com.njcn.prepare.harmonic.service.line.ReportService; +import com.njcn.prepare.harmonic.service.mysql.line.ReportService; import com.njcn.web.controller.BaseController; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/substion/SubstionController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/substion/SubstionController.java deleted file mode 100644 index 97d6c60c8..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/substion/SubstionController.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.prepare.harmonic.controller.substion; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022年10月17日 20:13 - */ -public class SubstionController { -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/voltage/VoltageController.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/voltage/VoltageController.java deleted file mode 100644 index 4097fe9bb..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/controller/voltage/VoltageController.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.prepare.harmonic.controller.voltage; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022年10月17日 20:13 - */ -public class VoltageController { -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/area/AreaMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/area/AreaMapper.java deleted file mode 100644 index 7136b547b..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/area/AreaMapper.java +++ /dev/null @@ -1,9 +0,0 @@ -package com.njcn.prepare.harmonic.mapper.area; - -/** - * @author denghuajun - * @version 1.0.0 - * @date 2022年10月17日 20:15 - */ -public interface AreaMapper { -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/device/DeviceMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/device/DeviceMapper.java deleted file mode 100644 index d7fa0ec0e..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/device/DeviceMapper.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.njcn.prepare.harmonic.mapper.device; - -public interface DeviceMapper { - -} diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpFlickerReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpFlickerReportDPOMapper.java deleted file mode 100644 index 7b7e9cd3b..000000000 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpFlickerReportDPOMapper.java +++ /dev/null @@ -1,16 +0,0 @@ -package com.njcn.prepare.harmonic.mapper.line; - -import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpFlickerReportDPO; - -/** - * - * Description: - * 接口文档访问地址：http://serverIP:port/swagger-ui.html - * Date: 2022/10/26 14:15【需求编号】 - * - * @author clam - * @version V1.0.0 - */ -public interface RMpFlickerReportDPOMapper extends MppBaseMapper { -} \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/AbnormalMapper.java similarity index 57% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/AbnormalMapper.java index 0e43ae6fd..d23434564 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/AbnormalMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/AbnormalMapper.java @@ -1,8 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.AbnormalPO; -import com.njcn.prepare.harmonic.pojo.po.MpSurplusAbnormalD; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.MpSurplusAbnormalD; /** * @author denghuajun diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ExcelRptMapper.java similarity index 66% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ExcelRptMapper.java index 24d9de36c..3df20f223 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ExcelRptMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.ExcelRpt; +import com.njcn.harmonic.pojo.po.ExcelRpt; /** * ExcelRptMapper diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptTempMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ExcelRptTempMapper.java similarity index 70% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptTempMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ExcelRptTempMapper.java index 05f5c1359..0ad1f0833 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/ExcelRptTempMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/ExcelRptTempMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.ExcelRptTemp; +import com.njcn.harmonic.pojo.po.ExcelRptTemp; import java.util.List; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitRatePOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRatePOMapper.java similarity index 89% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitRatePOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRatePOMapper.java index ed6f350fa..3eb892336 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitRatePOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitRatePOMapper.java @@ -1,4 +1,4 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; import com.njcn.harmonic.pojo.po.LimitRatePO; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitTargetPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitTargetPOMapper.java similarity index 80% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitTargetPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitTargetPOMapper.java index dd22158b3..63143989e 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/LimitTargetPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/LimitTargetPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.LimitTargetPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.LimitTargetPO; /** * Description: diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/NormLimitMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/NormLimitMapper.java similarity index 69% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/NormLimitMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/NormLimitMapper.java index 81de1cd2b..8fcbe5f4c 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/NormLimitMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/NormLimitMapper.java @@ -1,4 +1,4 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; /** * @author denghuajun diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpFlickerReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpFlickerReportDPOMapper.java new file mode 100644 index 000000000..aa9e612da --- /dev/null +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpFlickerReportDPOMapper.java @@ -0,0 +1,24 @@ +package com.njcn.prepare.harmonic.mapper.mysql.line; + +import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpFlickerReportDPO; +import org.apache.ibatis.annotations.Select; + +import java.util.List; + +/** + * Description: + * 接口文档访问地址：http://serverIP:port/swagger-ui.html + * Date: 2022/10/26 14:15【需求编号】 + * + * @author clam + * @version V1.0.0 + */ +public interface RMpFlickerReportDPOMapper extends MppBaseMapper { + + @Select("select name from sys_user") + List testMysql(); + + @Select("select name from pqs_user") + List testOracle(); +} \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIMagReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicIMagReportDPOMapper.java similarity index 66% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIMagReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicIMagReportDPOMapper.java index a733bda24..82ec260a0 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIMagReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicIMagReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIMagReportDPO; +import com.njcn.harmonic.pojo.po.RMpHarmonicIMagReportD; /** * @@ -12,5 +12,5 @@ import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIMagReportDPO; * @author clam * @version V1.0.0 */ -public interface RMpHarmonicIMagReportDPOMapper extends MppBaseMapper { +public interface RMpHarmonicIMagReportDPOMapper extends MppBaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicIRateReportDPOMapper.java similarity index 66% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIRateReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicIRateReportDPOMapper.java index c5c7f03a4..5c2c119a9 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicIRateReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicIRateReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIRateReportDPO; +import com.njcn.harmonic.pojo.po.RMpHarmonicIRateReportD; /** * @@ -12,5 +12,5 @@ import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicIRateReportDPO; * @author clam * @version V1.0.0 */ -public interface RMpHarmonicIRateReportDPOMapper extends MppBaseMapper { +public interface RMpHarmonicIRateReportDPOMapper extends MppBaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicPReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicPReportDPOMapper.java similarity index 72% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicPReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicPReportDPOMapper.java index 2cc6bea67..ac8ca8056 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicPReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicPReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicPReportDPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpHarmonicPReportDPO; /** * Description: diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicVRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicVRateReportDPOMapper.java similarity index 66% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicVRateReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicVRateReportDPOMapper.java index aacb85ea1..c99f4fe08 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpHarmonicVRateReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpHarmonicVRateReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO; +import com.njcn.harmonic.pojo.po.RMpHarmonicVRateReportD; /** * @@ -12,5 +12,5 @@ import com.njcn.prepare.harmonic.pojo.po.line.RMpHarmonicVRateReportDPO; * @author clam * @version V1.0.0 */ -public interface RMpHarmonicVRateReportDPOMapper extends MppBaseMapper { +public interface RMpHarmonicVRateReportDPOMapper extends MppBaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIMagReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicIMagReportDPOMapper.java similarity index 71% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIMagReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicIMagReportDPOMapper.java index 8db968bd9..6383f6c0d 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIMagReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicIMagReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIMagReportDPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpInharmonicIMagReportDPO; /** * Description: diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicIRateReportDPOMapper.java similarity index 65% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIRateReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicIRateReportDPOMapper.java index 7ae1a6506..db586c3fc 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicIRateReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicIRateReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIRateReportDPO; +import com.njcn.harmonic.pojo.po.RMpInharmonicIRateReportD; /** * @@ -12,5 +12,5 @@ import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicIRateReportDPO; * @author clam * @version V1.0.0 */ -public interface RMpInharmonicIRateReportDPOMapper extends MppBaseMapper { +public interface RMpInharmonicIRateReportDPOMapper extends MppBaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicVRateReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicVRateReportDPOMapper.java similarity index 65% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicVRateReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicVRateReportDPOMapper.java index 08feb01dd..350cb7189 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpInharmonicVRateReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpInharmonicVRateReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicVRateReportDPO; +import com.njcn.harmonic.pojo.po.RMpInharmonicVRateReportD; /** * Description: @@ -11,5 +11,5 @@ import com.njcn.prepare.harmonic.pojo.po.line.RMpInharmonicVRateReportDPO; * @author clam * @version V1.0.0 */ -public interface RMpInharmonicVRateReportDPOMapper extends MppBaseMapper { +public interface RMpInharmonicVRateReportDPOMapper extends MppBaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasurePhaseReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMeasurePhaseReportDPOMapper.java similarity index 66% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasurePhaseReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMeasurePhaseReportDPOMapper.java index 45c40786e..84b3f2f44 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasurePhaseReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMeasurePhaseReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasurePhaseReportDPO; +import com.njcn.harmonic.pojo.po.RMpMeasurePhaseReportD; /** * @@ -12,5 +12,5 @@ import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasurePhaseReportDPO; * @author clam * @version V1.0.0 */ -public interface RMpMeasurePhaseReportDPOMapper extends MppBaseMapper { +public interface RMpMeasurePhaseReportDPOMapper extends MppBaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasureReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMeasureReportDPOMapper.java similarity index 68% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasureReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMeasureReportDPOMapper.java index 7fc0ce9cb..c38b58f38 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpMeasureReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpMeasureReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasureReportDPO; +import com.njcn.harmonic.pojo.po.RMpMeasureReportD; /** * @@ -12,5 +12,5 @@ import com.njcn.prepare.harmonic.pojo.po.line.RMpMeasureReportDPO; * @author clam * @version V1.0.0 */ -public interface RMpMeasureReportDPOMapper extends MppBaseMapper { +public interface RMpMeasureReportDPOMapper extends MppBaseMapper { } \ No newline at end of file diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPltReportDPOMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPltReportDPOMapper.java similarity index 72% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPltReportDPOMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPltReportDPOMapper.java index af86f5257..4d448eb96 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPltReportDPOMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPltReportDPOMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.github.jeffreyning.mybatisplus.base.MppBaseMapper; -import com.njcn.prepare.harmonic.pojo.po.line.RMpPltReportDPO; +import com.njcn.prepare.harmonic.pojo.mysql.po.line.RMpPltReportDPO; /** * diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPollutionDMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPollutionDMapper.java similarity index 73% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPollutionDMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPollutionDMapper.java index 74efba5c1..25a570929 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpPollutionDMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpPollutionDMapper.java @@ -1,10 +1,9 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RMpPollutionD; +import com.njcn.harmonic.pojo.po.RMpPollutionDPO; import org.apache.ibatis.annotations.Param; -import java.util.List; import java.util.Map; /** @@ -15,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RMpPollutionDMapper extends BaseMapper { +public interface RMpPollutionDMapper extends BaseMapper { int insertPollution(@Param("item") Map item); diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpVThdMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpVThdMapper.java similarity index 78% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpVThdMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpVThdMapper.java index 1ddac9c9c..dd2fa9f23 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RMpVThdMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RMpVThdMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RMpVThd; +import com.njcn.harmonic.pojo.po.RMpVThd; import org.apache.ibatis.annotations.Param; import java.util.Map; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgDMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgDMapper.java similarity index 66% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgDMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgDMapper.java index 2e205e483..0de09cbae 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgDMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgDMapper.java @@ -1,8 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RMpPollutionD; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgD; +import com.njcn.harmonic.pojo.po.RStatPollutionOrgDPO; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -15,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RStatPollutionOrgDMapper extends BaseMapper { +public interface RStatPollutionOrgDMapper extends BaseMapper { int insertPollution(@Param("item") Map item); diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgMMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgMMapper.java similarity index 74% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgMMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgMMapper.java index 212afb13b..75557aee3 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgMMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgMMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgM; +import com.njcn.harmonic.pojo.po.RStatPollutionOrgMPO; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -14,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RStatPollutionOrgMMapper extends BaseMapper { +public interface RStatPollutionOrgMMapper extends BaseMapper { int insertPollution(@Param("item") Map item); } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgQMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgQMapper.java similarity index 74% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgQMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgQMapper.java index 774e7a5aa..e9189add6 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgQMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgQMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgQ; +import com.njcn.harmonic.pojo.po.RStatPollutionOrgQPO; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -14,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RStatPollutionOrgQMapper extends BaseMapper { +public interface RStatPollutionOrgQMapper extends BaseMapper { int insertPollution(@Param("item") Map item); } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgYMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgYMapper.java similarity index 74% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgYMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgYMapper.java index 09a258a0c..270205075 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionOrgYMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionOrgYMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgY; +import com.njcn.harmonic.pojo.po.RStatPollutionOrgYPO; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -14,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RStatPollutionOrgYMapper extends BaseMapper { +public interface RStatPollutionOrgYMapper extends BaseMapper { int insertPollution(@Param("item") Map item); } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationDMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationDMapper.java similarity index 64% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationDMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationDMapper.java index 19a21dabe..279db526a 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationDMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationDMapper.java @@ -1,8 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionOrgD; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationD; +import com.njcn.harmonic.pojo.po.RStatPollutionSubstationDPO; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -15,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RStatPollutionSubstationDMapper extends BaseMapper { +public interface RStatPollutionSubstationDMapper extends BaseMapper { int insertPollution(@Param("item") Map item); diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationMMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationMMapper.java similarity index 69% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationMMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationMMapper.java index da814c86b..f38cdaf5d 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationMMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationMMapper.java @@ -1,7 +1,8 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationM; +import com.njcn.harmonic.pojo.po.RStatPollutionSubstationDPO; +import com.njcn.harmonic.pojo.po.RStatPollutionSubstationM; import org.apache.ibatis.annotations.Param; import java.util.Map; diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationQMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationQMapper.java similarity index 71% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationQMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationQMapper.java index d6b893178..9c49e169d 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationQMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationQMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationQ; +import com.njcn.harmonic.pojo.po.RStatPollutionSubstationQPO; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -14,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RStatPollutionSubstationQMapper extends BaseMapper { +public interface RStatPollutionSubstationQMapper extends BaseMapper { int insertPollution(@Param("item") Map item); } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationYMapper.java b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationYMapper.java similarity index 71% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationYMapper.java rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationYMapper.java index e16aa126d..8d227c314 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/RStatPollutionSubstationYMapper.java +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/RStatPollutionSubstationYMapper.java @@ -1,7 +1,7 @@ -package com.njcn.prepare.harmonic.mapper.line; +package com.njcn.prepare.harmonic.mapper.mysql.line; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.njcn.prepare.harmonic.pojo.po.RStatPollutionSubstationY; +import com.njcn.harmonic.pojo.po.RStatPollutionSubstationYPO; import org.apache.ibatis.annotations.Param; import java.util.Map; @@ -14,7 +14,7 @@ import java.util.Map; * @author xiaoyao * @since 2022-10-20 */ -public interface RStatPollutionSubstationYMapper extends BaseMapper { +public interface RStatPollutionSubstationYMapper extends BaseMapper { int insertPollution(@Param("item") Map item); } diff --git a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ExcelRptTempMapper.xml similarity index 84% rename from pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml rename to pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ExcelRptTempMapper.xml index 976991c0a..45722ab87 100644 --- a/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/line/mapping/ExcelRptTempMapper.xml +++ b/pqs-prepare/harmonic-prepare/src/main/java/com/njcn/prepare/harmonic/mapper/mysql/line/mapping/ExcelRptTempMapper.xml @@ -1,6 +1,6 @@ - +