1.提交场站评估代码
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package com.njcn.harmonic.pojo.excel.pollution;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -13,46 +14,51 @@ public class LineItemPollution implements Serializable {
|
||||
* 终端名称
|
||||
*/
|
||||
@Excel(name = "终端名称", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("终端名称")
|
||||
private String devName;
|
||||
|
||||
/**
|
||||
* 终端厂家
|
||||
*/
|
||||
@Excel(name = "终端厂家", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("终端厂家")
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 终端型号
|
||||
*/
|
||||
@Excel(name = "终端型号", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("终端型号")
|
||||
private String devType;
|
||||
|
||||
/**
|
||||
* 终端投运时间
|
||||
*/
|
||||
@Excel(name = "投运时间", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("投运时间")
|
||||
private String loginTime;
|
||||
|
||||
/**
|
||||
* 监测点名称
|
||||
*/
|
||||
@Excel(name = "监测点名称", width = 35, replace = "/_null")
|
||||
@ApiModelProperty("监测点名称")
|
||||
private String lineName;
|
||||
|
||||
/**
|
||||
* 统计间隔
|
||||
*/
|
||||
@Excel(name = "统计间隔", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("统计间隔")
|
||||
private Integer interval;
|
||||
|
||||
/**
|
||||
* 谐波电压污染值
|
||||
*/
|
||||
@Excel(name = "谐波电压污染值", width = 35, replace = "/_null")
|
||||
@Excel(name = "谐波污染值", width = 35, replace = "/_null")
|
||||
@ApiModelProperty("谐波污染值")
|
||||
private Double vHarmonicValue;
|
||||
|
||||
@Excel(name = "谐波电压污染值", width = 35, replace = "/_null")
|
||||
private Double iHarmonicValue;
|
||||
|
||||
/**
|
||||
* 暂升次数 1.1~1.8
|
||||
@@ -79,6 +85,7 @@ public class LineItemPollution implements Serializable {
|
||||
* 备注
|
||||
*/
|
||||
@Excel(name = "备注", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("备注")
|
||||
private String remark;
|
||||
|
||||
}
|
||||
|
||||
@@ -80,6 +80,14 @@ public class LinePollution implements Serializable {
|
||||
@ApiModelProperty("监测点电压等级")
|
||||
private String lineVoltage;
|
||||
|
||||
/**
|
||||
* 新增
|
||||
* 监测点电压等级
|
||||
*/
|
||||
@Excel(name = "变电站电压等级", width = 30)
|
||||
@ApiModelProperty("变电站电压等级")
|
||||
private String subVoltage;
|
||||
|
||||
/**
|
||||
* 干扰源类型
|
||||
*/
|
||||
|
||||
@@ -1,35 +1,69 @@
|
||||
package com.njcn.harmonic.pojo.excel.pollution;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
import java.util.List;
|
||||
|
||||
@Data
|
||||
public class PowerFlagPollution implements Serializable {
|
||||
|
||||
|
||||
/**
|
||||
* 监测点名称
|
||||
*/
|
||||
@Excel(name = "监测点名称", width = 35, replace = "/_null")
|
||||
@ApiModelProperty("监测点名称")
|
||||
private String lineName;
|
||||
|
||||
|
||||
/**
|
||||
* 终端名称
|
||||
*/
|
||||
@Excel(name = "终端名称", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("终端名称")
|
||||
private String devName;
|
||||
|
||||
/**
|
||||
* 终端厂家
|
||||
*/
|
||||
@Excel(name = "终端厂家", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("终端厂家")
|
||||
private String manufacturer;
|
||||
|
||||
/**
|
||||
* 终端型号
|
||||
*/
|
||||
@Excel(name = "终端型号", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("终端型号")
|
||||
private String devType;
|
||||
|
||||
/**
|
||||
* 终端投运时间
|
||||
*/
|
||||
@Excel(name = "投运时间", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("投运时间")
|
||||
private String loginTime;
|
||||
/**
|
||||
* 统计间隔
|
||||
*/
|
||||
@Excel(name = "统计间隔", width = 30, replace = "/_null")
|
||||
@ApiModelProperty("统计间隔")
|
||||
private Integer interval;
|
||||
|
||||
/**
|
||||
* 监测位置
|
||||
*/
|
||||
@Excel(name = "监测位置", width = 30, needMerge = true)
|
||||
@ApiModelProperty("监测位置")
|
||||
private String powerFlag;
|
||||
|
||||
|
||||
/**
|
||||
* 监测污染值
|
||||
* 谐波电压污染值
|
||||
*/
|
||||
@Excel(name = "监测谐波电压污染值", width = 40, needMerge = true, replace = "/_null")
|
||||
private String powerVValue;
|
||||
|
||||
@Excel(name = "监测谐波电流污染值", width = 40, needMerge = true, replace = "/_null")
|
||||
private String powerIValue;
|
||||
/**
|
||||
* 当前位置下,各测点的污染数据
|
||||
*/
|
||||
@ExcelCollection(name = "")
|
||||
private List<LineItemPollution> lineItemPollutionList;
|
||||
|
||||
@Excel(name = "谐波污染值", width = 35, replace = "/_null")
|
||||
@ApiModelProperty("谐波污染值")
|
||||
private Double vHarmonicValue;
|
||||
|
||||
}
|
||||
|
||||
@@ -2,6 +2,7 @@ package com.njcn.harmonic.pojo.excel.pollution;
|
||||
|
||||
import cn.afterturn.easypoi.excel.annotation.Excel;
|
||||
import cn.afterturn.easypoi.excel.annotation.ExcelCollection;
|
||||
import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
|
||||
import java.io.Serializable;
|
||||
@@ -10,26 +11,34 @@ import java.util.List;
|
||||
@Data
|
||||
public class SubstationPollution implements Serializable {
|
||||
|
||||
/**
|
||||
* 供电公司名称
|
||||
*/
|
||||
@Excel(name = "供电公司", width = 30, needMerge = true)
|
||||
@ApiModelProperty("供电公司")
|
||||
private String gdName;
|
||||
|
||||
/**
|
||||
* 供电公司名称
|
||||
*/
|
||||
@Excel(name = "供电公司", width = 30, needMerge = true)
|
||||
@ApiModelProperty("供电公司")
|
||||
private String subVoltage;
|
||||
/**
|
||||
* 所属变电站
|
||||
*/
|
||||
@Excel(name = "变电站", width = 30, needMerge = true)
|
||||
@Excel(name = "变电站电压等级", width = 30, needMerge = true)
|
||||
@ApiModelProperty("变电站电压等级")
|
||||
private String subStationName;
|
||||
|
||||
/**
|
||||
* 电站污染值
|
||||
*/
|
||||
@Excel(name = "电站谐波电压污染值", width = 25, needMerge = true)
|
||||
@Excel(name = "电站谐波污染值", width = 25, needMerge = true)
|
||||
@ApiModelProperty("电站谐波污染值")
|
||||
private String subVStationValue;
|
||||
|
||||
|
||||
/**
|
||||
* 电站污染值
|
||||
*/
|
||||
@Excel(name = "电站谐波电流污染值", width = 25, needMerge = true)
|
||||
private String subIStationValue;
|
||||
|
||||
/**
|
||||
* 电网侧&非电网侧
|
||||
* name不要赋值
|
||||
|
||||
Reference in New Issue
Block a user