简柏林 / thingskit · Commits

Commit abb320412b58a1b941c5d8f44e666cf6525054f0

Authored by 黄 x
1 parent e944874e

feat: add deviceProfileId for DoConditionDTO TriggerDTO

Inline Side-by-side
Showing 4 changed files with 56 additions and 54 deletions
... ... @@ -11,25 +11,26 @@ import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
11 11 import java.util.List;
12 12
13 13 /**
14   - * @Description 场景联动执行条件数据传输表
15   - * @Author cxy
16   - * @Date 2021/11/24 17:33
  14 + * @Description 场景联动执行条件数据传输表 @Author cxy @Date 2021/11/24 17:33
17 15 */
18 16 @Data
19 17 @EqualsAndHashCode(callSuper = true)
20   -public class DoConditionDTO extends TenantDTO{
  18 +public class DoConditionDTO extends TenantDTO {
21 19
22   - @ApiModelProperty(value = "触发器类型")
23   - private TriggerTypeEnum triggerType;
  20 + @ApiModelProperty(value = "触发器类型")
  21 + private TriggerTypeEnum triggerType;
24 22
  23 + @ApiModelProperty(value = "设备配置ID")
  24 + private String deviceProfileId;
25 25
26   - @ApiModelProperty(value = "触发器关联实体")
27   - private ScopeEnum entityType;
28   - private List<String> entityId;
  26 + @ApiModelProperty(value = "触发器关联实体")
  27 + private ScopeEnum entityType;
29 28
30   - @ApiModelProperty(value = "触发条件")
31   - private AlarmRule triggerCondition;
  29 + private List<String> entityId;
32 30
33   - @ApiModelProperty(value = "场景联动id")
34   - private String sceneLinkageId;
  31 + @ApiModelProperty(value = "触发条件")
  32 + private AlarmRule triggerCondition;
  33 +
  34 + @ApiModelProperty(value = "场景联动id")
  35 + private String sceneLinkageId;
35 36 }
... ...
... ... @@ -10,27 +10,26 @@ import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
10 10 import java.util.List;
11 11
12 12 /**
13   - * @Description 场景联动触发器数据传输表
14   - * @Author cxy
15   - * @Date 2021/11/24 17:32
  13 + * @Description 场景联动触发器数据传输表 @Author cxy @Date 2021/11/24 17:32
16 14 */
17 15 @Data
18 16 @EqualsAndHashCode(callSuper = true)
19 17 public class TriggerDTO extends TenantDTO {
20 18
21   - @ApiModelProperty(value = "触发器类型")
22   - private TriggerTypeEnum triggerType;
  19 + @ApiModelProperty(value = "触发器类型")
  20 + private TriggerTypeEnum triggerType;
23 21
24   - @ApiModelProperty(value = "触发器关联实体，例如：设备ID、场景联动ID、定时任务CRON表达式")
25   - private ScopeEnum entityType;
26   - private List<String> entityId;
  22 + @ApiModelProperty(value = "设备配置ID")
  23 + private String deviceProfileId;
27 24
28   - @ApiModelProperty(value = "触发条件")
29   - private AlarmRule triggerCondition;
  25 + @ApiModelProperty(value = "触发器关联实体，例如：设备ID、场景联动ID、定时任务CRON表达式")
  26 + private ScopeEnum entityType;
30 27
  28 + private List<String> entityId;
31 29
32   - @ApiModelProperty(value = "场景联动id")
33   - private String sceneLinkageId;
34   -
  30 + @ApiModelProperty(value = "触发条件")
  31 + private AlarmRule triggerCondition;
35 32
  33 + @ApiModelProperty(value = "场景联动id")
  34 + private String sceneLinkageId;
36 35 }
... ...
... ... @@ -21,20 +21,21 @@ import java.util.List;
21 21 @TableName(value = ModelConstants.Table.TK_DO_CONDITION_TABLE_NAME, autoResultMap = true)
22 22 @EqualsAndHashCode(callSuper = true)
23 23 public class TkDoConditionEntity extends TenantBaseEntity {
24   - private static final long serialVersionUID = 2827674377416477646L;
25   - /**
26   - * 设备
27   - */
28   - @TableField(typeHandler = ListStringTypeHandler.class)
29   - private List<String> entityId;
30   -
31   - @TableField(typeHandler = EnumTypeHandler.class)
32   - private ScopeEnum entityType;
33   - @TableField(typeHandler = EnumTypeHandler.class)
34   - private TriggerTypeEnum triggerType;
35   - @TableField(typeHandler = JacksonTypeHandler.class)
36   - private AlarmRule triggerCondition;
37   - private String sceneLinkageId;
  24 + private static final long serialVersionUID = 2827674377416477646L;
  25 + /** 设备 */
  26 + @TableField(typeHandler = ListStringTypeHandler.class)
  27 + private List<String> entityId;
38 28
  29 + private String deviceProfileId;
39 30
  31 + @TableField(typeHandler = EnumTypeHandler.class)
  32 + private ScopeEnum entityType;
  33 +
  34 + @TableField(typeHandler = EnumTypeHandler.class)
  35 + private TriggerTypeEnum triggerType;
  36 +
  37 + @TableField(typeHandler = JacksonTypeHandler.class)
  38 + private AlarmRule triggerCondition;
  39 +
  40 + private String sceneLinkageId;
40 41 }
... ...
... ... @@ -22,20 +22,21 @@ import java.util.List;
22 22 @EqualsAndHashCode(callSuper = true)
23 23 public class TkTriggerEntity extends TenantBaseEntity {
24 24
25   - private static final long serialVersionUID = -1847061176808850967L;
26   - /**
27   - * 设备
28   - */
29   - @TableField(typeHandler = ListStringTypeHandler.class)
30   - private List<String> entityId;
31   -
32   - @TableField(typeHandler = EnumTypeHandler.class)
33   - private ScopeEnum entityType;
34   - @TableField(typeHandler = EnumTypeHandler.class)
35   - private TriggerTypeEnum triggerType;
36   - @TableField(typeHandler = JacksonTypeHandler.class)
37   - private AlarmRule triggerCondition;
38   - private String sceneLinkageId;
  25 + private static final long serialVersionUID = -1847061176808850967L;
  26 + /** 设备 */
  27 + @TableField(typeHandler = ListStringTypeHandler.class)
  28 + private List<String> entityId;
39 29
  30 + private String deviceProfileId;
40 31
  32 + @TableField(typeHandler = EnumTypeHandler.class)
  33 + private ScopeEnum entityType;
  34 +
  35 + @TableField(typeHandler = EnumTypeHandler.class)
  36 + private TriggerTypeEnum triggerType;
  37 +
  38 + @TableField(typeHandler = JacksonTypeHandler.class)
  39 + private AlarmRule triggerCondition;
  40 +
  41 + private String sceneLinkageId;
41 42 }
... ...