Commit 7de96eb0381d94637a33c6d942d0c0ed3a7320e9

Authored by 云中非
1 parent dca663d4

feat: 组态新增适用平台类型字段

@@ -3,8 +3,11 @@ package org.thingsboard.server.common.data.yunteng.dto.request; @@ -3,8 +3,11 @@ package org.thingsboard.server.common.data.yunteng.dto.request;
3 import io.swagger.annotations.ApiModel; 3 import io.swagger.annotations.ApiModel;
4 import io.swagger.annotations.ApiModelProperty; 4 import io.swagger.annotations.ApiModelProperty;
5 import lombok.Data; 5 import lombok.Data;
  6 +import org.thingsboard.server.common.data.yunteng.common.AddGroup;
  7 +import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
6 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO; 8 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO;
7 9
  10 +import javax.validation.constraints.NotEmpty;
8 import java.util.List; 11 import java.util.List;
9 @Data 12 @Data
10 @ApiModel(value = "组态编辑") 13 @ApiModel(value = "组态编辑")
@@ -13,6 +16,8 @@ public class ConfigurationContentInfoDTO { @@ -13,6 +16,8 @@ public class ConfigurationContentInfoDTO {
13 private String configurationId; 16 private String configurationId;
14 @ApiModelProperty(value = "组态中心名称") 17 @ApiModelProperty(value = "组态中心名称")
15 private String configurationName; 18 private String configurationName;
  19 + @ApiModelProperty(value = "终端类型", required = true)
  20 + private String platform;
16 @ApiModelProperty(value = "组态内容",required = true) 21 @ApiModelProperty(value = "组态内容",required = true)
17 private List<ConfigurationContentDTO> configurationContentList; 22 private List<ConfigurationContentDTO> configurationContentList;
18 } 23 }
@@ -5,6 +5,7 @@ @@ -5,6 +5,7 @@
5 <resultMap id="configurationCenterMap" type="org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO"> 5 <resultMap id="configurationCenterMap" type="org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO">
6 <result property="id" column="id"/> 6 <result property="id" column="id"/>
7 <result property="name" column="name"/> 7 <result property="name" column="name"/>
  8 + <result property="platform" column="platform"/>
8 <result property="organizationId" column="organization_id"/> 9 <result property="organizationId" column="organization_id"/>
9 <result property="remark" column="remark"/> 10 <result property="remark" column="remark"/>
10 <result property="updateTime" column="update_time"/> 11 <result property="updateTime" column="update_time"/>
@@ -20,6 +21,7 @@ @@ -20,6 +21,7 @@
20 <resultMap id="configurationInfoMap" type="org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO"> 21 <resultMap id="configurationInfoMap" type="org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO">
21 <result property="configurationId" column="id"/> 22 <result property="configurationId" column="id"/>
22 <result property="configurationName" column="name"/> 23 <result property="configurationName" column="name"/>
  24 + <result property="platform" column="platform"/>
23 <collection property="configurationContentList" ofType="org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO"> 25 <collection property="configurationContentList" ofType="org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO">
24 <result property="id" column="content_id"/> 26 <result property="id" column="content_id"/>
25 <result property="content" column="content"/> 27 <result property="content" column="content"/>
@@ -27,7 +29,7 @@ @@ -27,7 +29,7 @@
27 </resultMap> 29 </resultMap>
28 30
29 <sql id="columns"> 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 </sql> 33 </sql>
32 <select id="getConfigurationCenterPage" resultMap="configurationCenterMap"> 34 <select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
33 SELECT 35 SELECT
@@ -51,7 +53,7 @@ @@ -51,7 +53,7 @@
51 </select> 53 </select>
52 54
53 <select id="getConfigurationInfoById" resultMap="configurationInfoMap"> 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 iotfs_configuration_content icct ON icc.id = icct.configuration_id 57 iotfs_configuration_content icct ON icc.id = icct.configuration_id
56 WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId} 58 WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
57 </select> 59 </select>