Merge branch '2023-12-28' into 'master_dev'

fix:任务中心产品类任务未含组织过滤

See merge request yunteng/thingskit!304

@@ -115,7 +115,7 @@ public class RpcCommandTask {
                   }
                 } else {
                   sendRpcCommandByProducts(
-                      targetContent, cmdJsonNode, tenantId, securityUser, taskCenterId);
+                      targetContent, cmdJsonNode, tenantId, securityUser, taskCenterId,targetContent.getOrganizationId());
                 }
               }
             }
@@ -132,10 +132,11 @@ public class RpcCommandTask {
       JsonNode cmdJsonNode,
       String tenantId,
       SecurityUser securityUser,
-      String taskCenterId) {
+      String taskCenterId,
+      String organizationId) {
     for (String deviceProfileId : targetContent.getData()) {
       Futures.addCallback(
-          tkDeviceService.findDeviceListByDeviceProfileId(deviceProfileId, tenantId),
+          tkDeviceService.findDeviceListByDeviceProfileId(deviceProfileId, tenantId,organizationId),
           new FutureCallback<>() {
             @Override
             public void onSuccess(@Nullable List<DeviceDTO> deviceDTOS) {

@@ -777,16 +777,19 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
 
   @Override
   public ListenableFuture<List<DeviceDTO>> findDeviceListByDeviceProfileId(
-      String deviceProfileId, String tenantId) {
+      String deviceProfileId, String tenantId,String organizationId) {
     if (StringUtils.isEmpty(deviceProfileId) || StringUtils.isEmpty(tenantId)) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
+
+    List<String> orgIds = organizationService.organizationAllIds(tenantId, organizationId);
     List<DeviceDTO> devices = new ArrayList<>();
     List<TkDeviceEntity> entityList =
         baseMapper.selectList(
             new LambdaQueryWrapper<TkDeviceEntity>()
                 .eq(TkDeviceEntity::getTenantId, tenantId)
-                .eq(TkDeviceEntity::getDeviceProfileId, deviceProfileId));
+                .eq(TkDeviceEntity::getDeviceProfileId, deviceProfileId)
+                    .in(!orgIds.isEmpty(),TkDeviceEntity::getOrganizationId, orgIds));
     return Optional.ofNullable(entityList)
         .map(
             list ->
@@ -798,15 +801,20 @@ public class TkDeviceServiceImpl extends AbstractBaseService<DeviceMapper, TkDev
   }
 
   @Override
-  public List<String> findTbDeviceIdsByDeviceProfileId(String deviceProfileId, String tenantId) {
+  public List<String>findTbDeviceIdsByDeviceProfileId(String deviceProfileId, String tenantId,String organizationId) {
     if (StringUtils.isEmpty(deviceProfileId) || StringUtils.isEmpty(tenantId)) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
+    List<String> orgIds = null;
+    if(!StringUtils.isEmpty(organizationId)){
+      orgIds = organizationService.organizationAllIds(tenantId, organizationId);
+    }
     return Optional.ofNullable(
             baseMapper.selectList(
                 new LambdaQueryWrapper<TkDeviceEntity>()
                     .eq(TkDeviceEntity::getTenantId, tenantId)
                     .eq(TkDeviceEntity::getDeviceProfileId, deviceProfileId)
+                     .in(!orgIds.isEmpty(),TkDeviceEntity::getOrganizationId, orgIds)
                     .select(TkDeviceEntity::getTbDeviceId)))
         .map(list -> list.stream().map(TkDeviceEntity::getTbDeviceId).collect(Collectors.toList()))
         .orElse(null);

@@ -127,7 +127,9 @@ public class TkTaskCenterServiceImpl
       baseMapper.updateById(entity);
       updateTaskCenterCache(entity);
     }
-    saveOrUpdateDeviceTaskCenter(entity, isUpdate);
+    String organizationId = tkTaskCenterDTO.getExecuteTarget() !=null?
+            tkTaskCenterDTO.getExecuteTarget().getOrganizationId():null;
+    saveOrUpdateDeviceTaskCenter(entity, isUpdate,organizationId);
     return tkTaskCenterDTO;
   }
 
@@ -345,7 +347,7 @@ public class TkTaskCenterServiceImpl
     }
   }
 
-  private void saveOrUpdateDeviceTaskCenter(TkTaskCenterEntity entity, boolean isUpdate) {
+  private void saveOrUpdateDeviceTaskCenter(TkTaskCenterEntity entity, boolean isUpdate,String organizationId) {
     String taskCenterId = entity.getId();
     String tenantId = entity.getTenantId();
     // 判断是按产品执行还是按设备执行
@@ -357,7 +359,7 @@ public class TkTaskCenterServiceImpl
       processDeviceTaskCenterMapping(isUpdate, tenantId, taskCenterId, data);
     } else {
       for (String key : data) {
-        List<String> tbDeviceIds = tkDeviceService.findTbDeviceIdsByDeviceProfileId(key, tenantId);
+        List<String> tbDeviceIds = tkDeviceService.findTbDeviceIdsByDeviceProfileId(key, tenantId,organizationId);
         processDeviceTaskCenterMapping(isUpdate, tenantId, taskCenterId, tbDeviceIds);
       }
     }

@@ -224,7 +224,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    */
   Map<String, List<String>> getDeviceIdsByDeviceProfileId(String tenantId, String tbDeviceProfileId);
 
-  ListenableFuture<List<DeviceDTO>> findDeviceListByDeviceProfileId(String deviceProfileId,String tenantId);
+  ListenableFuture<List<DeviceDTO>> findDeviceListByDeviceProfileId(String deviceProfileId,String tenantId,String organizationId);
 
   /**
    * 通过设备配置ID查询所有的tbDeviceId
@@ -232,7 +232,7 @@ public interface TkDeviceService extends BaseService<TkDeviceEntity> {
    * @param tenantId 租户ID
    * @return id集合
    */
-  List<String> findTbDeviceIdsByDeviceProfileId(String deviceProfileId,String tenantId);
+  List<String> findTbDeviceIdsByDeviceProfileId(String deviceProfileId,String tenantId,String organizationId);
 
   /**
    * 根据TB设备ID列表获取设备信息

@@ -187,7 +187,7 @@ class ReactState {
                                       if (ScopeEnum.ALL.equals(entityType)) {
                                           trifggerDevices =
                                                   tkDeviceService.findTbDeviceIdsByDeviceProfileId(
-                                                          tkProjectId, trigger.getTenantId());
+                                                          tkProjectId, trigger.getTenantId(),null);
                                       }
                                       AtomicReference<String> matchKey = new AtomicReference<>("");
                                       AtomicBoolean matched = new AtomicBoolean(false);
@@ -288,7 +288,7 @@ class ReactState {
                                       if (ScopeEnum.ALL.equals(entityType)) {
                                         conditionDevices =
                                                 tkDeviceService.findTbDeviceIdsByDeviceProfileId(
-                                                        tkProjectId, condition.getTenantId());
+                                                        tkProjectId, condition.getTenantId(),null);
                                       }
                                       AtomicBoolean oneConditionResult = new AtomicBoolean(true);
                                       conditionDevices.stream()