属性非空调整

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblBreakdownBo.java

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblBreakdownBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -68,19 +68,19 @@ public class TblBreakdownBo extends BaseEntity {
     /**
      * 处理方式
      */
-    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handlerWay;
 
     /**
      * 处理描述
      */
-    @NotBlank(message = "处理描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handlerContent;
 
     /**
      * 处理时间
      */
-    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date handlerTime;
 
     /**
@@ -98,31 +98,31 @@ public class TblBreakdownBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifer;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblDatapointBo.java

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblDatapointBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -80,31 +80,31 @@ public class TblDatapointBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotBlank(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private String utime;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentBo.java

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -44,13 +44,13 @@ public class TblEquipmentBo extends BaseEntity {
     /**
      * 型号
      */
-    @NotBlank(message = "型号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "型号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String model;
 
     /**
      * 规格
      */
-    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "规格不能为空", groups = { AddGroup.class, EditGroup.class })
     private String specs;
 
     /**
@@ -68,61 +68,61 @@ public class TblEquipmentBo extends BaseEntity {
     /**
      * 生产商
      */
-    @NotBlank(message = "生产商不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "生产商不能为空", groups = { AddGroup.class, EditGroup.class })
     private String manufacturer;
 
     /**
      * 制造商
      */
-    @NotBlank(message = "制造商不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "制造商不能为空", groups = { AddGroup.class, EditGroup.class })
     private String producer;
 
     /**
      * 图片
      */
-    @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "图片不能为空", groups = { AddGroup.class, EditGroup.class })
     private String pictures;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 拓展字段1
      */
-    @NotBlank(message = "拓展字段1不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "拓展字段1不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
      * 拓展字段2
      */
-    @NotBlank(message = "拓展字段2不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "拓展字段2不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentCodeBo.java

@@ -22,9 +22,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentCodeBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -54,7 +54,7 @@ public class TblEquipmentCodeBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentOrganizationalBo.java

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.TreeEntity;
 public class TblEquipmentOrganizationalBo extends TreeEntity<TblEquipmentOrganizationalBo> {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -50,31 +50,31 @@ public class TblEquipmentOrganizationalBo extends TreeEntity<TblEquipmentOrganiz
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentSbookBo.java

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentSbookBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -56,7 +56,7 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 设备信息
      */
-    @NotBlank(message = "设备信息不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备信息不能为空", groups = { AddGroup.class, EditGroup.class })
     private String equipmentInfoId;
 
     /**
@@ -80,133 +80,133 @@ public class TblEquipmentSbookBo extends BaseEntity {
     /**
      * 负责人
      */
-    @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "负责人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String personInCharge;
 
     /**
      * 安装日期
      */
-    @NotNull(message = "安装日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "安装日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date installationDate;
 
     /**
      * 安装地点地址
      */
-    @NotBlank(message = "安装地点地址不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "安装地点地址不能为空", groups = { AddGroup.class, EditGroup.class })
     private String address;
 
     /**
      * 关联设备id
      */
-    @NotBlank(message = "关联设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "关联设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private String deviceId;
 
     /**
      * 标签
      */
-    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
     private String tagids;
 
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
     /**
      * 保修期结束日期
      */
-    @NotNull(message = "保修期结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "保修期结束日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date endOfWarrantyPeriod;
 
     /**
      * 制造日期
      */
-    @NotNull(message = "制造日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "制造日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date manufacturingDate;
 
     /**
      * 资产编码
      */
-    @NotBlank(message = "资产编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "资产编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String assetNo;
 
     /**
      * 资产编号
      */
-    @NotBlank(message = "资产编号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "资产编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String serialNumber;
 
     /**
      * 使用证编号
      */
-    @NotBlank(message = "使用证编号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "使用证编号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String useCertificateNo;
 
     /**
      * 安全级别
      */
-    @NotBlank(message = "安全级别不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "安全级别不能为空", groups = { AddGroup.class, EditGroup.class })
     private String securityLevel;
 
     /**
      * 使用年限
      */
-    @NotNull(message = "使用年限不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "使用年限不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long usefulLife;
 
     /**
      * 变动日期
      */
-    @NotNull(message = "变动日期不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "变动日期不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date changeDate;
 
     /**
      * 供货厂家
      */
-    @NotBlank(message = "供货厂家不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "供货厂家不能为空", groups = { AddGroup.class, EditGroup.class })
     private String supplier;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblEquipmentTagBo.java

@@ -22,9 +22,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblEquipmentTagBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -42,7 +42,7 @@ public class TblEquipmentTagBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblGatewayBo.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblGatewayBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
@@ -56,61 +56,61 @@ public class TblGatewayBo extends BaseEntity {
     /**
      * 远程控制
      */
-    @NotBlank(message = "远程控制不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "远程控制不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remoteManage;
 
     /**
      * 流量控制
      */
-    @NotNull(message = "流量控制不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "流量控制不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long flowControl;
 
     /**
      * 流量控制类型
      */
-    @NotBlank(message = "流量控制类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "流量控制类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String flowControlType;
 
     /**
      * 所属服务
      */
-    @NotBlank(message = "所属服务不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "所属服务不能为空", groups = { AddGroup.class, EditGroup.class })
     private String belongService;
 
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
-    private String remark;
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusRtuBo.java

@@ -24,111 +24,111 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblModbusRtuBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolName;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolDesc;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolType;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String apiUrl;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String commPortId;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long commPortType;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long baudRate;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long dateBits;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long parity;
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long stopBits;
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String uuid;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String interval;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblModbusTcpBo.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblModbusTcpBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
@@ -74,37 +74,37 @@ public class TblModbusTcpBo extends BaseEntity {
     /**
      * 轮询间隔（ms）
      */
-    @NotNull(message = "轮询间隔（ms）不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "轮询间隔（ms）不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long interval;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleBo.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblRuleBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
@@ -44,25 +44,25 @@ public class TblRuleBo extends BaseEntity {
     /**
      * 触发类型
      */
-    @NotBlank(message = "触发类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "触发类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 设备ID
      */
-    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 传感器Id
      */
-    @NotNull(message = "传感器Id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "传感器Id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long sensorId;
 
     /**
      * 时间
      */
-    @NotNull(message = "时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date time;
 
     /**
@@ -74,49 +74,49 @@ public class TblRuleBo extends BaseEntity {
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleExecuteBo.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblRuleExecuteBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
@@ -44,67 +44,67 @@ public class TblRuleExecuteBo extends BaseEntity {
     /**
      * 设备ID
      */
-    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 执行动作
      */
-    @NotBlank(message = "执行动作不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "执行动作不能为空", groups = { AddGroup.class, EditGroup.class })
     private String executeAction;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
     /**
      * 规则id
      */
-    @NotNull(message = "规则id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "规则id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long ruleId;
 
     /**
      * 条件id
      */
-    @NotNull(message = "条件id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "条件id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long executeId;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblRuleFilterBo.java

@@ -24,7 +24,7 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblRuleFilterBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
     @NotBlank(message = "不能为空", groups = { EditGroup.class })
     private String id;
@@ -56,55 +56,55 @@ public class TblRuleFilterBo extends BaseEntity {
     /**
      * 过滤算法
      */
-    @NotBlank(message = "过滤算法不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "过滤算法不能为空", groups = { AddGroup.class, EditGroup.class })
     private String filterAlgorithm;
 
     /**
      * 公式
      */
-    @NotBlank(message = "公式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "公式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String formula;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSeneorBo.java

@@ -22,9 +22,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblSeneorBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -48,7 +48,7 @@ public class TblSeneorBo extends BaseEntity {
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sensorDesc;
 
     /**
@@ -60,7 +60,7 @@ public class TblSeneorBo extends BaseEntity {
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblSensorSbookBo.java

@@ -24,9 +24,9 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblSensorSbookBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
@@ -44,19 +44,19 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 上层位置
      */
-    @NotNull(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "上层位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentTreeId;
 
     /**
      * 设备ID
      */
-    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备ID不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 设备名称
      */
-    @NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String equipmentName;
 
     /**
@@ -68,25 +68,25 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 协议配置
      */
-    @NotBlank(message = "协议配置不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "协议配置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String configUuid;
 
     /**
      * 点表
      */
-    @NotNull(message = "点表不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "点表不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long datapointId;
 
     /**
      * 单位
      */
-    @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "单位不能为空", groups = { AddGroup.class, EditGroup.class })
     private String unit;
 
     /**
      * 类型
      */
-    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
@@ -98,55 +98,55 @@ public class TblSensorSbookBo extends BaseEntity {
     /**
      * 标签
      */
-    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "标签不能为空", groups = { AddGroup.class, EditGroup.class })
     private String tagids;
 
     /**
      * 描述
      */
-    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String description;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoBo.java

@@ -26,103 +26,103 @@ public class TblVideoBo extends BaseEntity {
     /**
      * id
      */
-    @NotNull(message = "id不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "id不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 摄像头名称
      */
-    @NotBlank(message = "摄像头名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像头名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 平台编码
      */
-    @NotBlank(message = "平台编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "平台编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String sn;
 
     /**
      * 主设备类型
      */
-    @NotBlank(message = "主设备类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "主设备类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String type;
 
     /**
      * 主设备协议类型
      */
-    @NotBlank(message = "主设备协议类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "主设备协议类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String protocolType;
 
     /**
      * 设备互联编码
      */
-    @NotBlank(message = "设备互联编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备互联编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String connectCode;
 
     /**
      * 设备型号
      */
-    @NotNull(message = "设备型号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备型号不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long model;
 
     /**
      * 视频制式
      */
-    @NotBlank(message = "视频制式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "视频制式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String videoFormat;
 
     /**
      * 设备提供商类型
      */
-    @NotBlank(message = "设备提供商类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "设备提供商类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String vendorType;
 
     /**
      * 序列号
      */
-    @NotBlank(message = "序列号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "序列号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String serialNumber;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr1;
 
     /**
-     * 
+     *
      */
-    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "不能为空", groups = { AddGroup.class, EditGroup.class })
     private String expr2;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblVideoDetailBo.java

@@ -24,105 +24,105 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblVideoDetailBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 视频通道输入号
      */
-    @NotBlank(message = "视频通道输入号不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "视频通道输入号不能为空", groups = { AddGroup.class, EditGroup.class })
     private String videoChannel;
 
     /**
      * 摄像机编码
      */
-    @NotBlank(message = "摄像机编码不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机编码不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraCode;
 
     /**
      * 摄像机名称
      */
-    @NotBlank(message = "摄像机名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraName;
 
     /**
      * 摄像机类型
      */
-    @NotBlank(message = "摄像机类型不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机类型不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraType;
 
     /**
      * 摄像机位置
      */
-    @NotBlank(message = "摄像机位置不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "摄像机位置不能为空", groups = { AddGroup.class, EditGroup.class })
     private String cameraLocationDesc;
 
     /**
      * 经度
      */
-    @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "经度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String longitude;
 
     /**
      * 纬度
      */
-    @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "纬度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String latitude;
 
     /**
      * 高度
      */
-    @NotBlank(message = "高度不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "高度不能为空", groups = { AddGroup.class, EditGroup.class })
     private String height;
 
     /**
      * 音频输出通道
      */
-    @NotBlank(message = "音频输出通道不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "音频输出通道不能为空", groups = { AddGroup.class, EditGroup.class })
     private String voiceOutCode;
 
     /**
      * 是否支持组播
      */
-    @NotBlank(message = "是否支持组播不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "是否支持组播不能为空", groups = { AddGroup.class, EditGroup.class })
     private String isSupportBoardcast;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 主设备id
      */
-    @NotNull(message = "主设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "主设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long videoId;
 
 

ruoyi-system/src/main/java/com/ruoyi/data/domain/bo/TblWarnBo.java

@@ -24,105 +24,105 @@ import com.ruoyi.common.core.domain.BaseEntity;
 public class TblWarnBo extends BaseEntity {
 
     /**
-     * 
+     *
      */
-    @NotNull(message = "不能为空", groups = { EditGroup.class })
+//    @NotNull(message = "不能为空", groups = { EditGroup.class })
     private Long id;
 
     /**
      * 告警名称
      */
-    @NotBlank(message = "告警名称不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "告警名称不能为空", groups = { AddGroup.class, EditGroup.class })
     private String name;
 
     /**
      * 告警值
      */
-    @NotNull(message = "告警值不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "告警值不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long val;
 
     /**
      * 设备id
      */
-    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "设备id不能为空", groups = { AddGroup.class, EditGroup.class })
     private Long equipmentId;
 
     /**
      * 告警设备
      */
-    @NotBlank(message = "告警设备不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "告警设备不能为空", groups = { AddGroup.class, EditGroup.class })
     private String equipmentName;
 
     /**
      * 告警内容
      */
-    @NotBlank(message = "告警内容不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "告警内容不能为空", groups = { AddGroup.class, EditGroup.class })
     private String content;
 
     /**
      * 处理人
      */
-    @NotBlank(message = "处理人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handler;
 
     /**
      * 处理方式
      */
-    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "处理方式不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handleWay;
 
     /**
      * 吃力描述
      */
-    @NotBlank(message = "吃力描述不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "吃力描述不能为空", groups = { AddGroup.class, EditGroup.class })
     private String handleContent;
 
     /**
      * 处理时间
      */
-    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "处理时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date handleTime;
 
     /**
      * 告警时间
      */
-    @NotNull(message = "告警时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "告警时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date alarmTime;
 
     /**
      * 状态
      */
-    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "状态不能为空", groups = { AddGroup.class, EditGroup.class })
     private String status;
 
     /**
      * 备注
      */
-    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "备注不能为空", groups = { AddGroup.class, EditGroup.class })
     private String remark;
 
     /**
      * 创建人
      */
-    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "创建人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String creator;
 
     /**
      * 创建时间
      */
-    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "创建时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date ctime;
 
     /**
      * 更新人
      */
-    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "更新人不能为空", groups = { AddGroup.class, EditGroup.class })
     private String modifier;
 
     /**
      * 更新时间
      */
-    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotNull(message = "更新时间不能为空", groups = { AddGroup.class, EditGroup.class })
     private Date utime;