Merge branch 'cherry-pick-3c4903c6' into 'master_dev'

fix: 修复场景联动执行动作设备输出选择全部bug

See merge request yunteng/thingskit!324

@@ -748,14 +748,15 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
     return allDevices;
     return allDevices;
   }
   }
   @Cacheable(
   @Cacheable(
-          cacheNames = cacheName, key = "{#tenantId, #tbDeviceProfileId}")
+          cacheNames = cacheName, key = "{#tenantId, #deviceProfileId}")
   @Override
   @Override
-  public Map<String, List<String>> getDeviceIdsByDeviceProfileId(String tenantId, String tbDeviceProfileId) {
+  public Map<String, List<String>> getDeviceIdsByDeviceProfileId(String tenantId, String deviceProfileId) {
     Map<String, List<String>> result;
     Map<String, List<String>> result;
     List<TkDeviceEntity> organizationDevices =
     List<TkDeviceEntity> organizationDevices =
             baseMapper.selectList(
             baseMapper.selectList(
                     new LambdaQueryWrapper<TkDeviceEntity>().eq(TkDeviceEntity::getTenantId,tenantId)
                     new LambdaQueryWrapper<TkDeviceEntity>().eq(TkDeviceEntity::getTenantId,tenantId)
-                            .eq(TkDeviceEntity::getProfileId, tbDeviceProfileId));
+                            .eq(TkDeviceEntity::getProfileId, deviceProfileId)
+                            .or().eq(TkDeviceEntity::getDeviceProfileId,deviceProfileId));
     if(null !=organizationDevices && !organizationDevices.isEmpty()){
     if(null !=organizationDevices && !organizationDevices.isEmpty()){
       result = new HashMap<>();
       result = new HashMap<>();
       organizationDevices.stream().forEach(entity->{
       organizationDevices.stream().forEach(entity->{

@@ -219,10 +219,10 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
   /**
   /**
    * 根据tbDeviceProfileId查询所有的组织与设备关系
    * 根据tbDeviceProfileId查询所有的组织与设备关系
    * @param tenantId 租户ID
    * @param tenantId 租户ID
-   * @param tbDeviceProfileId 设备配置ID
+   * @param deviceProfileId 或 tk_device_profile id 设备配置ID
    * @return 组织ID作为key,设备ID列表作为value
    * @return 组织ID作为key,设备ID列表作为value
    */
    */
-  Map<String, List<String>> getDeviceIdsByDeviceProfileId(String tenantId, String tbDeviceProfileId);
+  Map<String, List<String>> getDeviceIdsByDeviceProfileId(String tenantId, String deviceProfileId);
 
 
   ListenableFuture<List<DeviceDTO>> findDeviceListByDeviceProfileId(String deviceProfileId,String tenantId,String organizationId);
   ListenableFuture<List<DeviceDTO>> findDeviceListByDeviceProfileId(String deviceProfileId,String tenantId,String organizationId);
 
 

@@ -434,8 +434,7 @@ class ReactState {
         if (ScopeEnum.ALL.equals(action.getEntityType())) {
         if (ScopeEnum.ALL.equals(action.getEntityType())) {
           rpcDevices =
           rpcDevices =
               tkDeviceService.getDevicesByOrganizationIdAndProjectId(action.getTenantId(), orgId,
               tkDeviceService.getDevicesByOrganizationIdAndProjectId(action.getTenantId(), orgId,
-                      tkDeviceService.getDeviceIdsByDeviceProfileId(action.getTenantId(),
-                              msg.getMetaData().getValue("deviceProfileId")));
+                      tkDeviceService.getDeviceIdsByDeviceProfileId(action.getTenantId(),action.getDeviceProfileId()));
         }
         }
         rpcMsg(ctx, msg, rpcDevices, action.getDoContext(), action.getCallType());
         rpcMsg(ctx, msg, rpcDevices, action.getDoContext(), action.getCallType());
         break;
         break;