feat: add return column device_profile_id for master devices and slave devices

@@ -19,4 +19,7 @@ public class SelectItemDTO {
 
 
   @ApiModelProperty("设备类型")
   @ApiModelProperty("设备类型")
   private DeviceTypeEnum deviceType;
   private DeviceTypeEnum deviceType;
+
+  @ApiModelProperty("设备配置ID")
+  private String deviceProfileId;
 }
 }

@@ -45,7 +45,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
 
   private final DeviceProfileDao deviceProfileDao;
   private final DeviceProfileDao deviceProfileDao;
 
 
-  private final OrganizationMapper ytOrganizationMapper;
+  private final OrganizationMapper tkOrganizationMapper;
   private final SceneLinkageMapper sceneLinkageMapper;
   private final SceneLinkageMapper sceneLinkageMapper;
   private final TriggerMapper triggerMapper;
   private final TriggerMapper triggerMapper;
   private final DoConditionMapper conditionMapper;
   private final DoConditionMapper conditionMapper;
@@ -128,7 +128,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     DeviceProfile deviceProfile =
     DeviceProfile deviceProfile =
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
         deviceProfileDao.findById(id, UUID.fromString(deviceDTO.getProfileId()));
     TkOrganizationEntity organization =
     TkOrganizationEntity organization =
-        ytOrganizationMapper.selectById(deviceDTO.getOrganizationId());
+            tkOrganizationMapper.selectById(deviceDTO.getOrganizationId());
     if (null == deviceProfile || null == organization) {
     if (null == deviceProfile || null == organization) {
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
       throw new YtDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
     } else if (!organization.getTenantId().equals(deviceTenantId)) {
@@ -347,7 +347,7 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     }
     }
     // 查询该组织的所有子类
     // 查询该组织的所有子类
     List<OrganizationDTO> organizationDTOS =
     List<OrganizationDTO> organizationDTOS =
-        ytOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
+            tkOrganizationMapper.findOrganizationTreeList(tenantId, organizationIds);
     List<String> queryOrganizationIds = new ArrayList<>();
     List<String> queryOrganizationIds = new ArrayList<>();
     organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
     organizationDTOS.forEach(item -> queryOrganizationIds.add(item.getId()));
     return queryOrganizationIds;
     return queryOrganizationIds;

@@ -331,7 +331,7 @@
 
 
     <select id="masterDevices" resultMap="listInform">
     <select id="masterDevices" resultMap="listInform">
         SELECT
         SELECT
-        base.tb_device_id as id,base.name,base.device_type
+        base.tb_device_id as id,base.name,base.device_type,base.device_profile_id
         FROM  tk_device base
         FROM  tk_device base
         LEFT JOIN device tde ON tde.ID :: TEXT = base.tb_device_id
         LEFT JOIN device tde ON tde.ID :: TEXT = base.tb_device_id
         <where>
         <where>
@@ -356,7 +356,7 @@
 
 
     <select id="slaveDevices" resultMap="listInform">
     <select id="slaveDevices" resultMap="listInform">
         SELECT
         SELECT
-        ide.tb_device_id as id,ide.name,ide.device_type
+        ide.tb_device_id as id,ide.name,ide.device_type,ide.device_profile_id
         FROM  (select * from relation where relation_type_group = 'COMMON' AND relation_type = 'Created' AND from_type = 'DEVICE' AND to_type = 'DEVICE'
         FROM  (select * from relation where relation_type_group = 'COMMON' AND relation_type = 'Created' AND from_type = 'DEVICE' AND to_type = 'DEVICE'
             <if test="masterId !=null and masterId !=''">
             <if test="masterId !=null and masterId !=''">
                 AND from_id :: TEXT = #{masterId}
                 AND from_id :: TEXT = #{masterId}