feat: fix add dataComponent default layout to dataBoard

@@ -17,6 +17,7 @@ import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DataBoardDTO;
 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.ComponentLayoutDTO;
 import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.dto.board.MoreDataComponentInfoDTO;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.common.data.yunteng.utils.tools.ResponseResult;
 import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.controller.BaseController;
@@ -57,10 +58,17 @@ public class YtDataComponentController extends BaseController {
     if (StringUtils.isNotEmpty(dataComponent.getId())) {
     if (StringUtils.isNotEmpty(dataComponent.getId())) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     }
+    String tenantId = getCurrentUser().getCurrentTenantId();
     checkDataBoardInfo(boardId);
     checkDataBoardInfo(boardId);
-    dataComponent.setTenantId(getCurrentUser().getCurrentTenantId());
+    dataComponent.setTenantId(tenantId);
     dataComponent.setDataBoardId(boardId);
     dataComponent.setDataBoardId(boardId);
-    return saveOrUpdate(dataComponent);
+    DataBoardDTO dataBoardDTO = ytDataBoardService.findDataBoardInfoById(boardId, tenantId);
+    List<ComponentLayoutDTO> listLayout = dataBoardDTO.getLayout();
+    ResponseResult<DataComponentDTO> result = saveOrUpdate(dataComponent);
+    ComponentLayoutDTO defaultLayout = new ComponentLayoutDTO(result.getData().getId());
+    listLayout.add(defaultLayout);
+    ytDataBoardService.saveComponentLayout(listLayout, boardId, tenantId);
+    return result;
   }
   }
 
 
   @PostMapping("/{boardId}/update")
   @PostMapping("/{boardId}/update")

@@ -25,14 +25,4 @@ public class ComponentInfoDTO implements Serializable {
 
 
   @ApiModelProperty(value = "梯度信息")
   @ApiModelProperty(value = "梯度信息")
   private List<GradientInfo> gradientInfo;
   private List<GradientInfo> gradientInfo;
-
-  @Data
-  class GradientInfo {
-
-    @ApiModelProperty(value = "梯度key")
-    private String key;
-
-    @ApiModelProperty(value = "梯度值")
-    private Integer value;
-  }
 }
 }

@@ -24,4 +24,14 @@ public class ComponentLayoutDTO implements Serializable {
 
 
   @ApiModelProperty(value = "高度", required = true)
   @ApiModelProperty(value = "高度", required = true)
   private Integer h;
   private Integer h;
+
+  public ComponentLayoutDTO() {}
+
+  public ComponentLayoutDTO(String id) {
+    this.id = id;
+    this.x = 0;
+    this.y = 0;
+    this.w = 6;
+    this.h = 6;
+  }
 }
 }

+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;
+}

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.lang3.StringUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.exception.YtDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
@@ -52,12 +53,14 @@ public class YtDataComponentServiceImpl
   }
   }
 
 
   @Override
   @Override
+  @Transactional
   public DataComponentDTO saveOrUpdateDataBoard(DataComponentDTO dataComponentDTO) {
   public DataComponentDTO saveOrUpdateDataBoard(DataComponentDTO dataComponentDTO) {
     DataComponent dataComponent = dataComponentDTO.getEntity(DataComponent.class);
     DataComponent dataComponent = dataComponentDTO.getEntity(DataComponent.class);
     dataComponent.setDataSource(
     dataComponent.setDataSource(
         JacksonUtil.convertValue(dataComponentDTO.getDataSource(), JsonNode.class));
         JacksonUtil.convertValue(dataComponentDTO.getDataSource(), JsonNode.class));
     if (StringUtils.isEmpty(dataComponentDTO.getId())) {
     if (StringUtils.isEmpty(dataComponentDTO.getId())) {
       baseMapper.insert(dataComponent);
       baseMapper.insert(dataComponent);
+      dataComponentDTO.setId(dataComponent.getId());
     } else {
     } else {
       DataComponent queryEntity =
       DataComponent queryEntity =
           baseMapper.selectOne(
           baseMapper.selectOne(
@@ -72,10 +75,11 @@ public class YtDataComponentServiceImpl
                     ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
                     ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
               });
               });
     }
     }
-    return dataComponent.getDTO(DataComponentDTO.class);
+    return dataComponentDTO;
   }
   }
 
 
   @Override
   @Override
+  @Transactional
   public boolean deleteDataComponent(DeleteDTO deleteDTO) {
   public boolean deleteDataComponent(DeleteDTO deleteDTO) {
     return baseMapper.delete(
     return baseMapper.delete(
             new LambdaQueryWrapper<DataComponent>()
             new LambdaQueryWrapper<DataComponent>()