Merge branch 'master_dev' into 20230525

 package org.thingsboard.server.common.data.yunteng.dto;
 package org.thingsboard.server.common.data.yunteng.dto;
 
 
+import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
 import org.thingsboard.server.common.data.yunteng.dto.board.ComponentLayoutDTO;
-import org.thingsboard.server.common.data.yunteng.dto.board.DataSourceInfoDTO;
-
-import java.util.List;
 
 
 @EqualsAndHashCode(callSuper = true)
 @EqualsAndHashCode(callSuper = true)
 @Data
 @Data
@@ -21,7 +19,7 @@ public class DataComponentDTO extends TenantDTO {
   private String frontId;
   private String frontId;
 
 
   @ApiModelProperty(value = "数据源", required = true)
   @ApiModelProperty(value = "数据源", required = true)
-  private List<DataSourceInfoDTO> dataSource;
+  private JsonNode dataSource;
 
 
   @ApiModelProperty(value = "备注")
   @ApiModelProperty(value = "备注")
   private String remark;
   private String remark;

-package org.thingsboard.server.common.data.yunteng.dto.board;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-import java.util.List;
-
-@Data
-public class ComponentInfoDTO implements Serializable {
-
-  private static final long serialVersionUID = -1383423212190365330L;
-
-  @ApiModelProperty(value = "数值字体颜色", required = true)
-  private String fontColor;
-
-  @ApiModelProperty(value = "数值单位")
-  private String unit;
-
-  @ApiModelProperty(value = "icon图标")
-  private String icon;
-
-  @ApiModelProperty(value = "icon图标颜色")
-  private String iconColor;
-
-  @ApiModelProperty(value = "显示设备名称：默认true")
-  private Boolean showDeviceName;
-
-  @ApiModelProperty(value = "梯度信息")
-  private List<GradientInfo> gradientInfo;
-
-  public Boolean getShowDeviceName() {
-    return showDeviceName;
-  }
-
-  public void setShowDeviceName(Boolean showDeviceName) {
-    this.showDeviceName = null == showDeviceName || showDeviceName;
-  }
-}

-package org.thingsboard.server.common.data.yunteng.dto.board;
-
-import com.fasterxml.jackson.databind.JsonNode;
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
-
-import java.io.Serializable;
-
-@Data
-public class DataSourceInfoDTO implements Serializable {
-
-  private static final long serialVersionUID = -8044628645505274772L;
-
-  @ApiModelProperty(value = "设备配置ID", required = true)
-  private String deviceProfileId;
-
-  @ApiModelProperty(value = "组织ID", required = true)
-  private String organizationId;
-
-  @ApiModelProperty(value = "设备ID", required = true)
-  private String deviceId;
-
-  @ApiModelProperty(value = "组织ID", required = true)
-  private DeviceTypeEnum deviceType;
-
-  @ApiModelProperty(value = "属性", required = true)
-  private String attribute;
-
-  @ApiModelProperty(value = "设备名称")
-  private String deviceName;
-
-  @ApiModelProperty(value = "是否网关设备")
-  private boolean gatewayDevice = false;
-
-  @ApiModelProperty(value = "子设备ID")
-  private String slaveDeviceId;
-
-  @ApiModelProperty(value = "设备重命名")
-  private String deviceRename;
-
-  @ApiModelProperty(value = "属性重命名")
-  private String attributeRename;
-
-  @ApiModelProperty(value = "组件选项信息")
-  private ComponentInfoDTO componentInfo;
-
-  @ApiModelProperty(value = "命令自定义json")
-  private JsonNode customCommand;
-}

-package org.thingsboard.server.common.data.yunteng.dto.board;
-
-import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
-
-import java.io.Serializable;
-
-@Data
-public class GradientInfo implements Serializable {
-
-  private static final long serialVersionUID = -4991589470363935653L;
-
-  @ApiModelProperty(value = "梯度颜色")
-  private String color;
-
-  @ApiModelProperty(value = "梯度key")
-  private String key;
-
-  @ApiModelProperty(value = "梯度值")
-  private Integer value;
-}

@@ -9,14 +9,12 @@ import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidatio
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
-import org.thingsboard.server.common.data.yunteng.dto.board.DataSourceInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.dao.yunteng.entities.TkDataComponentEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDataComponentEntity;
 import org.thingsboard.server.dao.yunteng.mapper.DataComponentMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DataComponentMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.TkDataComponentService;
 import org.thingsboard.server.dao.yunteng.service.TkDataComponentService;
 
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Optional;
 import java.util.Optional;
 import java.util.Set;
 import java.util.Set;
@@ -37,7 +35,7 @@ public class TkDataComponentServiceImpl
       return null;
       return null;
     }
     }
     return dataComponentList.stream()
     return dataComponentList.stream()
-        .map(this::getDataSourceByJsonNode)
+        .map(entity->entity.getDTO(DataComponentDTO.class))
         .collect(Collectors.toList());
         .collect(Collectors.toList());
   }
   }
 
 
@@ -85,19 +83,7 @@ public class TkDataComponentServiceImpl
                 .eq(TkDataComponentEntity::getTenantId, tenantId)
                 .eq(TkDataComponentEntity::getTenantId, tenantId)
                 .in(TkDataComponentEntity::getDataBoardId, dataBoardIds));
                 .in(TkDataComponentEntity::getDataBoardId, dataBoardIds));
     return Optional.ofNullable(dataComponents)
     return Optional.ofNullable(dataComponents)
-        .map(obj -> obj.stream().map(this::getDataSourceByJsonNode).collect(Collectors.toList()))
+        .map(obj -> obj.stream().map(entity->entity.getDTO(DataComponentDTO.class)).collect(Collectors.toList()))
         .orElse(null);
         .orElse(null);
   }
   }
-
-  private DataComponentDTO getDataSourceByJsonNode(TkDataComponentEntity obj) {
-    DataComponentDTO dto = obj.getDTO(DataComponentDTO.class);
-    List<DataSourceInfoDTO> list = new ArrayList<>();
-    if (null != obj.getDataSource() && obj.getDataSource().isArray()) {
-      for (JsonNode jsonNode : obj.getDataSource()) {
-        list.add(JacksonUtil.convertValue(jsonNode, DataSourceInfoDTO.class));
-      }
-    }
-    dto.setDataSource(list);
-    return dto;
-  }
 }
 }