Commit 3e456bf3f00cdb5257838bcc623fb08a0ceb23d9
1 parent
8fcf34cc
feat: doAction doCondition add column deviceProfileId
Showing
2 changed files
with
4 additions
and
2 deletions
| @@ -14,6 +14,7 @@ | @@ -14,6 +14,7 @@ | ||
| 14 | <result property="sceneLinkageId" column="scene_linkage_id"/> | 14 | <result property="sceneLinkageId" column="scene_linkage_id"/> |
| 15 | <result property="tenantId" column="tenant_id"/> | 15 | <result property="tenantId" column="tenant_id"/> |
| 16 | <result property="updater" column="updater"/> | 16 | <result property="updater" column="updater"/> |
| 17 | + <result property="deviceProfileId" column="device_profile_id"/> | ||
| 17 | <result property="updateTime" column="update_time"/> | 18 | <result property="updateTime" column="update_time"/> |
| 18 | <result property="createTime" column="create_time"/> | 19 | <result property="createTime" column="create_time"/> |
| 19 | <result property="creator" column="creator"/> | 20 | <result property="creator" column="creator"/> |
| @@ -21,7 +22,7 @@ | @@ -21,7 +22,7 @@ | ||
| 21 | 22 | ||
| 22 | <sql id="columns"> | 23 | <sql id="columns"> |
| 23 | id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id | 24 | id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id |
| 24 | - ,creator,updater,create_time,update_time | 25 | + ,creator,updater,create_time,update_time,device_profile_id |
| 25 | </sql> | 26 | </sql> |
| 26 | 27 | ||
| 27 | <select id="listBySceneId" resultMap="conditionDTO"> | 28 | <select id="listBySceneId" resultMap="conditionDTO"> |
| @@ -8,6 +8,7 @@ | @@ -8,6 +8,7 @@ | ||
| 8 | typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/> | 8 | typeHandler="org.thingsboard.server.dao.yunteng.mapper.ListStringTypeHandler"/> |
| 9 | <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"/> |
| 10 | <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> | 10 | <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> |
| 11 | + <result property="deviceProfileId" column="device_profile_id"/> | ||
| 11 | <result property="triggerCondition" column="trigger_condition" | 12 | <result property="triggerCondition" column="trigger_condition" |
| 12 | typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/> | 13 | typeHandler="com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler"/> |
| 13 | <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> | 14 | <result property="triggerType" column="trigger_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/> |
| @@ -21,7 +22,7 @@ | @@ -21,7 +22,7 @@ | ||
| 21 | 22 | ||
| 22 | <sql id="columns"> | 23 | <sql id="columns"> |
| 23 | id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id,creator | 24 | id,entity_id,entity_type,device_type,trigger_condition,trigger_type,scene_linkage_id,tenant_id,creator |
| 24 | - ,updater,create_time,update_time | 25 | + ,updater,create_time,update_time,device_profile_id |
| 25 | </sql> | 26 | </sql> |
| 26 | 27 | ||
| 27 | <select id="listBySceneId" resultMap="triggerDTO"> | 28 | <select id="listBySceneId" resultMap="triggerDTO"> |