fix: 组态节点保存数据交互问题修复

1、字段名称修改
2、枚举不验证非空

@@ -32,9 +32,6 @@ public class ConfigurationActDTO extends TenantDTO {
   private String contentId;
   private String contentId;
 
 
   @ApiModelProperty(value = "动画类型", required = true)
   @ApiModelProperty(value = "动画类型", required = true)
-  @NotEmpty(
-          message = "tbDeviceId不能未空或空字符串",
-          groups = {UpdateGroup.class, AddGroup.class})
   private ActTypeEnum type;
   private ActTypeEnum type;
   @ApiModelProperty(value = "orgId", required = true)
   @ApiModelProperty(value = "orgId", required = true)
   @NotEmpty(
   @NotEmpty(
@@ -52,7 +49,7 @@ public class ConfigurationActDTO extends TenantDTO {
   @ApiModelProperty(value = "组件关注的指标")
   @ApiModelProperty(value = "组件关注的指标")
   private String attr;
   private String attr;
   @ApiModelProperty(value = "触发条件")
   @ApiModelProperty(value = "触发条件")
-  private JsonNode content;
+  private JsonNode condition;
 
 
   @ApiModelProperty(value = "组态描述")
   @ApiModelProperty(value = "组态描述")
   private String remark;
   private String remark;

@@ -30,9 +30,6 @@ public class ConfigurationEventDTO extends TenantDTO {
   private String contentId;
   private String contentId;
 
 
   @ApiModelProperty(value = "事件类型", required = true)
   @ApiModelProperty(value = "事件类型", required = true)
-  @NotEmpty(
-          message = "tbDeviceId不能未空或空字符串",
-          groups = {UpdateGroup.class, AddGroup.class})
   private EventTypeEnum type;
   private EventTypeEnum type;
 
 
   @ApiModelProperty(value = "事件内容")
   @ApiModelProperty(value = "事件内容")

@@ -28,5 +28,5 @@ public class ConfigurationAct extends TenantBaseEntity {
     private String slaveDeviceId;
     private String slaveDeviceId;
     private String attr;
     private String attr;
     @TableField(typeHandler = JacksonTypeHandler.class)
     @TableField(typeHandler = JacksonTypeHandler.class)
-    private JsonNode content;
+    private JsonNode condition;
 }
 }