fix: 设备配置相关接口

1.设备配置列表下拉选项数据缺失
2、设备配置列表按租户过滤

@@ -2,13 +2,12 @@ package org.thingsboard.server.common.data.yunteng.utils;
 
 
 import lombok.extern.slf4j.Slf4j;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
+import org.thingsboard.server.common.data.DeviceProfile;
+import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.Field;
 import java.lang.reflect.Field;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.List;
+import java.util.*;
 
 
 @Slf4j
 @Slf4j
 public class ReflectUtils {
 public class ReflectUtils {
@@ -48,6 +47,15 @@ public class ReflectUtils {
     return targetList;
     return targetList;
   }
   }
 
 
+  public static DeviceProfileDTO getDeviceProfileDTO(DeviceProfile entity) {
+    DeviceProfileDTO result = new DeviceProfileDTO();
+    BeanUtils.copyProperties(entity, result);
+    result.setId(entity.getId().getId().toString());
+    result.setTenantId(entity.getTenantId().getId().toString());
+    result.setDefaultRuleChainId(Optional.ofNullable(entity.getDefaultRuleChainId()).map(uuid ->uuid.getId().toString()).orElse(null));
+    return result;
+  }
+
 
 
   /**
   /**
    * 获取类的所有属性，包含父类的【public private protected】
    * 获取类的所有属性，包含父类的【public private protected】

@@ -28,6 +28,7 @@ import org.thingsboard.server.dao.DaoUtil;
 import org.thingsboard.server.dao.sql.device.JpaDeviceProfileDao;
 import org.thingsboard.server.dao.sql.device.JpaDeviceProfileDao;
 import org.thingsboard.server.dao.yunteng.repository.YtDeviceProfileRepository;
 import org.thingsboard.server.dao.yunteng.repository.YtDeviceProfileRepository;
 
 
+import java.util.List;
 import java.util.Objects;
 import java.util.Objects;
 
 
 @Component
 @Component
@@ -55,5 +56,10 @@ public class YtJpaDeviceProfileDao extends JpaDeviceProfileDao {
         }
         }
     }
     }
 
 
+    public List<DeviceProfileDTO> findDeviceProfileByTenantId(TenantId tenantId) {
+            return ytDeviceProfileRepository.findDeviceProfileByTenantId(tenantId.getId());
+
+    }
+
 
 
 }
 }

@@ -158,8 +158,7 @@ public class YtDeviceProfileServiceImpl
         TenantId tenant = new TenantId(UUID.fromString(tenantId));
         TenantId tenant = new TenantId(UUID.fromString(tenantId));
         DeviceProfile profile = deviceProfileDao.findById(tenant, UUID.fromString(id));
         DeviceProfile profile = deviceProfileDao.findById(tenant, UUID.fromString(id));
         return Optional.ofNullable(profile).map(entity -> {
         return Optional.ofNullable(profile).map(entity -> {
-            DeviceProfileDTO result = new DeviceProfileDTO();
-            BeanUtils.copyProperties(entity, result);
+            DeviceProfileDTO result = ReflectUtils.getDeviceProfileDTO(entity);
             return result;
             return result;
         });
         });
     }
     }
@@ -180,7 +179,7 @@ public class YtDeviceProfileServiceImpl
     @Override
     @Override
     public List<DeviceProfileDTO> findDeviceProfile(String tenantId) {
     public List<DeviceProfileDTO> findDeviceProfile(String tenantId) {
         UUID profileId = UUID.fromString(tenantId);
         UUID profileId = UUID.fromString(tenantId);
-        List<DeviceProfile> profile = deviceProfileDao.find(new TenantId(profileId));
-        return ReflectUtils.sourceToTarget(profile, DeviceProfileDTO.class);
+        List<DeviceProfileDTO> results = deviceProfileDao.findDeviceProfileByTenantId(new TenantId(profileId));
+        return results;
     }
     }
 }
 }

@@ -24,6 +24,7 @@ import org.thingsboard.server.common.data.DeviceTransportType;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO;
 import org.thingsboard.server.dao.model.sql.DeviceProfileEntity;
 import org.thingsboard.server.dao.model.sql.DeviceProfileEntity;
 
 
+import java.util.List;
 import java.util.UUID;
 import java.util.UUID;
 
 
 public interface YtDeviceProfileRepository extends JpaRepository<DeviceProfileEntity, UUID> {
 public interface YtDeviceProfileRepository extends JpaRepository<DeviceProfileEntity, UUID> {
@@ -45,4 +46,8 @@ public interface YtDeviceProfileRepository extends JpaRepository<DeviceProfileEn
                                                   Pageable pageable);
                                                   Pageable pageable);
 
 
 
 
+    @Query("SELECT new org.thingsboard.server.common.data.yunteng.dto.DeviceProfileDTO(d.id, d.name, d.createdTime,d.description, d.transportType, d.defaultRuleChainId) " +
+            "FROM DeviceProfileEntity d WHERE d.tenantId = :tenantId ")
+    List<DeviceProfileDTO> findDeviceProfileByTenantId(@Param("tenantId") UUID tenantId);
+
 }
 }