代码调整,bug修改
This commit is contained in:
@@ -9,6 +9,7 @@ import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Range;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
@@ -118,6 +119,7 @@ public class DeviceParam {
|
||||
|
||||
@ApiModelProperty(name = "sort",value = "排序",required = true)
|
||||
@NotNull(message = "排序不可为空")
|
||||
@Min(value = 0,message = "排序格式有误")
|
||||
private Integer sort;
|
||||
|
||||
|
||||
|
||||
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
@@ -29,6 +30,7 @@ public class GdInformationParam {
|
||||
|
||||
@ApiModelProperty(name = "sort",value = "排序",required = true)
|
||||
@NotNull(message = "排序不可为空")
|
||||
@Min(value = 0,message = "排序格式有误")
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
|
||||
@@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Range;
|
||||
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
@@ -33,6 +34,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "pt1",value = "PT一次变比",required = true)
|
||||
@NotNull(message = "PT一次变比不可为空")
|
||||
@Min(value = 1,message = "PT一次变比最小值应大于等于1")
|
||||
private Float pt1;
|
||||
|
||||
/**
|
||||
@@ -40,6 +42,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "pt2",value = "PT二次变比",required = true)
|
||||
@NotNull(message = "PT二次变比不可为空")
|
||||
@Min(value = 1,message = "PT二次变比最小值应大于等于1")
|
||||
private Float pt2;
|
||||
|
||||
/**
|
||||
@@ -47,6 +50,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "ct1",value = "CT一次变比",required = true)
|
||||
@NotNull(message = "CT一次变比不可为空")
|
||||
@Min(value = 1,message = "CT一次变比最小值应大于等于1")
|
||||
private Float ct1;
|
||||
|
||||
/**
|
||||
@@ -54,6 +58,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "ct2",value = "CT二次变比",required = true)
|
||||
@NotNull(message = "CT二次变比不可为空")
|
||||
@Min(value = 1,message = "CT二次变比最小值应大于等于1")
|
||||
private Float ct2;
|
||||
|
||||
/**
|
||||
@@ -61,6 +66,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "devCapacity",value = "设备容量",required = true)
|
||||
@NotNull(message = "设备容量不可为空")
|
||||
@Min(value = 1,message = "设备容量格式有误")
|
||||
private Float devCapacity;
|
||||
|
||||
/**
|
||||
@@ -68,6 +74,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "shortCapacity",value = "短路容量",required = true)
|
||||
@NotNull(message = "短路容量不可为空")
|
||||
@Min(value = 1,message = "设备容量格式有误")
|
||||
private Float shortCapacity;
|
||||
|
||||
/**
|
||||
@@ -75,6 +82,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "dealCapacity",value = "协议容量",required = true)
|
||||
@NotNull(message = "协议容量不可为空")
|
||||
@Min(value = 1,message = "设备容量格式有误")
|
||||
private Float dealCapacity;
|
||||
|
||||
/**
|
||||
@@ -82,6 +90,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "standardCapacity",value = "基准容量新增时候可为空",required = true)
|
||||
@NotNull(message = "基准容量不可为空")
|
||||
@Min(value = 1,message = "设备容量格式有误")
|
||||
private Float standardCapacity;
|
||||
|
||||
|
||||
@@ -117,6 +126,7 @@ public class LineParam {
|
||||
*/
|
||||
@ApiModelProperty(name = "ptType",value = "接线类型(0:星型接法;1:三角型接法;2:开口三角型接法)",required = true)
|
||||
@NotNull(message = "接线类型不可为空")
|
||||
@Range(min = 0,max = 2,message = "接线类型有误")
|
||||
private Integer ptType;
|
||||
|
||||
@ApiModelProperty(name = "num",value = "监测点序列",required = true)
|
||||
@@ -125,8 +135,9 @@ public class LineParam {
|
||||
|
||||
@ApiModelProperty(name = "sort",value = "排序",required = true)
|
||||
@NotNull(message = "排序不可为空")
|
||||
@Min(value = 0,message = "排序格式有误")
|
||||
private Integer sort;
|
||||
|
||||
|
||||
/**
|
||||
* 电压上偏差限值
|
||||
*/
|
||||
|
||||
@@ -8,6 +8,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
@@ -29,6 +30,7 @@ public class ProvinceParam {
|
||||
|
||||
@ApiModelProperty(name = "sort",value = "排序",required = true)
|
||||
@NotNull(message = "排序不可为空")
|
||||
@Min(value = 0,message = "排序格式有误")
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,6 +7,7 @@ import io.swagger.annotations.ApiModelProperty;
|
||||
import lombok.Data;
|
||||
import lombok.EqualsAndHashCode;
|
||||
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
@@ -31,6 +32,7 @@ public class SubStationParam {
|
||||
|
||||
@ApiModelProperty(name = "sort",value = "排序",required = true)
|
||||
@NotNull(message = "排序不可为空")
|
||||
@Min(value = 0,message = "排序格式有误")
|
||||
private Integer sort;
|
||||
|
||||
/**
|
||||
|
||||
@@ -7,6 +7,7 @@ import lombok.Data;
|
||||
import org.hibernate.validator.constraints.Range;
|
||||
|
||||
import javax.validation.Valid;
|
||||
import javax.validation.constraints.Min;
|
||||
import javax.validation.constraints.NotBlank;
|
||||
import javax.validation.constraints.NotNull;
|
||||
import javax.validation.constraints.Pattern;
|
||||
@@ -52,6 +53,7 @@ public class SubVoltageParam {
|
||||
|
||||
@ApiModelProperty(name = "sort",value = "排序",required = true)
|
||||
@NotNull(message = "排序不可为空")
|
||||
@Min(value = 0,message = "排序格式有误")
|
||||
private Integer sort;
|
||||
|
||||
@ApiModelProperty(name = "lineParam",value = "监测点集合")
|
||||
|
||||
Reference in New Issue
Block a user