diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java index 05e59d5..bcd38bc 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbBdRecord.java @@ -6,6 +6,7 @@ import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.util.Date; import java.util.List; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import lombok.Data; @@ -33,6 +34,7 @@ public class TbBdRecord implements Serializable { * 项目部id */ @ApiModelProperty(value="项目部id") + @NotNull(message = "项目部不能为空") private Long departId; /** @@ -46,6 +48,7 @@ public class TbBdRecord implements Serializable { * 工程id */ @ApiModelProperty(value="工程id") + @NotNull(message = "工程名称不能为空") private Long proId; /** @@ -60,6 +63,7 @@ public class TbBdRecord implements Serializable { */ @ApiModelProperty(value="申请人") @Size(max = 64,message = "申请人最大长度要小于 64") + @NotBlank(message = "申请人不能为空") private String relUser; /** @@ -67,6 +71,7 @@ public class TbBdRecord implements Serializable { */ @ApiModelProperty(value="联系方式(SM4 加密)") @Size(max = 128,message = "联系方式(SM4 加密)最大长度要小于 128") + @NotBlank(message = "联系方式不能为空") private String relPhone; /** @@ -146,6 +151,8 @@ public class TbBdRecord implements Serializable { /** * 边带设备记录 */ + @ApiModelProperty(value="边带设备记录") + @NotNull(message = "申请边带设备记录不能为空") private List recordList; private static final long serialVersionUID = 1L; diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java index 1396c32..53fcdbf 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbDevice.java @@ -4,6 +4,8 @@ import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import lombok.Data; @@ -27,6 +29,7 @@ public class TbDevice implements Serializable { * 设备类型(码表) */ @ApiModelProperty(value="设备类型(码表)") + @NotBlank(message = "设备类型不能为空") private String devType; /** @@ -48,6 +51,7 @@ public class TbDevice implements Serializable { @ApiModelProperty(value="设备编码(唯一)") @Excel(name = "设备编码") @Size(max = 50,message = "设备编码最大长度要小于 50") + @NotBlank(message = "设备编码不能为空") private String devCode; /** @@ -56,12 +60,14 @@ public class TbDevice implements Serializable { @ApiModelProperty(value="设备名称") @Excel(name = "设备名称") @Size(max = 50,message = "设备名称最大长度要小于 50") + @NotBlank(message = "设备名称不能为空") private String devName; /** * 所属边带 */ @ApiModelProperty(value="所属边带ID") + @NotNull(message = "所属边带不能为空") private Long bdId; @ApiModelProperty(value="所属边带") @@ -72,6 +78,7 @@ public class TbDevice implements Serializable { * 配置id */ @ApiModelProperty(value="配置id") + @NotNull(message = "预警配置不能为空") private Long configId; @ApiModelProperty(value="预警配置名称") @@ -82,6 +89,7 @@ public class TbDevice implements Serializable { * 设备状态 0 离线 1在线 */ @ApiModelProperty(value="设备状态 0 离线 1在线") + @NotNull(message = "设备状态不能为空") private Integer devStatus; @ApiModelProperty(value="设备状态 0 离线 1在线") diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java index 9461f4b..a976283 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbPeople.java @@ -3,6 +3,7 @@ package com.bonus.base.domain; import com.bonus.common.core.annotation.Excel; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.util.Date; import java.io.Serializable; @@ -35,18 +36,21 @@ public class TbPeople implements Serializable { */ @Excel(name = "姓名") @Size(max = 50,message = "姓名最大长度要小于 50") + @NotBlank(message = "姓名不能为空") private String relName; /** * 性别名称 */ @Excel(name = "性别") + @NotBlank(message = "性别不能为空") private String sexName; /** * 岗位工种 */ @Excel(name = "岗位工种") + @NotBlank(message = "岗位工种不能为空") private String postCode; /** @@ -62,8 +66,9 @@ public class TbPeople implements Serializable { /** * 身份证号码 */ - @Excel(name = "身份证号码") + @Excel(name = "身份证号") @Size(max = 18,message = "身份证号码最大长度要小于 18") + @NotBlank(message = "身份证号不能为空") private String idCard; /** @@ -71,6 +76,7 @@ public class TbPeople implements Serializable { */ @Excel(name = "电话") @Size(max = 11,message = "电话最大长度要小于 11") + @NotBlank(message = "电话不能为空") private String relPhone; /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java index db119db..0e92865 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProDepart.java @@ -3,6 +3,8 @@ package com.bonus.base.domain; import com.bonus.common.core.annotation.Excel; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.Date; import java.io.Serializable; @@ -31,6 +33,7 @@ public class TbProDepart implements Serializable { */ @Excel(name = "项目部名称") @Size(max = 50,message = "项目部名称最大长度要小于 50") + @NotBlank(message = "项目部名称不能为空") private String departName; /** @@ -52,6 +55,7 @@ public class TbProDepart implements Serializable { /** * 地区(区域表 type==0) */ + @NotNull(message = "地区不能为空") private Long areaId; /** @@ -65,12 +69,14 @@ public class TbProDepart implements Serializable { */ @Excel(name = "负责人") @Size(max = 50,message = "负责人名称最大长度要小于 50") + @NotBlank(message = "负责人不能为空") private String headUser; /** * 负责人联系电话(sm4)加密(查询展示脱敏) */ @Excel(name = "电话") @Size(max = 50,message = "电话最大长度要小于 50") + @NotBlank(message = "电话不能为空") private String headUserPhone; /** * 备注 diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProPower.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProPower.java index 96e78ca..42a34b8 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProPower.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProPower.java @@ -4,6 +4,7 @@ import com.bonus.common.core.annotation.Excel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.Size; import java.io.Serializable; @@ -25,6 +26,7 @@ public class TbProPower implements Serializable { */ @Excel(name = "杆塔名称") @Size(max = 50,message = "杆塔名称最大长度要小于 50") + @NotBlank(message = "杆塔名称不能为空") private String gtName; /** * 工程id @@ -36,6 +38,7 @@ public class TbProPower implements Serializable { */ @Excel(name = "杆塔经度") @Size(max = 50,message = "杆塔经度最大长度要小于 50") + @NotBlank(message = "杆塔经度不能为空") private String lon; /** @@ -43,6 +46,7 @@ public class TbProPower implements Serializable { */ @Excel(name = "杆塔纬度") @Size(max = 50,message = "杆塔纬度最大长度要小于 50") + @NotBlank(message = "杆塔纬度不能为空") private String lat; /** diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java index 1378934..b41b396 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbProject.java @@ -3,6 +3,8 @@ package com.bonus.base.domain; import com.bonus.common.core.annotation.Excel; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.Date; import java.io.Serializable; @@ -31,10 +33,12 @@ public class TbProject implements Serializable { */ @Excel(name = "工程名称") @Size(max = 50,message = "工程名称最大长度要小于 50") + @NotBlank(message = "工程名称不能为空") private String proName; /** * 所属项目部 */ + @NotNull(message = "所属项目部不能为空") private Long departId; /** @@ -46,20 +50,24 @@ public class TbProject implements Serializable { /** * 电压等级(字典表配置) */ + @NotNull(message = "电压等级不能为空") private Integer relId; /** * 工程类型(字典表配置)(01 线路 02 变电 03 ...) */ + @NotBlank(message = "工程类型不能为空") private String proType; /** * 工程状态 (字典表配置) */ + @NotBlank(message = "工程状态不能为空") private String proStatus; /** * 建管单位(区域表)-按照选择的项目部 进行二级联动) */ + @NotNull(message = "建管单位不能为空") private Integer areaId; /** @@ -67,12 +75,14 @@ public class TbProject implements Serializable { */ @Excel(name = "经度") @Size(max = 50,message = "经度最大长度要小于 50") + @NotBlank(message = "经度不能为空") private String lon; /** * 维度 */ @Excel(name = "纬度") @Size(max = 50,message = "纬度最大长度要小于 50") + @NotBlank(message = "纬度不能为空") private String lat; /** * 删除状态(0 正常 1删除) diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java index e65f5a2..e13ef18 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbTeam.java @@ -4,6 +4,8 @@ import com.bonus.common.core.annotation.Excel; import com.fasterxml.jackson.annotation.JsonFormat; import lombok.Data; +import javax.validation.constraints.NotBlank; +import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import java.util.Date; import java.io.Serializable; @@ -38,10 +40,12 @@ public class TbTeam implements Serializable { */ @Excel(name = "班组名称") @Size(max = 50,message = "班组名称最大长度要小于 50") + @NotBlank(message = "班组名称不能为空") private String teamName; /** * 班组长id */ + @NotNull(message = "班组长不能为空") private Long relId; /** @@ -51,6 +55,7 @@ public class TbTeam implements Serializable { /** * 工程id */ + @NotNull(message = "所属工程不能为空") private String proId; /** * 工程名称 @@ -131,6 +136,7 @@ public class TbTeam implements Serializable { /** * 班组人员id集合 */ + @NotNull(message = "班组成员不能为空") private List idList; } diff --git a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbWarnConfig.java b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbWarnConfig.java index 389c251..d86e307 100644 --- a/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbWarnConfig.java +++ b/bonus-modules/bonus-base/src/main/java/com/bonus/base/domain/TbWarnConfig.java @@ -5,6 +5,7 @@ import io.swagger.annotations.ApiModelProperty; import java.io.Serializable; import java.math.BigDecimal; import java.util.Date; +import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; import javax.validation.constraints.Size; import lombok.Data; @@ -48,6 +49,7 @@ public class TbWarnConfig implements Serializable { */ @ApiModelProperty(value="配置名称") @Size(max = 64,message = "配置名称最大长度要小于 64") + @NotBlank(message = "配置名称不能为空") private String configName; /**