Microservice/pqs
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

将日均相关监测点属性，由Integer换成Float类型

Browse Source
This commit is contained in:
wurui
2023-03-27 19:34:37 +08:00
parent 489fb24266
commit e8af55faf8
39 changed files with 89 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicM.java
View File

@@ -38,7 +38,7 @@ public class RStatHarmonicM {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgM.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgM implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgQ.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgQ implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicOrgY.java
View File

@@ -31,7 +31,7 @@ public class RStatHarmonicOrgY implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicQ.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicQ implements Serializable {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicVoltageM.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicVoltageM {
private String voltageType;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatHarmonicY.java
View File

@@ -41,7 +41,7 @@ public class RStatHarmonicY implements Serializable {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数（根据 日表的超标监测点数 取平均值）")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数（监测点指标统计明细日表 统计）")
private Integer overLimitMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgM.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgM implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer harmonicMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgM implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgMPO.java
View File

@@ -56,7 +56,7 @@ public class RStatOrgMPO {
* 日均有效接入监测点数
*/
@TableField(value = "effective_measurement_average")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -68,7 +68,7 @@ public class RStatOrgMPO {
* 日均稳态超标监测点数
*/
@TableField(value = "harmonic_measurement_average")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -110,7 +110,7 @@ public class RStatOrgMPO {
* 日均监测到暂态指标的监测点数
*/
@TableField(value = "event_measurement_average")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
/**
* 累计监测到暂态指标的监测点数

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgQ.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgQ implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer harmonicMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgQ implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/po/RStatOrgY.java
View File

@@ -41,13 +41,13 @@ public class RStatOrgY implements Serializable {
private Integer allCount;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer overLimitMeasurementAccrued;
@@ -68,7 +68,7 @@ public class RStatOrgY implements Serializable {
private Float flickerPassRate;
@ApiModelProperty(value = "日均监测到暂态指标的监测点数")
private Integer eventMeasurementAverage;
private Float eventMeasurementAverage;
@ApiModelProperty(value = "累计监测到暂态指标的监测点数")
private Integer eventMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RIconVO.java
View File

@@ -20,7 +20,7 @@ public class RIconVO {
private Integer sort;
@ApiModelProperty(value ="日均监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value ="累计监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicMVO.java
View File

@@ -23,7 +23,7 @@ public class RStatHarmonicMVO {
private String harmonicName;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

2
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatHarmonicVO.java
View File

@@ -23,7 +23,7 @@ public class RStatHarmonicVO {
private String harmonicType;
@ApiModelProperty(value = "日均超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计超标监测点数")
private Integer overLimitMeasurementAccrued;

4
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatOrgVO.java
View File

@@ -21,13 +21,13 @@ public class RStatOrgVO {
private String orgName;
@ApiModelProperty(value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
@ApiModelProperty(value = "累计有效接入监测点数")
private Integer effectiveMeasurementAccrued;
@ApiModelProperty(value = "日均稳态超标监测点数")
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
@ApiModelProperty(value = "累计稳态超标监测点数")
private Integer overLimitMeasurementAccrued;

22
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrg2VO.java
View File

@@ -50,7 +50,7 @@ public class RStatSubstationOrg2VO implements Serializable {
* 日均有效接入监测点数
*/
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -62,7 +62,7 @@ public class RStatSubstationOrg2VO implements Serializable {
* 日均稳态超标监测点数
*/
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -87,7 +87,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 频率偏差
*/
private Integer tAverage;
private Float tAverage;
private Integer tAccrued;
private Float oAverage;
private Float oAccrued;
@@ -100,7 +100,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 电压偏差
*/
private Integer tAverage1;
private Float tAverage1;
private Integer tAccrued1;
private Float oAverage1;
private Float oAccrued1;
@@ -113,7 +113,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 闪变
*/
private Integer tAverage2;
private Float tAverage2;
private Integer tAccrued2;
private Float oAverage2;
private Float oAccrued2;
@@ -126,7 +126,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
* 谐波电压
*/
private Integer tAverage3;
private Float tAverage3;
private Integer tAccrued3;
private Float oAverage3;
private Float oAccrued3;
@@ -139,7 +139,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*谐波电流
*/
private Integer tAverage4;
private Float tAverage4;
private Integer tAccrued4;
private Float oAverage4;
private Float oAccrued4;
@@ -153,7 +153,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*间谐波电压
*/
private Integer tAverage5;
private Float tAverage5;
private Integer tAccrued5;
private Float oAverage5;
private Float oAccrued5;
@@ -167,7 +167,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*三相电压不平衡度
*/
private Integer tAverage6;
private Float tAverage6;
private Integer tAccrued6;
private Float oAverage6;
private Float oAccrued6;
@@ -180,7 +180,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*负序电流
*/
private Integer tAverage7;
private Float tAverage7;
private Integer tAccrued7;
private Float oAverage7;
private Float oAccrued7;
@@ -193,7 +193,7 @@ public class RStatSubstationOrg2VO implements Serializable {
/**
*总稳态指标
*/
private Integer tAverage8;
private Float tAverage8;
private Integer tAccrued8;
private Float oAverage8;
private Float oAccrued8;

6
pqs-harmonic/harmonic-api/src/main/java/com/njcn/harmonic/pojo/vo/RStatSubstationOrgVO.java
View File

@@ -56,7 +56,7 @@ public class RStatSubstationOrgVO implements Serializable {
* 日均有效接入监测点数
*/
@ApiModelProperty(name = "effectiveMeasurementAverage", value = "日均有效接入监测点数")
private Integer effectiveMeasurementAverage;
private Float effectiveMeasurementAverage;
/**
* 累计有效接入监测点数
@@ -68,7 +68,7 @@ public class RStatSubstationOrgVO implements Serializable {
* 日均稳态超标监测点数
*/
@ApiModelProperty(name = "eventMeasurementAverage", value = "日均监测到暂态指标的监测点数")
private Integer harmonicMeasurementAverage;
private Float harmonicMeasurementAverage;
/**
* 累计稳态超标监测点数
@@ -97,7 +97,7 @@ public class RStatSubstationOrgVO implements Serializable {
/**
* 日均超标监测点数（根据 日表的超标监测点数 取平均值）
*/
private Integer overLimitMeasurementAverage;
private Float overLimitMeasurementAverage;
/**
* 累计超标监测点数（监测点指标统计明细日表 统计）
*/