简柏林 / thingskit · Commits

Commit b8c12749ff102f376fe1626e3b351d3d5321134e

Authored by 云中非
2 parents c75506ed 265ad02d

Merge branch 'master' into 20221202

Inline Side-by-side
Showing 9 changed files with 60 additions and 18 deletions
@@ -6,6 +6,7 @@ import lombok.Data; @@ -6,6 +6,7 @@ import lombok.Data;
6 import lombok.EqualsAndHashCode; 6 import lombok.EqualsAndHashCode;
7 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum; 7 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
8 import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum; 8 import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
  9 +import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
9 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum; 10 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
10 11
11 import java.util.List; 12 import java.util.List;
@@ -28,6 +29,9 @@ public class DoActionDTO extends TenantDTO { @@ -28,6 +29,9 @@ public class DoActionDTO extends TenantDTO {
28 @ApiModelProperty(value = "设备配置ID") 29 @ApiModelProperty(value = "设备配置ID")
29 private String deviceProfileId; 30 private String deviceProfileId;
30 31
  32 + @ApiModelProperty(value = "设备类型")
  33 + private DeviceTypeEnum deviceType;
  34 +
31 @ApiModelProperty(value = "调用类型：sync同步/async异步") 35 @ApiModelProperty(value = "调用类型：sync同步/async异步")
32 private CallTypeEnum callType; 36 private CallTypeEnum callType;
33 37
@@ -5,6 +5,7 @@ import lombok.Data; @@ -5,6 +5,7 @@ import lombok.Data;
5 import lombok.EqualsAndHashCode; 5 import lombok.EqualsAndHashCode;
6 import org.thingsboard.server.common.data.device.profile.AlarmCondition; 6 import org.thingsboard.server.common.data.device.profile.AlarmCondition;
7 import org.thingsboard.server.common.data.device.profile.AlarmRule; 7 import org.thingsboard.server.common.data.device.profile.AlarmRule;
  8 +import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
8 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum; 9 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
9 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum; 10 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
10 11
@@ -23,6 +24,9 @@ public class DoConditionDTO extends TenantDTO { @@ -23,6 +24,9 @@ public class DoConditionDTO extends TenantDTO {
23 @ApiModelProperty(value = "设备配置ID") 24 @ApiModelProperty(value = "设备配置ID")
24 private String deviceProfileId; 25 private String deviceProfileId;
25 26
  27 + @ApiModelProperty(value = "设备类型")
  28 + private DeviceTypeEnum deviceType;
  29 +
26 @ApiModelProperty(value = "触发器关联实体") 30 @ApiModelProperty(value = "触发器关联实体")
27 private ScopeEnum entityType; 31 private ScopeEnum entityType;
28 32
@@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty; @@ -4,6 +4,7 @@ import io.swagger.annotations.ApiModelProperty;
4 import lombok.Data; 4 import lombok.Data;
5 import lombok.EqualsAndHashCode; 5 import lombok.EqualsAndHashCode;
6 import org.thingsboard.server.common.data.device.profile.AlarmRule; 6 import org.thingsboard.server.common.data.device.profile.AlarmRule;
  7 +import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
7 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum; 8 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
8 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum; 9 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
9 10
@@ -22,6 +23,9 @@ public class TriggerDTO extends TenantDTO { @@ -22,6 +23,9 @@ public class TriggerDTO extends TenantDTO {
22 @ApiModelProperty(value = "设备配置ID") 23 @ApiModelProperty(value = "设备配置ID")
23 private String deviceProfileId; 24 private String deviceProfileId;
24 25
  26 + @ApiModelProperty(value = "设备类型")
  27 + private DeviceTypeEnum deviceType;
  28 +
25 @ApiModelProperty(value = "触发器关联实体，例如：设备ID、场景联动ID、定时任务CRON表达式") 29 @ApiModelProperty(value = "触发器关联实体，例如：设备ID、场景联动ID、定时任务CRON表达式")
26 private ScopeEnum entityType; 30 private ScopeEnum entityType;
27 31
@@ -10,6 +10,7 @@ import org.apache.ibatis.type.EnumTypeHandler; @@ -10,6 +10,7 @@ import org.apache.ibatis.type.EnumTypeHandler;
10 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants; 10 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
11 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum; 11 import org.thingsboard.server.common.data.yunteng.enums.ActionTypeEnum;
12 import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum; 12 import org.thingsboard.server.common.data.yunteng.enums.CallTypeEnum;
  13 +import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
13 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum; 14 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
14 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler; 15 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
15 import java.util.List; 16 import java.util.List;
@@ -28,6 +29,9 @@ public class TkDoActionEntity extends TenantBaseEntity { @@ -28,6 +29,9 @@ public class TkDoActionEntity extends TenantBaseEntity {
28 private List<String> deviceId; 29 private List<String> deviceId;
29 30
30 @TableField(typeHandler = EnumTypeHandler.class) 31 @TableField(typeHandler = EnumTypeHandler.class)
  32 + private DeviceTypeEnum deviceType;
  33 +
  34 + @TableField(typeHandler = EnumTypeHandler.class)
31 private ScopeEnum entityType; 35 private ScopeEnum entityType;
32 36
33 @TableField(typeHandler = EnumTypeHandler.class) 37 @TableField(typeHandler = EnumTypeHandler.class)
@@ -3,11 +3,13 @@ package org.thingsboard.server.dao.yunteng.entities; @@ -3,11 +3,13 @@ package org.thingsboard.server.dao.yunteng.entities;
3 import com.baomidou.mybatisplus.annotation.TableField; 3 import com.baomidou.mybatisplus.annotation.TableField;
4 import com.baomidou.mybatisplus.annotation.TableName; 4 import com.baomidou.mybatisplus.annotation.TableName;
5 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler; 5 import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
  6 +import io.swagger.annotations.ApiModelProperty;
6 import lombok.Data; 7 import lombok.Data;
7 import lombok.EqualsAndHashCode; 8 import lombok.EqualsAndHashCode;
8 import org.apache.ibatis.type.EnumTypeHandler; 9 import org.apache.ibatis.type.EnumTypeHandler;
9 import org.thingsboard.server.common.data.device.profile.AlarmRule; 10 import org.thingsboard.server.common.data.device.profile.AlarmRule;
10 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants; 11 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
  12 +import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
11 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum; 13 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
12 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum; 14 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
13 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler; 15 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
@@ -29,6 +31,9 @@ public class TkDoConditionEntity extends TenantBaseEntity { @@ -29,6 +31,9 @@ public class TkDoConditionEntity extends TenantBaseEntity {
29 private String deviceProfileId; 31 private String deviceProfileId;
30 32
31 @TableField(typeHandler = EnumTypeHandler.class) 33 @TableField(typeHandler = EnumTypeHandler.class)
  34 + private DeviceTypeEnum deviceType;
  35 +
  36 + @TableField(typeHandler = EnumTypeHandler.class)
32 private ScopeEnum entityType; 37 private ScopeEnum entityType;
33 38
34 @TableField(typeHandler = EnumTypeHandler.class) 39 @TableField(typeHandler = EnumTypeHandler.class)
@@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode; @@ -8,6 +8,7 @@ import lombok.EqualsAndHashCode;
8 import org.apache.ibatis.type.EnumTypeHandler; 8 import org.apache.ibatis.type.EnumTypeHandler;
9 import org.thingsboard.server.common.data.device.profile.AlarmRule; 9 import org.thingsboard.server.common.data.device.profile.AlarmRule;
10 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants; 10 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
  11 +import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
11 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum; 12 import org.thingsboard.server.common.data.yunteng.enums.ScopeEnum;
12 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum; 13 import org.thingsboard.server.common.data.yunteng.enums.TriggerTypeEnum;
13 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler; 14 import org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler;
@@ -30,6 +31,9 @@ public class TkTriggerEntity extends TenantBaseEntity { @@ -30,6 +31,9 @@ public class TkTriggerEntity extends TenantBaseEntity {
30 private String deviceProfileId; 31 private String deviceProfileId;
31 32
32 @TableField(typeHandler = EnumTypeHandler.class) 33 @TableField(typeHandler = EnumTypeHandler.class)
  34 + private DeviceTypeEnum deviceType;
  35 +
  36 + @TableField(typeHandler = EnumTypeHandler.class)
33 private ScopeEnum entityType; 37 private ScopeEnum entityType;
34 38
35 @TableField(typeHandler = EnumTypeHandler.class) 39 @TableField(typeHandler = EnumTypeHandler.class)
@@ -4,9 +4,12 @@ @@ -4,9 +4,12 @@
4 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper"> 4 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoActionMapper">
5 <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoActionDTO"> 5 <resultMap id="actionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoActionDTO">
6 <result property="id" column="id"/> 6 <result property="id" column="id"/>
7 - <result property="deviceId" column="device_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/> 7 + <result property="deviceId" column="device_id"
  8 + typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
8 <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> 9 <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
9 - <result property="doContext" column="do_context" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/> 10 + <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
  11 + <result property="doContext" column="do_context"
  12 + typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
10 <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> 13 <result property="outTarget" column="out_target" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
11 <result property="callType" column="call_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> 14 <result property="callType" column="call_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
12 <result property="commandType" column="command_type"/> 15 <result property="commandType" column="command_type"/>
@@ -19,14 +22,14 @@ @@ -19,14 +22,14 @@
19 <result property="updateTime" column="update_time"/> 22 <result property="updateTime" column="update_time"/>
20 <result property="createTime" column="create_time"/> 23 <result property="createTime" column="create_time"/>
21 <result property="creator" column="creator"/> 24 <result property="creator" column="creator"/>
22 -  
23 </resultMap> 25 </resultMap>
24 <sql id="columns"> 26 <sql id="columns">
25 - id,device_id,entity_type,do_context,out_target,call_type,scene_linkage_id,alarm_profile_id, 27 + id,device_id,entity_type,device_type,do_context,out_target,call_type,scene_linkage_id,alarm_profile_id,
26 tenant_id,updater,update_time,create_time,creator,command_type,things_model_id,device_profile_id 28 tenant_id,updater,update_time,create_time,creator,command_type,things_model_id,device_profile_id
27 </sql> 29 </sql>
28 <select id="listBySceneId" resultMap="actionDTO"> 30 <select id="listBySceneId" resultMap="actionDTO">
29 - SELECT <include refid="columns"/> FROM tk_do_action WHERE scene_linkage_id = #{sceneId} 31 + SELECT
  32 + <include refid="columns"/>
  33 + FROM tk_do_action WHERE scene_linkage_id = #{sceneId}
30 </select> 34 </select>
31 -  
32 </mapper> 35 </mapper>
@@ -4,22 +4,29 @@ @@ -4,22 +4,29 @@
4 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper"> 4 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.DoConditionMapper">
5 <resultMap id="conditionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoConditionDTO"> 5 <resultMap id="conditionDTO" type="org.thingsboard.server.common.data.yunteng.dto.DoConditionDTO">
6 <result property="id" column="id"/> 6 <result property="id" column="id"/>
7 - <result property="entityId" column="entity_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/> 7 + <result property="entityId" column="entity_id"
  8 + typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
8 <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> 9 <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
9 - <result property="triggerCondition" column="trigger_condition" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/> 10 + <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
  11 + <result property="triggerCondition" column="trigger_condition"
  12 + typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
10 <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> 13 <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
11 <result property="sceneLinkageId" column="scene_linkage_id"/> 14 <result property="sceneLinkageId" column="scene_linkage_id"/>
12 - <result property="description" column="description"/>  
13 <result property="tenantId" column="tenant_id"/> 15 <result property="tenantId" column="tenant_id"/>
14 <result property="updater" column="updater"/> 16 <result property="updater" column="updater"/>
15 <result property="updateTime" column="update_time"/> 17 <result property="updateTime" column="update_time"/>
16 <result property="createTime" column="create_time"/> 18 <result property="createTime" column="create_time"/>
17 <result property="creator" column="creator"/> 19 <result property="creator" column="creator"/>
18 -  
19 </resultMap> 20 </resultMap>
20 21
  22 + <sql id="columns">
  23 + id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id
  24 + ,creator,updater,create_time,update_time
  25 + </sql>
  26 +
21 <select id="listBySceneId" resultMap="conditionDTO"> 27 <select id="listBySceneId" resultMap="conditionDTO">
22 - SELECT * FROM tk_do_condition WHERE scene_linkage_id = #{sceneId} 28 + SELECT
  29 + <include refid="columns"/>
  30 + FROM tk_do_condition WHERE scene_linkage_id = #{sceneId}
23 </select> 31 </select>
24 -  
25 </mapper> 32 </mapper>
@@ -4,22 +4,29 @@ @@ -4,22 +4,29 @@
4 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper"> 4 <mapper namespace="org.thingsboard.server.dao.yunteng.mapper.TriggerMapper">
5 <resultMap id="triggerDTO" type="org.thingsboard.server.common.data.yunteng.dto.TriggerDTO"> 5 <resultMap id="triggerDTO" type="org.thingsboard.server.common.data.yunteng.dto.TriggerDTO">
6 <result property="id" column="id"/> 6 <result property="id" column="id"/>
7 - <result property="entityId" column="entity_id" typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/> 7 + <result property="entityId" column="entity_id"
  8 + typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/>
8 <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> 9 <result property="entityType" column="entity_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
9 - <result property="triggerCondition" column="trigger_condition" typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/> 10 + <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
  11 + <result property="triggerCondition" column="trigger_condition"
  12 + typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/>
10 <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> 13 <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
11 <result property="sceneLinkageId" column="scene_linkage_id"/> 14 <result property="sceneLinkageId" column="scene_linkage_id"/>
12 - <result property="description" column="description"/>  
13 <result property="tenantId" column="tenant_id"/> 15 <result property="tenantId" column="tenant_id"/>
14 <result property="updater" column="updater"/> 16 <result property="updater" column="updater"/>
15 <result property="updateTime" column="update_time"/> 17 <result property="updateTime" column="update_time"/>
16 <result property="createTime" column="create_time"/> 18 <result property="createTime" column="create_time"/>
17 <result property="creator" column="creator"/> 19 <result property="creator" column="creator"/>
18 -  
19 </resultMap> 20 </resultMap>
20 21
  22 + <sql id="columns">
  23 + id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id,creator
  24 + ,updater,create_time,update_time
  25 + </sql>
  26 +
21 <select id="listBySceneId" resultMap="triggerDTO"> 27 <select id="listBySceneId" resultMap="triggerDTO">
22 - SELECT * FROM tk_trigger WHERE scene_linkage_id = #{sceneId} 28 + SELECT
  29 + <include refid="columns"/>
  30 + FROM tk_trigger WHERE scene_linkage_id = #{sceneId}
23 </select> 31 </select>
24 -  
25 </mapper> 32 </mapper>