fix: 设备相关接口

1.修改租户相关资源时，租户不能为空
2.修复设备修改异常的问题。

@@ -5,8 +5,11 @@ import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
+import org.thingsboard.server.common.data.yunteng.common.AddGroup;
+import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.enums.TenantStatusEnum;
 import org.thingsboard.server.common.data.yunteng.enums.TenantStatusEnum;
 
 
+import javax.validation.constraints.NotEmpty;
 import java.time.LocalDateTime;
 import java.time.LocalDateTime;
 
 
 @EqualsAndHashCode(callSuper = false)
 @EqualsAndHashCode(callSuper = false)
@@ -18,6 +21,9 @@ public class TenantDTO extends BaseDTO {
   private String description;
   private String description;
   private String defaultConfig;
   private String defaultConfig;
   /** TB的租户ID */
   /** TB的租户ID */
+  @NotEmpty(
+          message = "设备配置ID不能为空或者空字符串",
+          groups = {UpdateGroup.class})
   private String tenantId;
   private String tenantId;
   /** 租户角色 */
   /** 租户角色 */
   private String[] roleIds;
   private String[] roleIds;

@@ -162,6 +162,7 @@ public class YtDeviceServiceImpl extends AbstractBaseService<DeviceMapper, YtDev
       deviceTenantId = currentTenantId;
       deviceTenantId = currentTenantId;
       deviceDTO.setTenantId(currentTenantId);
       deviceDTO.setTenantId(currentTenantId);
     }else{
     }else{
+      deviceTenantId = deviceDTO.getTenantId();
       YtDevice device = baseMapper.selectById(deviceDTO.getId());
       YtDevice device = baseMapper.selectById(deviceDTO.getId());
       if(device == null){
       if(device == null){
         throw new YtDataValidationException("设备不存在!");
         throw new YtDataValidationException("设备不存在!");