fix: 设备配置

1.设备配置保存bug修复

@@ -19,6 +19,7 @@ import org.thingsboard.server.common.data.device.profile.*;
 import org.thingsboard.server.common.data.edge.EdgeEventActionType;
 import org.thingsboard.server.common.data.exception.ThingsboardException;
 import org.thingsboard.server.common.data.id.DeviceProfileId;
+import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.id.TenantId;
 import org.thingsboard.server.common.data.plugin.ComponentLifecycleEvent;
 import org.thingsboard.server.common.data.yunteng.common.DeleteGroup;
@@ -68,7 +69,7 @@ public class YtDeviceProfileController extends BaseController {
 
     //TODO  3/3.处理业务平台的业务逻辑
 
-    DeviceProfileDTO newDeviceProfileDTO = ytDeviceProfileService.insertOrUpdate(getCurrentUser().getCurrentTenantId(), deviceProfileDTO);
+    DeviceProfileDTO newDeviceProfileDTO = ytDeviceProfileService.insertOrUpdate(savedDeviceProfile.getId().getId().toString(), deviceProfileDTO);
     return Optional.ofNullable(newDeviceProfileDTO)
         .map(
             dto -> {
@@ -191,21 +192,27 @@ public class YtDeviceProfileController extends BaseController {
     // 传输类型默认都是Default
     tbDeviceProfile.setTransportType(DeviceTransportType.DEFAULT);
     // 获取当前租户的默认规则链
-//    tbDeviceProfile.setDefaultRuleChainId(new RuleChainId(getCurrentUserDefaultRuleChains()));
+    if(StringUtils.isNotBlank(deviceProfileDTO.getDefaultRuleChainId())){
+      UUID chainId = UUID.fromString(deviceProfileDTO.getDefaultRuleChainId());
+      tbDeviceProfile.setDefaultRuleChainId(new RuleChainId(chainId));
+    }
+
     tbDeviceProfile.setDefaultQueueName(ServiceQueue.MAIN);
     tbDeviceProfile.setProvisionType(DeviceProfileProvisionType.DISABLED);
     tbDeviceProfile.setCreatedTime(LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+
     DeviceProfileData deviceProfileData = new DeviceProfileData();
     deviceProfileData.setConfiguration(new DefaultDeviceProfileConfiguration());
     deviceProfileData.setProvisionConfiguration(new DisabledDeviceProfileProvisionConfiguration(null));
     deviceProfileData.setTransportConfiguration(new DefaultDeviceProfileTransportConfiguration());
-    if (null != deviceProfileDTO.getAlarms()) {
-      List<DeviceProfileAlarm> list = new ArrayList<>();
-      DeviceProfileAlarm deviceProfileAlarm =  JacksonUtil.convertValue(deviceProfileDTO.getAlarms(),DeviceProfileAlarm.class);
-      list.add(deviceProfileAlarm);
-      deviceProfileData.setAlarms(list);
-    }
+    deviceProfileData.setAlarms(deviceProfileDTO.getProfileData().getAlarms());
+//    if (null != deviceProfileDTO.getAlarms()) {
+//      List<DeviceProfileAlarm> list = new ArrayList<>();
+//      DeviceProfileAlarm deviceProfileAlarm =  JacksonUtil.convertValue(deviceProfileDTO.getAlarms(),DeviceProfileAlarm.class);
+//      list.add(deviceProfileAlarm);
+//    }
     tbDeviceProfile.setProfileData(deviceProfileData);
+
     return tbDeviceProfile;
   }
 }

@@ -5,8 +5,11 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.thingsboard.server.common.data.DeviceTransportType;
+import org.thingsboard.server.common.data.device.profile.DeviceProfileData;
+import org.thingsboard.server.common.data.id.RuleChainId;
 import org.thingsboard.server.common.data.yunteng.common.AddGroup;
 
+import javax.validation.Valid;
 import javax.validation.constraints.NotEmpty;
 
 @EqualsAndHashCode(callSuper = true)
@@ -28,7 +31,10 @@ public class DeviceProfileDTO extends TenantDTO {
   @Deprecated
   private String tbProfileId;
 
-  private JsonNode alarms;
-  /** 告警配置 */
+  @Valid
+  private transient DeviceProfileData profileData;
+  @ApiModelProperty(value = "关联规则链，默认关联根规则链", required = false)
+  private String defaultRuleChainId;
+  /** 告警通知配置 */
   private AlarmProfileDTO alarmProfile;
 }

@@ -48,15 +48,15 @@ public class YtDeviceProfileServiceImpl
 
   @Override
   @Transactional
-  public DeviceProfileDTO insertOrUpdate(String tenantId,DeviceProfileDTO deviceProfileDTO) {
+  public DeviceProfileDTO insertOrUpdate(String deviceProfileId,DeviceProfileDTO deviceProfileDTO) {
     if (StringUtils.isBlank(deviceProfileDTO.getId())) {
-      return insert(tenantId,deviceProfileDTO);
+      return insert(deviceProfileId,deviceProfileDTO);
     } else {
-      return update(tenantId,deviceProfileDTO);
+      return update(deviceProfileDTO);
     }
   }
 
-  private DeviceProfileDTO update(String tenantId,DeviceProfileDTO deviceProfileDTO) {
+  private DeviceProfileDTO update(DeviceProfileDTO deviceProfileDTO) {
 
     // 如果原来不是TCP或者更新也不是TCP 那就需要check
 //    if (!deviceProfile.getTransportType().equals(TransportTypeEnum.TCP)

@@ -10,7 +10,7 @@ import java.util.Optional;
 import java.util.Set;
 
 public interface YtDeviceProfileService {
-  DeviceProfileDTO insertOrUpdate(String tenantId,DeviceProfileDTO deviceProfileDTO);
+  DeviceProfileDTO insertOrUpdate(String deviceProfileId,DeviceProfileDTO deviceProfileDTO);
 
   void deleteDeviceProfiles(String tenantId,Set<String> ids);