refactor: 场景联动设备过滤条件添加产品

1、全部设备添加过滤字段产品
2、场景联动RPC逻辑调整。

@@ -5,12 +5,16 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.stereotype.Service;
 import org.thingsboard.server.common.data.yunteng.dto.DoActionDTO;
+import org.thingsboard.server.common.data.yunteng.enums.DeviceTypeEnum;
+import org.thingsboard.server.dao.yunteng.entities.TkDeviceEntity;
 import org.thingsboard.server.dao.yunteng.entities.TkDoActionEntity;
 import org.thingsboard.server.dao.yunteng.entities.TenantBaseEntity;
+import org.thingsboard.server.dao.yunteng.mapper.DeviceMapper;
 import org.thingsboard.server.dao.yunteng.mapper.DoActionMapper;
 import org.thingsboard.server.dao.yunteng.service.AbstractBaseService;
 import org.thingsboard.server.dao.yunteng.service.DoActionService;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -20,13 +24,36 @@ import java.util.stream.Collectors;
 @RequiredArgsConstructor
 public class TkDoActionServiceImpl extends AbstractBaseService<DoActionMapper, TkDoActionEntity>
     implements DoActionService {
+  private final DeviceMapper deviceMapper;
   @Override
-  public List<TkDoActionEntity> getActions(String sceneId) {
+  public List<TkDoActionEntity> getActionsByAll(String sceneId) {
     LambdaQueryWrapper filter =
         new QueryWrapper<TkDoActionEntity>().lambda().eq(TkDoActionEntity::getSceneLinkageId, sceneId);
     return baseMapper.selectList(filter);
   }
 
+
+  @Override
+  public List<TkDoActionEntity> getActionsByPart(String sceneId) {
+    LambdaQueryWrapper filter =
+            new QueryWrapper<TkDoActionEntity>().lambda().eq(TkDoActionEntity::getSceneLinkageId, sceneId);
+    List<TkDoActionEntity> source = baseMapper.selectList(filter);
+    return source.stream().map(t ->{
+      List<TkDeviceEntity> partDevices = deviceMapper.selectList(new LambdaQueryWrapper<TkDeviceEntity>().in(TkDeviceEntity::getId,t.getDeviceId()));
+      List<String> deviceId = new ArrayList<>();
+      for(TkDeviceEntity item : partDevices){
+        if(!DeviceTypeEnum.SENSOR.equals(item.getDeviceType())){
+          //网关子设备才需要重写deviceId字段
+          break;
+        }
+        deviceId.add(item.getGatewayId());
+      }
+      t.setDeviceId(deviceId);
+      return t;
+    }).collect(Collectors.toList());
+
+  }
+
   @Override
   public List<DoActionDTO> findDoActionByAlarmProfileIds(
       String tenantId, Set<String> alarmProfileIds) {

@@ -440,8 +440,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
       String currentSceneId, String tenantId, String customerId, Integer state) {
     List<TkSceneLinkageEntity> runningScenes =
         baseMapper.selectList(
-            new QueryWrapper<TkSceneLinkageEntity>()
-                .lambda()
+            new LambdaQueryWrapper<TkSceneLinkageEntity>()
                 .eq(TkSceneLinkageEntity::getTenantId, tenantId)
                 .eq(TkSceneLinkageEntity::getStatus, FastIotConstants.StateValue.ENABLE));
     Set<String> enableIds = new HashSet<>();
@@ -468,17 +467,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
 
     List<DeviceDTO> organizationDevices =
         findDeviceList(self.getOrganizationId(), tenantId, customerId,new ArrayList<>());
-    List<String> allDevices = new ArrayList<>();
-    List<String> rpcDevices = new ArrayList<>();
-    if(organizationDevices != null && !organizationDevices.isEmpty()){
-      for (DeviceDTO item : organizationDevices) {
-        allDevices.add(item.getTbDeviceId());
-        DeviceTypeEnum deviceType = item.getDeviceType();
-        if(!DeviceTypeEnum.SENSOR.equals(deviceType)){
-          rpcDevices.add(item.getTbDeviceId());
-        }
-      }
-    }
+
 
     Map<String, List<String>> matchedDevices = new HashMap<>();
 
@@ -495,6 +484,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
           String scenId = trigger.getSceneLinkageId();
           List<String> devices = trigger.getEntityId();
           if(currentSceneId.equals(scenId)){
+            List<String> allDevices = filterDevice(organizationDevices,trigger.getDeviceProfileId(),false);
             if (ScopeEnum.ALL.equals(trigger.getEntityType()) ) {
               devices = allDevices;
             }else{
@@ -516,7 +506,7 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     Executors.newScheduledThreadPool(1)
         .schedule(
             () -> {
-              freshEntityIds(currentSceneId, allDevices,rpcDevices, triggers);
+              freshEntityIds(currentSceneId, organizationDevices, triggers);
             },
             1,
             TimeUnit.SECONDS);
@@ -528,51 +518,65 @@ public class TkSceneLinkageServiceImpl extends AbstractBaseService<SceneLinkageM
     return JacksonUtil.convertValue(engineConfig, JsonNode.class);
   }
 
+  private List<String> filterDevice(List<DeviceDTO> organizationDevices,String profileId,boolean rpc){
+    List<String> allDevices = new ArrayList<>();
+    if(organizationDevices != null && !organizationDevices.isEmpty()){
+      for (DeviceDTO item : organizationDevices) {
+        if(!item.getDeviceProfileId().equals(profileId)){
+          continue;
+        }
+        DeviceTypeEnum deviceType = item.getDeviceType();
+        if(rpc && DeviceTypeEnum.SENSOR.equals(deviceType)){
+          allDevices.add(item.getGatewayId());
+          continue;
+        }
+        allDevices.add(item.getTbDeviceId());
+      }
+    }
+    return allDevices;
+  }
+
   /**
    * 异步刷新场景联动的设备ID
    *
    * @param sceneId
-   * @param allDevices
+   * @param organizationDevices
    * @param triggers
    */
-  public void freshEntityIds(String sceneId, List<String> allDevices,List<String> rpcDevices, List<TkTriggerEntity> triggers) {
+  public void freshEntityIds(String sceneId, List<DeviceDTO> organizationDevices,List<TkTriggerEntity> triggers) {
     triggers.forEach(
         trigger -> {
           if (ScopeEnum.ALL.equals(trigger.getEntityType())
               && sceneId.equals(trigger.getSceneLinkageId())) {
-            trigger.setEntityId(allDevices);
+            List<String> ids = filterDevice(organizationDevices,trigger.getDeviceProfileId(),false);
+            trigger.setEntityId(ids);
             triggerMapper.updateById(trigger);
           }
         });
 
     List<TkDoConditionEntity> conditions =
         doConditionMapper.selectList(
-            new QueryWrapper<TkDoConditionEntity>()
-                .lambda()
+            new LambdaQueryWrapper<TkDoConditionEntity>()
                 .eq(TkDoConditionEntity::getSceneLinkageId, sceneId)
                 .eq(TkDoConditionEntity::getEntityType, ScopeEnum.ALL));
     conditions.forEach(
         item -> {
           if (sceneId.equals(item.getSceneLinkageId())) {
-            item.setEntityId(allDevices);
+            List<String> ids = filterDevice(organizationDevices,item.getDeviceProfileId(),false);
+            item.setEntityId(ids);
             doConditionMapper.updateById(item);
           }
         });
 
     List<TkDoActionEntity> actions =
         doActionMapper.selectList(
-            new QueryWrapper<TkDoActionEntity>()
-                .lambda()
-                .eq(TkDoActionEntity::getSceneLinkageId, sceneId)
-                .eq(TkDoActionEntity::getEntityType, ScopeEnum.ALL));
+            new LambdaQueryWrapper<TkDoActionEntity>()
+                .eq(TkDoActionEntity::getSceneLinkageId, sceneId));
     actions.forEach(
         item -> {
           if (sceneId.equals(item.getSceneLinkageId())) {
-            if(ActionTypeEnum.DEVICE_OUT.equals(item.getOutTarget())){
-              item.setDeviceId(rpcDevices);
-            }else{
-              item.setDeviceId(allDevices);
-            }
+            List<String> ids = filterDevice(organizationDevices,item.getDeviceProfileId(),ActionTypeEnum.DEVICE_OUT.equals(item.getOutTarget())?true:false);
+            item.setDeviceId(ids);
 
             doActionMapper.updateById(item);
           }

@@ -13,7 +13,8 @@ import java.util.Set;
  */
 public interface DoActionService extends BaseService<TkDoActionEntity>{
 
-    List<TkDoActionEntity> getActions(String sceneId);
+    List<TkDoActionEntity> getActionsByAll(String sceneId);
+    List<TkDoActionEntity> getActionsByPart(String sceneId);
 
     List<DoActionDTO> findDoActionByAlarmProfileIds(String tenantId, Set<String> alarmProfileIds);
 }

@@ -97,7 +97,8 @@ class ReactState {
         DoConditionService conditionService = SpringBeanUtils.getBean(DoConditionService.class);
         this.conditions = conditionService.getConditions(reactId);
         DoActionService actionService = SpringBeanUtils.getBean(DoActionService.class);
-        this.actions = actionService.getActions(reactId);
+        this.actions = actionService.getActionsByAll(reactId);
+        this.actions.addAll(actionService.getActionsByPart(reactId));
         for (TkDoActionEntity action : actions) {
             /**动作中只有1个告警通知*/
             if (ActionTypeEnum.MSG_NOTIFY.equals(action.getOutTarget())) {