Merge branch 'master' into 20220923

@@ -25,6 +25,7 @@ import org.thingsboard.server.controller.BaseController;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.YtDataComponentService;
 import org.thingsboard.server.dao.yunteng.service.YtDataComponentService;
 
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.List;
 
 
 @RestController
 @RestController
@@ -129,6 +130,18 @@ public class YtDataComponentController extends BaseController {
               ? Math.max(dataBoardDTO.getComponentNum() - deleteNum, zero)
               ? Math.max(dataBoardDTO.getComponentNum() - deleteNum, zero)
               : zero;
               : zero;
       ytDataBoardService.updateDataBoardComponentNum(dataBoardId, tenantId, count);
       ytDataBoardService.updateDataBoardComponentNum(dataBoardId, tenantId, count);
+      // 更新dataBoard的layout信息
+      DataBoardDTO dto = ytDataBoardService.findDataBoardInfoById(dataBoardId, tenantId);
+      List<ComponentLayoutDTO> layoutResult = new ArrayList<>();
+      for (ComponentLayoutDTO componentLayout : dto.getLayout()) {
+        for (String id : deleteDTO.getIds()) {
+          if (!componentLayout.getId().equals(id)) {
+            layoutResult.add(componentLayout);
+          }
+        }
+      }
+      dto.setLayout(layoutResult);
+      ytDataBoardService.saveOrUpdateDataBoard(dto);
     }
     }
     return ResponseResult.success(result);
     return ResponseResult.success(result);
   }
   }

@@ -8,7 +8,7 @@ import java.util.List;
 
 
 @Data
 @Data
 public class DataComponentDTO extends TenantDTO {
 public class DataComponentDTO extends TenantDTO {
-  @ApiModelProperty(value = "组件名称", required = true)
+  @ApiModelProperty(value = "组件名称")
   private String name;
   private String name;
 
 
   @ApiModelProperty(value = "数据看板ID", required = true)
   @ApiModelProperty(value = "数据看板ID", required = true)

@@ -10,10 +10,7 @@ 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;
-import org.thingsboard.server.common.data.yunteng.dto.BaseDTO;
-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.OrganizationDTO;
+import org.thingsboard.server.common.data.yunteng.dto.*;
 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.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;
@@ -23,6 +20,7 @@ import org.thingsboard.server.dao.yunteng.mapper.OrganizationMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.UserOrganizationMappingService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
 import org.thingsboard.server.dao.yunteng.service.YtDataBoardService;
+import org.thingsboard.server.dao.yunteng.service.YtDataComponentService;
 
 
 import java.util.*;
 import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Collectors;
@@ -33,6 +31,7 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
     implements YtDataBoardService {
     implements YtDataBoardService {
   private final OrganizationMapper organizationMapper;
   private final OrganizationMapper organizationMapper;
   private final UserOrganizationMappingService userOrganizationMappingService;
   private final UserOrganizationMappingService userOrganizationMappingService;
+  private final YtDataComponentService ytDataComponentService;
 
 
   @Override
   @Override
   public YtPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap, boolean tenantAdmin) {
   public YtPageData<DataBoardDTO> dataBoardPage(Map<String, Object> queryMap, boolean tenantAdmin) {
@@ -89,6 +88,9 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
         e.printStackTrace();
         e.printStackTrace();
       }
       }
     } else {
     } else {
+      if (null != dataBoardDTO.getLayout() && !dataBoardDTO.getLayout().isEmpty()) {
+        dataBoard.setLayout(JacksonUtil.convertValue(dataBoardDTO.getLayout(), JsonNode.class));
+      }
       DataBoard board =
       DataBoard board =
           baseMapper.selectOne(
           baseMapper.selectOne(
               new LambdaQueryWrapper<DataBoard>()
               new LambdaQueryWrapper<DataBoard>()
@@ -107,6 +109,12 @@ public class YtDataBoardServiceImpl extends AbstractBaseService<DataBoardMapper,
   @Override
   @Override
   @Transactional
   @Transactional
   public boolean deleteDataBoard(DeleteDTO deleteDTO) {
   public boolean deleteDataBoard(DeleteDTO deleteDTO) {
+    List<DataComponentDTO> dataComponentDTOList =
+        ytDataComponentService.findDataComponentsByDataBoardIds(
+            deleteDTO.getTenantId(), deleteDTO.getIds());
+    if (null != dataComponentDTOList && !dataComponentDTOList.isEmpty()) {
+      throw new YtDataValidationException(ErrorMessage.EXIST_LEADER_MEMBER_RELATION.getMessage());
+    }
     return baseMapper.delete(
     return baseMapper.delete(
             new LambdaQueryWrapper<DataBoard>()
             new LambdaQueryWrapper<DataBoard>()
                 .eq(DataBoard::getTenantId, deleteDTO.getTenantId())
                 .eq(DataBoard::getTenantId, deleteDTO.getTenantId())

@@ -19,6 +19,7 @@ import org.thingsboard.server.dao.yunteng.service.YtDataComponentService;
 import java.util.ArrayList;
 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.stream.Collectors;
 import java.util.stream.Collectors;
 
 
 @Service
 @Service
@@ -36,18 +37,7 @@ public class YtDataComponentServiceImpl
       return null;
       return null;
     }
     }
     return dataComponentList.stream()
     return dataComponentList.stream()
-        .map(
-            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;
-            })
+        .map(this::getDataSourceByJsonNode)
         .collect(Collectors.toList());
         .collect(Collectors.toList());
   }
   }
 
 
@@ -81,8 +71,33 @@ public class YtDataComponentServiceImpl
   @Transactional
   @Transactional
   public int deleteDataComponent(DeleteDTO deleteDTO) {
   public int deleteDataComponent(DeleteDTO deleteDTO) {
     return baseMapper.delete(
     return baseMapper.delete(
+        new LambdaQueryWrapper<DataComponent>()
+            .eq(DataComponent::getTenantId, deleteDTO.getTenantId())
+            .in(DataComponent::getId, deleteDTO.getIds()));
+  }
+
+  @Override
+  public List<DataComponentDTO> findDataComponentsByDataBoardIds(
+      String tenantId, Set<String> dataBoardIds) {
+    List<DataComponent> dataComponents =
+        baseMapper.selectList(
             new LambdaQueryWrapper<DataComponent>()
             new LambdaQueryWrapper<DataComponent>()
-                .eq(DataComponent::getTenantId, deleteDTO.getTenantId())
-                .in(DataComponent::getId, deleteDTO.getIds()));
+                .eq(DataComponent::getTenantId, tenantId)
+                .in(DataComponent::getDataBoardId, dataBoardIds));
+    return Optional.ofNullable(dataComponents)
+        .map(obj -> obj.stream().map(this::getDataSourceByJsonNode).collect(Collectors.toList()))
+        .orElse(null);
+  }
+
+  private DataComponentDTO getDataSourceByJsonNode(DataComponent 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;
   }
   }
 }
 }

@@ -4,6 +4,7 @@ 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 java.util.List;
 import java.util.List;
+import java.util.Set;
 
 
 public interface YtDataComponentService {
 public interface YtDataComponentService {
   /**
   /**
@@ -27,4 +28,12 @@ public interface YtDataComponentService {
    * @param deleteDTO 删除IDS
    * @param deleteDTO 删除IDS
    */
    */
   int deleteDataComponent(DeleteDTO deleteDTO);
   int deleteDataComponent(DeleteDTO deleteDTO);
+
+  /**
+   * 查询数据看板下面是否还有组件
+   * @param tenantId 租户ID
+   * @param dataBoardIds 数据看板IDS
+   * @return 组件信息
+   */
+  List<DataComponentDTO> findDataComponentsByDataBoardIds(String tenantId, Set<String> dataBoardIds);
 }
 }