合并代码

This commit is contained in:
2022-11-23 19:05:16 +08:00
parent dce2972202
commit 9b2759f71e
44 changed files with 969 additions and 975 deletions

View File

@@ -15,7 +15,7 @@ import java.util.Date;
*/
@Data
@ApiModel("监测点暂态指标数据统计表")
@ApiModel("主网-监测点暂态指标数据统计表")
public class RStatEventOrgVO implements Serializable {
private static final long serialVersionUID = -15971491825708754L;
@@ -41,12 +41,6 @@ public class RStatEventOrgVO implements Serializable {
@ApiModelProperty(name = "dataDate", value = "生成数据的时间,每年统计一次")
private Date dataDate;
/**
* 监测点类别
*/
@ApiModelProperty(name = "measurementTypeClass",value = "监测点类别")
private String measurementTypeClass;
/**
* 日均有效接入监测点数
*/
@@ -83,17 +77,6 @@ public class RStatEventOrgVO implements Serializable {
@ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
private Double eventMeasurementRatioAccrued;
/**
* 暂态指标发生次数
*/
@ApiModelProperty(name = "eventCount",value = "暂态指标发生次数")
private Integer eventCount;
/**
* 暂态指标发生频次
*/
@ApiModelProperty(name = "eventFreq",value = "暂态指标发生频次")
private Double eventFreq;
/**
* 日均短时中断
*/
@@ -114,18 +97,6 @@ public class RStatEventOrgVO implements Serializable {
*/
@ApiModelProperty(name = "cumulativeShortInterruptionsProportion", value = "累计暂态指标占比")
private Double cumulativeShortInterruptionsProportion;
/**
* 短时中断频次
*/
@ApiModelProperty(name = "shortInterruptionsFreq",value = "短时中断频次")
private Double shortInterruptionsFreq;
/**
* 短时中断次数
*/
@ApiModelProperty(name = "shortInterruptionsCount",value = "短时中断次数")
private Integer shortInterruptionsCount;
/**
@@ -148,19 +119,6 @@ public class RStatEventOrgVO implements Serializable {
*/
@ApiModelProperty(name = "cumulativeVoltageRiseProportion", value = "累计电压暂升占比")
private Double cumulativeVoltageRiseProportion;
/**
* 电压暂升频次
*/
@ApiModelProperty(name = "voltageRiseFreq",value = "电压暂升频次")
private Double voltageRiseFreq;
/**
* 电压暂升次数
*/
@ApiModelProperty(name = "voltageRiseCount",value = "电压暂升次数")
private Integer voltageRiseCount;
/**
@@ -183,16 +141,6 @@ public class RStatEventOrgVO implements Serializable {
*/
@ApiModelProperty(name = "cumulativeVoltageDipProportion", value = "累计电压暂降占比")
private Double cumulativeVoltageDipProportion;
/**
* 电压暂降频次
*/
@ApiModelProperty(name = "voltageDipFreq",value = "电压暂降频次")
private Double voltageDipFreq;
/**
* 电压暂降次数
*/
@ApiModelProperty(name = "voltageDipCount",value = "电压暂降次数")
private Integer voltageDipCount;
/**

View File

@@ -77,19 +77,19 @@ public class RStatOrgVO implements Serializable {
* 日均暂态超标监测点数占比
*/
@ApiModelProperty(name = "eventMeasurementRatioAverage", value = "日均暂态超标监测点数占比")
private Double eventMeasurementRatioAverage;
private String eventMeasurementRatioAverage;
/**
* 累计暂态超标监测点数占比
*/
@ApiModelProperty(name = "eventMeasurementRatioAccrued", value = "累计暂态超标监测点数占比")
private Double eventMeasurementRatioAccrued;
private String eventMeasurementRatioAccrued;
/**
* 暂态指标发生频次
*/
@ApiModelProperty(name = "eventFreq", value = "暂态指标发生频次")
private Double eventFreq;
private String eventFreq;
/**
* 暂态指标发生次数

View File

@@ -20,7 +20,7 @@ public class RVoltageIconVO {
@ApiModelProperty(value = "变电站数量")
private Integer substationCount;
@ApiModelProperty(value = "态超标变电站数量")
@ApiModelProperty(value = "态超标变电站数量")
private Integer harmonicCount;
}