feat: ConfigurationDatasource add column deviceType and deviceProfileId

@@ -6,38 +6,47 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 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.common.UpdateGroup;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 
 
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.NotEmpty;
 
 
 /**
 /**
  * 组态结点数据源
  * 组态结点数据源
+ *
  * @author Administrator
  * @author Administrator
  */
  */
 @Data
 @Data
 public class ConfigurationDatasourceStatusDTO {
 public class ConfigurationDatasourceStatusDTO {
 
 
-
   @ApiModelProperty(value = "orgId", required = true)
   @ApiModelProperty(value = "orgId", required = true)
   @NotEmpty(
   @NotEmpty(
-          message = "设备所属组织ID不能未空或空字符串",
-          groups = {UpdateGroup.class, AddGroup.class})
+      message = "设备所属组织ID不能未空或空字符串",
+      groups = {UpdateGroup.class, AddGroup.class})
   private String orgId;
   private String orgId;
 
 
+  @ApiModelProperty(value = "设备类型", required = true)
+  private DeviceTypeEnum deviceType;
+
+  @ApiModelProperty(value = "设备配置文件", required = true)
+  private String deviceProfileId;
+
   @ApiModelProperty(value = "tbDeviceId", required = true)
   @ApiModelProperty(value = "tbDeviceId", required = true)
   @NotEmpty(
   @NotEmpty(
-          message = "tbDeviceId不能未空或空字符串",
-          groups = {UpdateGroup.class, AddGroup.class})
+      message = "tbDeviceId不能未空或空字符串",
+      groups = {UpdateGroup.class, AddGroup.class})
   private String deviceId;
   private String deviceId;
+
   private String slaveDeviceId;
   private String slaveDeviceId;
 
 
   @ApiModelProperty(value = "组件关注的指标")
   @ApiModelProperty(value = "组件关注的指标")
   @NotEmpty(
   @NotEmpty(
-          message = "遥测指标不能为空",
-          groups = {UpdateGroup.class, AddGroup.class})
+      message = "遥测指标不能为空",
+      groups = {UpdateGroup.class, AddGroup.class})
   private String attr;
   private String attr;
 
 
   @ApiModelProperty(value = "组态描述")
   @ApiModelProperty(value = "组态描述")
   private String remark;
   private String remark;
+
   @ApiModelProperty(value = "数据源高级配置说明")
   @ApiModelProperty(value = "数据源高级配置说明")
   private JsonNode additional;
   private JsonNode additional;
 }
 }

@@ -6,7 +6,9 @@ import com.baomidou.mybatisplus.extension.handlers.JacksonTypeHandler;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.apache.ibatis.type.EnumTypeHandler;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
 import org.thingsboard.server.common.data.yunteng.constant.ModelConstants;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
 
 
 /**
 /**
  * @author Administrator
  * @author Administrator
@@ -19,6 +21,9 @@ public class TkConfigurationDatasourceEntity extends ConfigurationBaseEntity {
     private String nodeId;
     private String nodeId;
     private String deviceId;
     private String deviceId;
     private String slaveDeviceId;
     private String slaveDeviceId;
+    @TableField(typeHandler = EnumTypeHandler.class)
+    private DeviceTypeEnum deviceType;
+    private String deviceProfileId;
     private String attr;
     private String attr;
     @TableField(typeHandler = JacksonTypeHandler.class)
     @TableField(typeHandler = JacksonTypeHandler.class)
     private JsonNode additional;
     private JsonNode additional;