Commit a4ebf730f49132131928b113bba8ab0f92c240a3

Authored by xp.Huang
1 parent 6e28e886

feat: 大屏详情返回缩略图信息

@@ -16,7 +16,8 @@ public class TkDataViewContentInfoDTO { @@ -16,7 +16,8 @@ public class TkDataViewContentInfoDTO {
16 private Integer state; 16 private Integer state;
17 @ApiModelProperty(value = "组织ID") 17 @ApiModelProperty(value = "组织ID")
18 private String organizationId; 18 private String organizationId;
19 - 19 + @ApiModelProperty(value = "缩略图")
  20 + private String thumbnail;
20 @ApiModelProperty(value = "大屏内容",required = true) 21 @ApiModelProperty(value = "大屏内容",required = true)
21 private TkDataViewContentDTO dataViewContent; 22 private TkDataViewContentDTO dataViewContent;
22 } 23 }
@@ -24,6 +24,7 @@ @@ -24,6 +24,7 @@
24 24
25 <resultMap id="dataViewInfoMap" 25 <resultMap id="dataViewInfoMap"
26 type="org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO"> 26 type="org.thingsboard.server.common.data.yunteng.dto.request.TkDataViewContentInfoDTO">
  27 + <result property="thumbnail" column="thumbnail"/>
27 <result property="dataViewId" column="id"/> 28 <result property="dataViewId" column="id"/>
28 <result property="dataViewName" column="name"/> 29 <result property="dataViewName" column="name"/>
29 <result property="state" column="state"/> 30 <result property="state" column="state"/>
@@ -61,7 +62,7 @@ @@ -61,7 +62,7 @@
61 </select> 62 </select>
62 63
63 <select id="getDataViewInfoById" resultMap="dataViewInfoMap"> 64 <select id="getDataViewInfoById" resultMap="dataViewInfoMap">
64 - SELECT icc.id,icc.name,icc.state,icc.organization_id,icc.thumbnail,icct.id AS content_id,icct.content FROM tk_data_view icc LEFT JOIN 65 + SELECT icc.id,icc.thumbnail,icc.name,icc.state,icc.organization_id,icc.thumbnail,icct.id AS content_id,icct.content FROM tk_data_view icc LEFT JOIN
65 tk_data_view_content icct ON icc.id = icct.view_id 66 tk_data_view_content icct ON icc.id = icct.view_id
66 WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId} 67 WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
67 </select> 68 </select>