fix(DEFECT-932): 自动创建网关子设备时，使用默认设备配置。

@@ -98,6 +98,7 @@ import org.thingsboard.server.queue.common.TbProtoQueueMsg;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.queue.util.TbCoreComponent;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.apiusage.TbApiUsageStateService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
 import org.thingsboard.server.service.executors.DbCallbackExecutorService;
+import org.thingsboard.server.service.install.DefaultSystemDataLoaderService;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.profile.TbDeviceProfileCache;
 import org.thingsboard.server.service.resource.TbResourceService;
 import org.thingsboard.server.service.resource.TbResourceService;
 
 
@@ -303,7 +304,7 @@ public class DefaultTransportApiService implements TransportApiService {
                     device.setName(requestMsg.getDeviceName());
                     device.setName(requestMsg.getDeviceName());
                     device.setType(requestMsg.getDeviceType());
                     device.setType(requestMsg.getDeviceType());
                     device.setCustomerId(gateway.getCustomerId());
                     device.setCustomerId(gateway.getCustomerId());
-                    DeviceProfile deviceProfile = deviceProfileCache.findOrCreateDeviceProfile(gateway.getTenantId(), requestMsg.getDeviceType());
+                    DeviceProfile deviceProfile = deviceProfileCache.findOrCreateDeviceProfile(gateway.getTenantId(), DefaultSystemDataLoaderService.DEFAULT_DEVICE_TYPE);
                     device.setDeviceProfileId(deviceProfile.getId());
                     device.setDeviceProfileId(deviceProfile.getId());
                     ObjectNode additionalInfo = JacksonUtil.newObjectNode();
                     ObjectNode additionalInfo = JacksonUtil.newObjectNode();
                     additionalInfo.put(DataConstants.LAST_CONNECTED_GATEWAY, gatewayId.toString());
                     additionalInfo.put(DataConstants.LAST_CONNECTED_GATEWAY, gatewayId.toString());
@@ -312,7 +313,7 @@ public class DefaultTransportApiService implements TransportApiService {
 
 
 
 
                     //Thingskit function
                     //Thingskit function
-                    ytDeviceService.saveSlaveDevice(savedDevice.getId().getId().toString(), savedDevice.getName(), gateway.getId().getId().toString(),gateway.getCreatedTime());
+                    ytDeviceService.saveSlaveDevice(savedDevice.getId().getId().toString(), savedDevice.getName(),deviceProfile.getId().getId().toString(), gateway.getId().getId().toString(),gateway.getCreatedTime());
 
 
 
 
                     tbClusterService.onDeviceUpdated(savedDevice, null);
                     tbClusterService.onDeviceUpdated(savedDevice, null);

@@ -44,6 +44,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     implements TkDeviceService {
     implements TkDeviceService {
 
 
   private final DeviceProfileDao deviceProfileDao;
   private final DeviceProfileDao deviceProfileDao;
+  private final TkDeviceProfileMapper tkProfileMapper;
 
 
   private final OrganizationMapper tkOrganizationMapper;
   private final OrganizationMapper tkOrganizationMapper;
   private final SceneLinkageMapper sceneLinkageMapper;
   private final SceneLinkageMapper sceneLinkageMapper;
@@ -491,7 +492,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
 
   @Override
   @Override
   public boolean saveSlaveDevice(
   public boolean saveSlaveDevice(
-      String slaveId, String slaveName, String gatewayId, Long createTime) {
+      String slaveId, String slaveName, String tbProfileId, String gatewayId, Long createTime) {
     LambdaQueryWrapper<TkDeviceEntity> deviceFilter =
     LambdaQueryWrapper<TkDeviceEntity> deviceFilter =
         new QueryWrapper<TkDeviceEntity>().lambda().eq(TkDeviceEntity::getTbDeviceId, gatewayId);
         new QueryWrapper<TkDeviceEntity>().lambda().eq(TkDeviceEntity::getTbDeviceId, gatewayId);
     TkDeviceEntity gateway = baseMapper.selectOne(deviceFilter);
     TkDeviceEntity gateway = baseMapper.selectOne(deviceFilter);
@@ -505,7 +506,9 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
         JacksonUtil.toJsonNode(
         JacksonUtil.toJsonNode(
             "{\"avatar\": \"\",\"longitude\": \"\",\"latitude\": \"\",\"address\": \"\"}"));
             "{\"avatar\": \"\",\"longitude\": \"\",\"latitude\": \"\",\"address\": \"\"}"));
 
 
-    slaveDevice.setProfileId(gateway.getProfileId());
+    DeviceProfileDTO profileDTO = tkProfileMapper.selectDetail(gateway.getTenantId(),tbProfileId);
+    slaveDevice.setProfileId(profileDTO.getTbProfileId());
+    slaveDevice.setDeviceProfileId(profileDTO.getId());
     slaveDevice.setGatewayId(gateway.getId());
     slaveDevice.setGatewayId(gateway.getId());
     slaveDevice.setOrganizationId(gateway.getOrganizationId());
     slaveDevice.setOrganizationId(gateway.getOrganizationId());
     slaveDevice.setTenantId(gateway.getTenantId());
     slaveDevice.setTenantId(gateway.getTenantId());

@@ -156,7 +156,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @param gatewayId 网关设备TB平台的ID
    * @param gatewayId 网关设备TB平台的ID
    * @return
    * @return
    */
    */
-  boolean saveSlaveDevice(String slaveId, String slaveName, String gatewayId, Long createTime);
+  boolean saveSlaveDevice(String slaveId, String slaveName, String tbProfileId,String gatewayId, Long createTime);
 
 
   /**
   /**
    * 通过设备ids查询设备信息列表
    * 通过设备ids查询设备信息列表