feat: add component layout to data board detail

@@ -17,6 +17,8 @@ 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.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;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
@@ -35,12 +37,16 @@ public class YtDataComponentController extends BaseController {
 
 
   @GetMapping("/{boardId}")
   @GetMapping("/{boardId}")
   @ApiOperation(value = "查询看板下的所有组件信息")
   @ApiOperation(value = "查询看板下的所有组件信息")
-  public ResponseResult<List<DataComponentDTO>> getDataComponentsByBoardId(
+  public ResponseResult<MoreDataComponentInfoDTO> getDataComponentsByBoardId(
       @PathVariable("boardId") String boardId) throws ThingsboardException {
       @PathVariable("boardId") String boardId) throws ThingsboardException {
-    checkDataBoardInfo(boardId);
-    return ResponseResult.success(
+    DataBoardDTO dataBoardDTO = checkDataBoardInfo(boardId);
+    MoreDataComponentInfoDTO moreDataComponentInfoDTO = new MoreDataComponentInfoDTO();
+    List<DataComponentDTO> data =
         ytDataComponentService.getDataComponentsByBoardId(
         ytDataComponentService.getDataComponentsByBoardId(
-            getCurrentUser().getCurrentTenantId(), boardId));
+            getCurrentUser().getCurrentTenantId(), boardId);
+    moreDataComponentInfoDTO.setComponentLayout(dataBoardDTO.getLayout());
+    moreDataComponentInfoDTO.setComponentData(data);
+    return ResponseResult.success(moreDataComponentInfoDTO);
   }
   }
 
 
   @PostMapping("/{boardId}/add")
   @PostMapping("/{boardId}/add")
@@ -87,11 +93,12 @@ public class YtDataComponentController extends BaseController {
     return ResponseResult.success(ytDataComponentService.saveOrUpdateDataBoard(dataComponent));
     return ResponseResult.success(ytDataComponentService.saveOrUpdateDataBoard(dataComponent));
   }
   }
 
 
-  private void checkDataBoardInfo(String boardId) throws ThingsboardException {
+  private DataBoardDTO checkDataBoardInfo(String boardId) throws ThingsboardException {
     DataBoardDTO dto =
     DataBoardDTO dto =
         ytDataBoardService.findDataBoardInfoById(boardId, getCurrentUser().getCurrentTenantId());
         ytDataBoardService.findDataBoardInfoById(boardId, getCurrentUser().getCurrentTenantId());
     if (null == dto) {
     if (null == dto) {
       throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
       throw new YtDataValidationException(ErrorMessage.NOT_BELONG_CURRENT_TENANT.getMessage());
     }
     }
+    return dto;
   }
   }
 }
 }

+package org.thingsboard.server.common.data.yunteng.dto.board;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.thingsboard.server.common.data.yunteng.dto.DataComponentDTO;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class MoreDataComponentInfoDTO implements Serializable {
+
+  private static final long serialVersionUID = 5702474912490319623L;
+
+  @ApiModelProperty("组件数据信息")
+  private List<DataComponentDTO> componentData;
+
+  @ApiModelProperty("组件布局信息")
+  private List<ComponentLayoutDTO> componentLayout;
+}

@@ -12,7 +12,6 @@ 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.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.ComponentLayoutDTO;
-import org.thingsboard.server.common.data.yunteng.enums.ViewType;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.JacksonUtil;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.common.data.yunteng.utils.tools.YtPageData;
 import org.thingsboard.server.dao.yunteng.entities.DataBoard;
 import org.thingsboard.server.dao.yunteng.entities.DataBoard;
@@ -20,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.mapper.DataBoardMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 import java.util.Map;
 import java.util.Map;
 import java.util.Optional;
 import java.util.Optional;
@@ -66,9 +66,6 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
                 throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
                 throw new YtDataValidationException(ErrorMessage.INTERNAL_ERROR.getMessage());
               });
               });
     }
     }
-    // 公有视图,生成访问路径
-    if (dataBoard.getViewType() == ViewType.PUBLIC_VIEW) {}
-
     return dataBoard.getDTO(DataBoardDTO.class);
     return dataBoard.getDTO(DataBoardDTO.class);
   }
   }
 
 
@@ -111,7 +108,18 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
                 new LambdaQueryWrapper<DataBoard>()
                 new LambdaQueryWrapper<DataBoard>()
                     .eq(DataBoard::getTenantId, tenantId)
                     .eq(DataBoard::getTenantId, tenantId)
                     .eq(DataBoard::getId, id)))
                     .eq(DataBoard::getId, id)))
-        .map(obj -> obj.getDTO(DataBoardDTO.class))
+        .map(
+            obj -> {
+              DataBoardDTO returnBoard = obj.getDTO(DataBoardDTO.class);
+              List<ComponentLayoutDTO> layout = new ArrayList<>();
+              if (obj.getLayout().isArray()) {
+                for (JsonNode jsonNode : obj.getLayout()) {
+                  layout.add(JacksonUtil.convertValue(jsonNode, ComponentLayoutDTO.class));
+                }
+              }
+              returnBoard.setLayout(layout);
+              return returnBoard;
+            })
         .orElse(null);
         .orElse(null);
   }
   }
 }
 }

@@ -42,9 +42,9 @@ public interface YtDataBoardService {
 
 
   /**
   /**
    * 根据租户ID和看板ID查询看板信息
    * 根据租户ID和看板ID查询看板信息
-   * @param id
-   * @param tenantId
-   * @return
+   * @param id 看板ID
+   * @param tenantId 租户ID
+   * @return 看板信息
    */
    */
   DataBoardDTO findDataBoardInfoById(String id,String tenantId);
   DataBoardDTO findDataBoardInfoById(String id,String tenantId);
 }
 }