Merge branch '20220722' into 'master'

feat: 设备新增字段“设备厂商”

See merge request huang/thingsboard3.3.2!120

@@ -1143,10 +1143,10 @@ file:
       staticUrl: /oss/files/**              #oss静态访问路径 只有type = local需要
       staticUrl: /oss/files/**              #oss静态访问路径 只有type = local需要
       randomFileName: ${file.storage.randomFileName}
       randomFileName: ${file.storage.randomFileName}
     minio:
     minio:
-      minioUrl: https://dev.thingskit.com:9000  #minio储存地址
+      minioUrl: ${MINIO_URL:https://dev.thingskit.com:9000}  #minio储存地址
 #      minioUrl: https://demo.thingskit.com:9000  #minio储存地址
 #      minioUrl: https://demo.thingskit.com:9000  #minio储存地址
-      minioName: YunTeng                    #minio账户
-      minioPass: YunTeng123456              #minio访问密码
+      minioName: ${MINIO_NAME:YunTeng}                    #minio账户
+      minioPass: ${MINIO_PWD:YunTeng123456}              #minio访问密码
       bucketName: yunteng                   #minio储存桶名称
       bucketName: yunteng                   #minio储存桶名称
       randomFileName: ${file.storage.randomFileName}
       randomFileName: ${file.storage.randomFileName}
 account:
 account:

@@ -22,9 +22,15 @@ public class ConfigurationCenterDTO extends TenantDTO {
 
 
   @ApiModelProperty(value = "组织ID", required = true)
   @ApiModelProperty(value = "组织ID", required = true)
   @NotEmpty(
   @NotEmpty(
-      message = "组织ID不能为空或空字符串",
-      groups = {UpdateGroup.class, AddGroup.class})
+          message = "组织ID不能为空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
   private String organizationId;
   private String organizationId;
 
 
+  @ApiModelProperty(value = "终端类型", required = true)
+  @NotEmpty(
+          message = "终端类型不能为空或空字符串",
+          groups = {UpdateGroup.class, AddGroup.class})
+  private String platform;
+
   private OrganizationDTO organizationDTO;
   private OrganizationDTO organizationDTO;
 }
 }

@@ -45,7 +45,8 @@ public class DeviceDTO extends TenantDTO {
     private YtCredentialsDto deviceToken;
     private YtCredentialsDto deviceToken;
 
 
     private String tbDeviceId;
     private String tbDeviceId;
-    private String deviceTypeId;
+    @ApiModelProperty(value = "设备厂商")
+    private String brand;
 
 
     @NotEmpty(
     @NotEmpty(
             message = "设备编号不能为空",
             message = "设备编号不能为空",

@@ -3,8 +3,11 @@ package org.thingsboard.server.common.data.yunteng.dto.request;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO;
 import org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO;
 
 
+import javax.validation.constraints.NotEmpty;
 import java.util.List;
 import java.util.List;
 @Data
 @Data
 @ApiModel(value = "组态编辑")
 @ApiModel(value = "组态编辑")
@@ -13,6 +16,8 @@ public class ConfigurationContentInfoDTO {
     private String configurationId;
     private String configurationId;
     @ApiModelProperty(value = "组态中心名称")
     @ApiModelProperty(value = "组态中心名称")
     private String configurationName;
     private String configurationName;
+    @ApiModelProperty(value = "终端类型", required = true)
+    private String platform;
     @ApiModelProperty(value = "组态内容",required = true)
     @ApiModelProperty(value = "组态内容",required = true)
     private List<ConfigurationContentDTO> configurationContentList;
     private List<ConfigurationContentDTO> configurationContentList;
 }
 }

@@ -5,5 +5,6 @@ public enum ActTypeEnum {
   FLASH,
   FLASH,
   ROTATE,
   ROTATE,
   DISPLAY,
   DISPLAY,
-  IMAGE
+  IMAGE,
+  SWITCH
 }
 }

@@ -13,4 +13,5 @@ public class ConfigurationCenter extends TenantBaseEntity {
   private String name;
   private String name;
   private String remark;
   private String remark;
   private String organizationId;
   private String organizationId;
+  private String platform;
 }
 }

@@ -25,7 +25,7 @@ public class YtDevice extends TenantBaseEntity {
     private String profileId;
     private String profileId;
     private String tbDeviceId;
     private String tbDeviceId;
     private String gatewayId;
     private String gatewayId;
-    private String deviceTypeId;
+    private String brand;
     private String label;
     private String label;
     @TableField(typeHandler = EnumTypeHandler.class)
     @TableField(typeHandler = EnumTypeHandler.class)
     private DeviceTypeEnum deviceType;
     private DeviceTypeEnum deviceType;

@@ -66,6 +66,7 @@ public class YtConfigurationCenterServiceImpl
     contentDTO.setType(FastIotConstants.PC_TYPE);
     contentDTO.setType(FastIotConstants.PC_TYPE);
     contentDTO.setName(FastIotConstants.FIRST_PAGE_NAME);
     contentDTO.setName(FastIotConstants.FIRST_PAGE_NAME);
     contentDTO.setConfigurationId(configurationCenter.getId());
     contentDTO.setConfigurationId(configurationCenter.getId());
+    contentDTO.setContent("<mxGraphModel><root><mxCell id=\"0\"/><mxCell id=\"1\" parent=\"0\"/></root></mxGraphModel>");
     ytConfigurationContentService.saveConfigurationContent(contentDTO);
     ytConfigurationContentService.saveConfigurationContent(contentDTO);
     return configurationCenterDTO;
     return configurationCenterDTO;
   }
   }

@@ -5,6 +5,7 @@
     <resultMap id="configurationCenterMap" type="org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO">
     <resultMap id="configurationCenterMap" type="org.thingsboard.server.common.data.yunteng.dto.ConfigurationCenterDTO">
         <result property="id" column="id"/>
         <result property="id" column="id"/>
         <result property="name" column="name"/>
         <result property="name" column="name"/>
+        <result property="platform" column="platform"/>
         <result property="organizationId" column="organization_id"/>
         <result property="organizationId" column="organization_id"/>
         <result property="remark" column="remark"/>
         <result property="remark" column="remark"/>
         <result property="updateTime" column="update_time"/>
         <result property="updateTime" column="update_time"/>
@@ -20,6 +21,7 @@
     <resultMap id="configurationInfoMap" type="org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO">
     <resultMap id="configurationInfoMap" type="org.thingsboard.server.common.data.yunteng.dto.request.ConfigurationContentInfoDTO">
         <result property="configurationId" column="id"/>
         <result property="configurationId" column="id"/>
         <result property="configurationName" column="name"/>
         <result property="configurationName" column="name"/>
+        <result property="platform" column="platform"/>
         <collection property="configurationContentList" ofType="org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO">
         <collection property="configurationContentList" ofType="org.thingsboard.server.common.data.yunteng.dto.ConfigurationContentDTO">
             <result property="id" column="content_id"/>
             <result property="id" column="content_id"/>
             <result property="content" column="content"/>
             <result property="content" column="content"/>
@@ -27,7 +29,7 @@
     </resultMap>
     </resultMap>
 
 
     <sql id="columns">
     <sql id="columns">
-        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
+        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
     </sql>
     </sql>
     <select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
     <select id="getConfigurationCenterPage" resultMap="configurationCenterMap">
         SELECT
         SELECT
@@ -51,7 +53,7 @@
     </select>
     </select>
 
 
     <select id="getConfigurationInfoById" resultMap="configurationInfoMap">
     <select id="getConfigurationInfoById" resultMap="configurationInfoMap">
-        SELECT icc.id,icc.name,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
+        SELECT icc.id,icc.name,icc.platform,icct.id AS content_id,icct.content FROM iotfs_configuration_center icc LEFT JOIN
         iotfs_configuration_content icct ON icc.id = icct.configuration_id
         iotfs_configuration_content icct ON icc.id = icct.configuration_id
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
         WHERE icc.id = #{id} AND icc.tenant_id = #{tenantId}
     </select>
     </select>

@@ -15,6 +15,7 @@
         <result property="profileId" column="profile_id"/>
         <result property="profileId" column="profile_id"/>
         <result property="activeTime" column="active_time"/>
         <result property="activeTime" column="active_time"/>
         <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
         <result property="deviceType" column="device_type" typeHandler="org.apache.ibatis.type.EnumTypeHandler"/>
+        <result property="brand" column="brand" />
         <result property="sn" column="sn"/>
         <result property="sn" column="sn"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="tenantId" column="tenant_id"/>
         <result property="tbDeviceId" column="tb_device_id"/>
         <result property="tbDeviceId" column="tb_device_id"/>
@@ -62,7 +63,7 @@
         ifd
         ifd
         .
         .
         id
         id
-        ,ifd.sn,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description
+        ,ifd.sn,ifd.brand,ifd.name,ifd.device_info,ifd.profile_id,ifd.active_time,ifd.tenant_id,ifd.description
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ,ifd.tb_device_id,ifd.label,ifd.last_connect_time,ifd.device_type,ifd.device_state,ifd.create_time,ifd.update_time,ifd.creator,
         ifd.updater,ifd.organization_id,ifd.alarm_status
         ifd.updater,ifd.organization_id,ifd.alarm_status
     </sql>
     </sql>