fix(DEFECT-1299): 网关子设备标识符是否重复校验

必须确保网关对应的子设备的设备标识符的唯一性

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
 import io.swagger.annotations.ApiParam;
 import lombok.RequiredArgsConstructor;
 import lombok.RequiredArgsConstructor;
@@ -84,6 +85,11 @@ public class TkDeviceController extends BaseController {
             ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage());
             ErrorMessage.DEVICE_NOT_EXISTENCE_IN_TENANT.getMessage());
       }
       }
     }
     }
+    String identifier = StringUtils.isBlank(deviceDTO.getCode())?deviceDTO.getName():deviceDTO.getCode();
+    String markResult =tkdeviceService.markExisted(getCurrentUser().getCurrentTenantId(), gatewayId,deviceDTO.getId(),identifier);
+    if(StringUtils.isNotEmpty(markResult)){
+      throw new TkDataValidationException(markResult);
+    }
 
 
     /**
     /**
      * 子设备编辑业务逻辑： 设备地址码必须同时设置到附加信息字段内。 1、新增或编辑网关和直连设备 2、新增网关子设备 3、编辑网关子设备时，关联关系已存在(未切换网关)
      * 子设备编辑业务逻辑： 设备地址码必须同时设置到附加信息字段内。 1、新增或编辑网关和直连设备 2、新增网关子设备 3、编辑网关子设备时，关联关系已存在(未切换网关)
@@ -494,7 +500,19 @@ public class TkDeviceController extends BaseController {
     result.setMessage(str);
     result.setMessage(str);
     return result;
     return result;
   }
   }
-
+  @PreAuthorize("@check.checkPermissions({'TENANT_ADMIN','CUSTOMER_USER'},{})")
+  @GetMapping("exist")
+  @ApiOperation("设备标识符是否已经被使用")
+  public ResponseResult<Boolean> existed(
+          @ApiParam(value = "网关设备主键") @RequestParam(name="gateway",required = false) String gatewayId,
+          @ApiParam(value = "当前设备主键，编辑时使用") @RequestParam(name="devId",required = false) String devId,
+          @ApiParam(value = "设备标识符，例如：设备名称、地址码", required = true)@RequestParam("identifier") String identifier)
+          throws ThingsboardException {
+    String str = tkdeviceService.markExisted(getCurrentUser().getCurrentTenantId(),gatewayId,devId,identifier);
+    ResponseResult result = ResponseResult.success(StringUtils.isEmpty(str) ? true : false);
+    result.setMessage(str);
+    return result;
+  }
   @GetMapping({"/attributes/{deviceProfileId}"})
   @GetMapping({"/attributes/{deviceProfileId}"})
   @ApiOperation("获取设备的属性")
   @ApiOperation("获取设备的属性")
   public ResponseEntity<JsonNode> getDeviceAttributes(
   public ResponseEntity<JsonNode> getDeviceAttributes(

@@ -100,6 +100,8 @@ public enum ErrorMessage {
   TASK_CENTER_IS_DISABLED(400076,"【%s】任务是禁用状态，不能执行"),
   TASK_CENTER_IS_DISABLED(400076,"【%s】任务是禁用状态，不能执行"),
   NAME_OR_IDENTIFIER_IS_EMPTY(400077,"【%s】的名称或标识符不能为空或空字符串"),
   NAME_OR_IDENTIFIER_IS_EMPTY(400077,"【%s】的名称或标识符不能为空或空字符串"),
   IDENTIFIER_ALREADY_EXISTS(400078,"标识符【%s】已经存在"),
   IDENTIFIER_ALREADY_EXISTS(400078,"标识符【%s】已经存在"),
+  DEVICE_GATEWAY_NOT_EXTIED(400079,"网关设备【%s】不存在"),
+  DEVICE_IDENTIFIER_REPEATED(400079,"设备标识【%s】与设备【%s】重复"),
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   HAVE_NO_PERMISSION(500002,"没有修改权限");
   private final int code;
   private final int code;
   private String message;
   private String message;

@@ -758,4 +758,49 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     }
     return result;
     return result;
   }
   }
+
+  @Override
+  public String markExisted(String tenantId,String gatewayId,String deviceId,  String identifier) {
+    if(StringUtils.isNotBlank(deviceId)){//编辑设备时，未修改设备标识符
+      TkDeviceEntity self = baseMapper.selectOne(
+              new LambdaQueryWrapper<TkDeviceEntity>()
+                      .eq(TkDeviceEntity::getTenantId, tenantId)
+                      .eq(TkDeviceEntity::getId, deviceId));
+      if(self.getGatewayId().equals(gatewayId)
+              &&( self.getCode().equals(identifier) || self.getName().equals(identifier))){
+        return "";
+      }
+    }
+    TkDeviceEntity gateway =null;
+    if(StringUtils.isNotBlank(gatewayId)){
+      gateway = baseMapper.selectOne(
+              new LambdaQueryWrapper<TkDeviceEntity>()
+                      .eq(TkDeviceEntity::getTenantId, tenantId)
+                      .eq(TkDeviceEntity::getTbDeviceId, gatewayId));
+      if (gateway ==null ) {
+        return String.format(ErrorMessage.DEVICE_GATEWAY_NOT_EXTIED.getMessage(),gatewayId);
+      }
+    }
+    LambdaQueryWrapper<TkDeviceEntity> filter =new LambdaQueryWrapper<>();
+    filter.eq(TkDeviceEntity::getTenantId, tenantId);
+    DeviceProfileDTO profile=null;
+    if(gateway !=null){
+      filter.eq(TkDeviceEntity::getGatewayId, gatewayId);
+      profile =tkProfileMapper.selectDetail(tenantId,gateway.getProfileId());
+    }
+
+    if(profile !=null && TransportTypeEnum.TCP.name().equals(profile.getTransportType())){
+      filter.eq(TkDeviceEntity::getCode, identifier);
+    }else{
+      filter.eq(TkDeviceEntity::getName, identifier);
+    }
+    List<TkDeviceEntity> self = baseMapper.selectList(filter);
+    if(self ==null || self.isEmpty()){
+      return "";
+    }else{
+      String names = String.join(",",self.stream().map(f->f.getName()).collect(Collectors.toList()));
+     return String.format(ErrorMessage.DEVICE_IDENTIFIER_REPEATED.getMessage(),identifier
+             ,names);
+    }
+  }
 }
 }

@@ -108,7 +108,16 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @return 场景联动ID
    * @return 场景联动ID
    */
    */
   String otherUsing(String deviceId, String tenantId);
   String otherUsing(String deviceId, String tenantId);
-
+  /**
+   * 设备标识符是否已经被使用
+   *
+   * @param tenantId 租户ID
+   * @param gatewayId 网关设备主键
+   * @param deviceId 网关设备主键
+   * @param identifier 设备标识符，例如：设备名称、TCP子设备的地址码
+   * @return 场景联动ID
+   */
+  String markExisted(String tenantId,String gatewayId,String deviceId, String identifier);
   /**
   /**
    * 主设备信息
    * 主设备信息
    *
    *