1.调整污染值监测点逻辑
2.解决devices模块Swagger页面无法展示问题
This commit is contained in:
@@ -70,8 +70,8 @@ public class LinePollution implements Serializable {
|
||||
/**
|
||||
* 位置,电网侧&非电网侧
|
||||
*/
|
||||
@Excel(name = "监测位置", width = 30)
|
||||
@ApiModelProperty("监测位置")
|
||||
@Excel(name = "用户性质", width = 30)
|
||||
@ApiModelProperty("用户性质")
|
||||
private String powerFlag;
|
||||
|
||||
/**
|
||||
@@ -84,7 +84,7 @@ public class LinePollution implements Serializable {
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* 监测点电压等级
|
||||
* 变电站电压等级
|
||||
*/
|
||||
@Excel(name = "变电站电压等级", width = 30)
|
||||
@ApiModelProperty("变电站电压等级")
|
||||
@@ -112,7 +112,7 @@ public class LinePollution implements Serializable {
|
||||
private Integer interval;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* 在线率
|
||||
*/
|
||||
@Excel(name = "在线率(%)",type = 10, width = 30)
|
||||
@@ -120,7 +120,7 @@ public class LinePollution implements Serializable {
|
||||
private Float onlineRate;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
*
|
||||
* 完整性
|
||||
*/
|
||||
@Excel(name = "完整率(%)",type = 10, width = 30)
|
||||
@@ -134,42 +134,47 @@ public class LinePollution implements Serializable {
|
||||
@ApiModelProperty("谐波污染值")
|
||||
private Double HarmonicValue;
|
||||
|
||||
/**
|
||||
* 暂升次数 1.1~1.8
|
||||
* 10ms ~ 1min
|
||||
*/
|
||||
@Excel(name = "暂升次数(次)",type = 10, width = 20)
|
||||
@ApiModelProperty("暂升次数(次)")
|
||||
private Integer upCounts;
|
||||
// /**
|
||||
// * 暂升次数 1.1~1.8
|
||||
// * 10ms ~ 1min
|
||||
// */
|
||||
// @Excel(name = "暂升次数(次)",type = 10, width = 20)
|
||||
// @ApiModelProperty("暂升次数(次)")
|
||||
// private Integer upCounts;
|
||||
//
|
||||
// /**
|
||||
// * 暂降次数 0.1~0.9
|
||||
// * 10ms ~ 1min
|
||||
// */
|
||||
// @Excel(name = "电压暂降(次)",type = 10, width = 20)
|
||||
// @ApiModelProperty("电压暂降(次)")
|
||||
// private Integer downCounts;
|
||||
//
|
||||
// /**
|
||||
// * 短时中断 0~0.1
|
||||
// * 10ms ~ 1min
|
||||
// */
|
||||
// @Excel(name = "短时中断(次)",type = 10, width = 20)
|
||||
// @ApiModelProperty("短时中断(次")
|
||||
// private Integer breakCounts;
|
||||
|
||||
/**
|
||||
* 暂降次数 0.1~0.9
|
||||
* 10ms ~ 1min
|
||||
*/
|
||||
@Excel(name = "电压暂降(次)",type = 10, width = 20)
|
||||
@ApiModelProperty("电压暂降(次)")
|
||||
private Integer downCounts;
|
||||
|
||||
/**
|
||||
* 短时中断 0~0.1
|
||||
* 10ms ~ 1min
|
||||
*/
|
||||
@Excel(name = "短时中断(次)",type = 10, width = 20)
|
||||
@ApiModelProperty("短时中断(次")
|
||||
private Integer breakCounts;
|
||||
|
||||
@Excel(name = "是否关联敏感用户", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("是否关联敏感用户")
|
||||
private String isMg;
|
||||
|
||||
@Excel(name = "敏感及重要用户", width = 30,replace = "/_null")
|
||||
@ApiModelProperty("敏感及重要用户")
|
||||
private String importUser;
|
||||
// @Excel(name = "是否关联敏感用户", width = 30, replace = "/_null")
|
||||
// @ApiModelProperty("是否关联敏感用户")
|
||||
// private String isMg;
|
||||
//
|
||||
// @Excel(name = "敏感及重要用户", width = 30,replace = "/_null")
|
||||
// @ApiModelProperty("敏感及重要用户")
|
||||
// private String importUser;
|
||||
|
||||
@Excel(name = "一类监测点", width = 30,replace = "/_null")
|
||||
@ApiModelProperty("一类监测点")
|
||||
private String monitorId;
|
||||
|
||||
|
||||
@Excel(name = "监测点运行状态", width = 30,replace = "/_null")
|
||||
@ApiModelProperty("监测点运行状态")
|
||||
private String runFlag;
|
||||
|
||||
// /**
|
||||
// * 备注
|
||||
// */
|
||||
|
||||
Reference in New Issue
Block a user