...
|
...
|
@@ -5,6 +5,7 @@ |
5
|
5
|
<resultMap id="configurationCenterMap" type="org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO">
|
6
|
6
|
<result property="id" column="id"/>
|
7
|
7
|
<result property="name" column="name"/>
|
|
8
|
+ <result property="platform" column="platform"/>
|
8
|
9
|
<result property="organizationId" column="organization_id"/>
|
9
|
10
|
<result property="remark" column="remark"/>
|
10
|
11
|
<result property="updateTime" column="update_time"/>
|
...
|
...
|
@@ -20,6 +21,7 @@ |
20
|
21
|
<resultMap id="configurationInfoMap" type="org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO">
|
21
|
22
|
<result property="configurationId" column="id"/>
|
22
|
23
|
<result property="configurationName" column="name"/>
|
|
24
|
+ <result property="platform" column="platform"/>
|
23
|
25
|
<collection property="configurationContentList" ofType="org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO">
|
24
|
26
|
<result property="id" column="content_id"/>
|
25
|
27
|
<result property="content" column="content"/>
|
...
|
...
|
@@ -27,7 +29,7 @@ |
27
|
29
|
</resultMap>
|
28
|
30
|
|
29
|
31
|
<sql id="columns">
|
30
|
|
- a.id,a.name,a.organization_id,a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
|
|
32
|
+ a.id,a.name,a.platform,a.organization_id,a.remark,a.update_time,a.create_time,a.creator,a.tenant_id,a.updater,io.name AS organization_name
|
31
|
33
|
</sql>
|
32
|
34
|
<select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
|
33
|
35
|
SELECT
|
...
|
...
|
@@ -51,7 +53,7 @@ |
51
|
53
|
</select>
|
52
|
54
|
|
53
|
55
|
<select id="getConfigurationInfoById" resultMap="configurationInfoMap">
|
54
|
|
- SELECT icc.id,icc.name,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
|
|
56
|
+ SELECT icc.id,icc.name,icc.platform,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
|
55
|
57
|
iotfs_configuration_content icct ON icc.id = icct.configuration_id
|
56
|
58
|
WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
|
57
|
59
|
</select>
|
...
|
...
|
|