Commit 791c27a5faee330e6b68136bae70c1332c3b1aab
1 parent
c3b95976
fix: 组态节点保存数据交互问题修复
1、字段名称修改 2、枚举不验证非空
Showing
3 changed files
with
2 additions
and
8 deletions
... | ... | @@ -32,9 +32,6 @@ public class ConfigurationActDTO extends TenantDTO { |
32 | 32 | private String contentId; |
33 | 33 | |
34 | 34 | @ApiModelProperty(value = "动画类型", required = true) |
35 | - @NotEmpty( | |
36 | - message = "tbDeviceId不能未空或空字符串", | |
37 | - groups = {UpdateGroup.class, AddGroup.class}) | |
38 | 35 | private ActTypeEnum type; |
39 | 36 | @ApiModelProperty(value = "orgId", required = true) |
40 | 37 | @NotEmpty( |
... | ... | @@ -52,7 +49,7 @@ public class ConfigurationActDTO extends TenantDTO { |
52 | 49 | @ApiModelProperty(value = "组件关注的指标") |
53 | 50 | private String attr; |
54 | 51 | @ApiModelProperty(value = "触发条件") |
55 | - private JsonNode content; | |
52 | + private JsonNode condition; | |
56 | 53 | |
57 | 54 | @ApiModelProperty(value = "组态描述") |
58 | 55 | private String remark; | ... | ... |
... | ... | @@ -30,9 +30,6 @@ public class ConfigurationEventDTO extends TenantDTO { |
30 | 30 | private String contentId; |
31 | 31 | |
32 | 32 | @ApiModelProperty(value = "事件类型", required = true) |
33 | - @NotEmpty( | |
34 | - message = "tbDeviceId不能未空或空字符串", | |
35 | - groups = {UpdateGroup.class, AddGroup.class}) | |
36 | 33 | private EventTypeEnum type; |
37 | 34 | |
38 | 35 | @ApiModelProperty(value = "事件内容") | ... | ... |