fix:删除网关设备时,如果下挂的有网关子设备则进行异常提示

@@ -306,11 +306,13 @@ public class TkDeviceController extends BaseController {
   public void deleteDevices(@Validated({DeleteGroup.class}) @RequestBody DeleteDTO deleteDTO)
       throws ThingsboardException {
     String currentTenantId = getCurrentUser().getCurrentTenantId();
-    List<String> tdIds = tkdeviceService.findTbDeviceId(currentTenantId, deleteDTO.getIds());
-    for (String id : tdIds) {
-      deleteTbDevice(id);
+    List<String> tdIds = tkdeviceService.findTbDeviceIdAndCheckForDelete(currentTenantId, deleteDTO.getIds());
+    if(null !=tdIds){
+      for (String id : tdIds) {
+        deleteTbDevice(id);
+      }
+      tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
     }
-    tkdeviceService.deleteDevices(currentTenantId, deleteDTO.getIds());
   }
 
   private void deleteTbDevice(String id) throws ThingsboardException {

@@ -112,6 +112,7 @@ public enum ErrorMessage {
   MESSAGE_TEMPLATE_DELETED(400020,"消息模板不存在！"),
   NEED_MAIN_PARAMETER(400021, "缺少必要参数【%s】"),
   REGISTER_VALUE_IS_NONE(400022, "寄存器值不能为空"),
+  GATE_WAY_DEVICE_HAS_SENSOR(400023, "网关设备【%s】有下挂网关子设备"),
   NOT_ALLOED_ISOLATED_IN_MONOLITH(500003,"【monolith】模式下，不能选择【isolated】类型的租户配置"),
   MESSAGE_TEMPLATE_USING_CONFIG(500004,"消息配置正在被消息模板【%s】使用");
   private final int code;

@@ -9,7 +9,6 @@ import com.google.common.util.concurrent.ListenableFuture;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 import org.springframework.cache.annotation.Cacheable;
 import org.springframework.stereotype.Service;
@@ -94,7 +93,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public void validateFormData(String currentTenantId, DeviceDTO deviceDTO)  throws RuntimeException{
+  public void validateFormData(String currentTenantId, DeviceDTO deviceDTO)
+      throws RuntimeException {
     boolean insert = StringUtils.isBlank(deviceDTO.getId());
     String deviceTenantId;
     if (StringUtils.isBlank(deviceDTO.getName())) {
@@ -132,25 +132,30 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
     OrganizationDTO organization =
-            organizationService.findOrganizationById(deviceDTO.getOrganizationId(),deviceTenantId);
+        organizationService.findOrganizationById(deviceDTO.getOrganizationId(), deviceTenantId);
     if (null == deviceProfile || null == organization) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
       throw new TkDataValidationException(ErrorMessage.TENANT_MISMATCHING.getMessage());
     }
-    //如果是TCP的网关子设备,要验证其Code是否已在网关的其他子设备存在
-    if(Objects.equals(deviceDTO.getDeviceType(),DeviceTypeEnum.SENSOR) && Objects.equals(deviceProfile.getTransportType(),
-            DeviceTransportType.TCP)){
+    // 如果是TCP的网关子设备,要验证其Code是否已在网关的其他子设备存在
+    if (Objects.equals(deviceDTO.getDeviceType(), DeviceTypeEnum.SENSOR)
+        && Objects.equals(deviceProfile.getTransportType(), DeviceTransportType.TCP)) {
       String gateWayId = deviceDTO.getGatewayId();
-      List<TkDeviceEntity> entities = baseMapper.selectList(new LambdaQueryWrapper<TkDeviceEntity>()
-              .eq(TkDeviceEntity::getTenantId,currentTenantId)
-              .eq(TkDeviceEntity::getGatewayId,gateWayId)
-              .ne(!insert,TkDeviceEntity::getId,deviceDTO.getId()));
-      if(null != entities && !entities.isEmpty()){
-        for (TkDeviceEntity entity:entities) {
-          if(Objects.equals(deviceDTO.getCode(),entity.getCode())){
-            throw new TkDataValidationException(String.format(ErrorMessage.DEVICE_IDENTIFIER_REPEATED.getMessage(),
-                    deviceDTO.getCode(),StringUtils.isEmpty(entity.getAlias())?entity.getName():entity.getAlias()));
+      List<TkDeviceEntity> entities =
+          baseMapper.selectList(
+              new LambdaQueryWrapper<TkDeviceEntity>()
+                  .eq(TkDeviceEntity::getTenantId, currentTenantId)
+                  .eq(TkDeviceEntity::getGatewayId, gateWayId)
+                  .ne(!insert, TkDeviceEntity::getId, deviceDTO.getId()));
+      if (null != entities && !entities.isEmpty()) {
+        for (TkDeviceEntity entity : entities) {
+          if (Objects.equals(deviceDTO.getCode(), entity.getCode())) {
+            throw new TkDataValidationException(
+                String.format(
+                    ErrorMessage.DEVICE_IDENTIFIER_REPEATED.getMessage(),
+                    deviceDTO.getCode(),
+                    StringUtils.isEmpty(entity.getAlias()) ? entity.getName() : entity.getAlias()));
           }
         }
       }
@@ -248,21 +253,38 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public List<String> findTbDeviceId(String tenantId, Set<String> ids) {
+  public List<String> findTbDeviceIdAndCheckForDelete(String tenantId, Set<String> ids) {
     LambdaQueryWrapper<TkDeviceEntity> queryWrapper =
         new QueryWrapper<TkDeviceEntity>()
             .lambda()
             .eq(TkDeviceEntity::getTenantId, tenantId)
             .in(TkDeviceEntity::getId, ids);
 
-    List<String> tbDeviceIds =
-        baseMapper.selectList(queryWrapper).stream()
-            .map(TkDeviceEntity::getTbDeviceId)
-            .collect(Collectors.toList());
-    for (String tbDeviceId : tbDeviceIds) {
+    List<TkDeviceEntity> list = baseMapper.selectList(queryWrapper);
+    if (null == list || list.isEmpty()) {
+      return null;
+    }
+    for (TkDeviceEntity entity : list) {
+      String tbDeviceId = entity.getTbDeviceId();
       sceneNotUsed(tenantId, tbDeviceId, null);
+      // 检查是否有网关子设备在使用该设备
+      if (Objects.equals(entity.getDeviceType(), DeviceTypeEnum.GATEWAY)) {
+        int sensorSize =
+            baseMapper
+                .selectList(
+                    new LambdaQueryWrapper<TkDeviceEntity>()
+                        .eq(TkDeviceEntity::getTenantId, tenantId)
+                        .eq(TkDeviceEntity::getGatewayId, tbDeviceId))
+                .size();
+        if (sensorSize > FastIotConstants.MagicNumber.ZERO) {
+          throw new TkDataValidationException(
+              String.format(
+                  ErrorMessage.GATE_WAY_DEVICE_HAS_SENSOR.getMessage(),
+                  StringUtils.isEmpty(entity.getAlias()) ? entity.getName() : entity.getAlias()));
+        }
+      }
     }
-    return tbDeviceIds;
+    return list.stream().map(TkDeviceEntity::getTbDeviceId).collect(Collectors.toList());
   }
 
   @Override
@@ -378,7 +400,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     String convertConfigId =
         Optional.ofNullable(queryMap.get("convertConfigId")).map(Object::toString).orElse(null);
     if (!StringUtils.isEmpty(organizationId)) {
-      List<String> queryOrganizationIds = organizationService.organizationAllIds(tenantId, organizationId);
+      List<String> queryOrganizationIds =
+          organizationService.organizationAllIds(tenantId, organizationId);
       queryMap.put("organizationIds", queryOrganizationIds);
     }
     // 用于数据流转已选,待选过滤============开始
@@ -413,8 +436,6 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     return new TkPageData<>(records, deviceIPage.getTotal());
   }
 
-
-
   @Override
   public TkPageData<RelationDeviceDTO> pageRelation(Map<String, Object> queryMap) {
     IPage<TkDeviceEntity> page = getPage(queryMap, "last_online_time", false);
@@ -636,8 +657,8 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
             attribute.put("name", dto.getFunctionName());
             attribute.put("identifier", dto.getIdentifier());
             attribute.put("detail", functionJson);
-            attribute.put("accessMode",dto.getAccessMode());
-            attribute.put("extensionDesc",dto.getExtensionDesc());
+            attribute.put("accessMode", dto.getAccessMode());
+            attribute.put("extensionDesc", dto.getExtensionDesc());
             attributes.add(attribute);
           }
         }
@@ -662,7 +683,10 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     return baseMapper.findDeviceInfo(tenantId, tbDeviceId);
   }
-  @Cacheable(cacheNames = FastIotConstants.CacheConfigKey.SCENE_REACT, key = "{#tenantId, #organizationId, #projectId}")
+
+  @Cacheable(
+      cacheNames = FastIotConstants.CacheConfigKey.SCENE_REACT,
+      key = "{#tenantId, #organizationId, #projectId}")
   @Override
   public List<String> rpcDevices(String tenantId, String organizationId, String projectId) {
     List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);

@@ -38,7 +38,13 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    */
   boolean deviceNameUsed(String tenantId, String deviceName, String deviceId);
 
-  List<String> findTbDeviceId(String tenantId, Set<String> ids);
+  /**
+   * 设备删除前的检查
+   * @param tenantId 租户ID
+   * @param ids 删除的设备ID集合
+   * @return TB的设备ID集合
+   */
+  List<String> findTbDeviceIdAndCheckForDelete(String tenantId, Set<String> ids);
 
   /**
    * 通过设备类型和组织ID查询所有的设备