fix(DEFECT-1444): 场景联动产品级，触发器和执行条件组织过滤无法问题修复

芯火源
1 parent 203e3b58
Showing 3 changed files with 44 additions and 22 deletions
application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TbSceneReactNode.java
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TbSceneReactNodeConfig.java
--- a/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
View file @30880e5
+++ b/application/src/main/java/org/thingsboard/server/controller/yunteng/TkConvertDataToController.java
View file @30880e5
 package org.thingsboard.server.controller.yunteng;
+import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
+
 import com.fasterxml.jackson.databind.JsonNode;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import java.util.*;
+import java.util.concurrent.ConcurrentMap;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -25,10 +29,10 @@ import org.thingsboard.server.common.data.yunteng.common.UpdateGroup;
 import org.thingsboard.server.common.data.yunteng.constant.FastIotConstants;
 import org.thingsboard.server.common.data.yunteng.core.exception.TkDataValidationException;
 import org.thingsboard.server.common.data.yunteng.core.message.ErrorMessage;
+import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertConfigReqDTO;
 import org.thingsboard.server.common.data.yunteng.dto.convert.ConvertReqDTO;
-import org.thingsboard.server.common.data.yunteng.dto.DeleteDTO;
 import org.thingsboard.server.common.data.yunteng.enums.OrderTypeEnum;
 import org.thingsboard.server.common.data.yunteng.utils.tools.TkPageData;
 import org.thingsboard.server.controller.BaseController;
@@ -38,11 +42,6 @@ import org.thingsboard.server.dao.yunteng.service.TkRuleChainService;
 import org.thingsboard.server.service.rule.TbRuleChainService;
 import org.thingsboard.server.service.security.permission.Operation;
-import java.util.*;
-import java.util.concurrent.ConcurrentMap;
-
-import static org.thingsboard.server.common.data.yunteng.constant.QueryConstant.*;
-
 @RestController
 @RequiredArgsConstructor
 @RequestMapping("api/yt/convert")
@@ -52,10 +51,13 @@ public class TkConvertDataToController extends BaseController {
   private final TkRuleChainService tkRuleChainService;
   private final ConvertConfigService convertConfigService;
   private final SceneLinkageService sceneLinkageService;
+
   @Value("${actors.rule.chain.debug_mode_rate_limits_per_tenant.enabled}")
   private boolean debugPerTenantEnabled;
+
   @Autowired(required = false)
   private ActorSystemContext actorContext;
+
   @Autowired private TbRuleChainService tbRuleChainService;
   @GetMapping(params = {PAGE_SIZE, PAGE})
@@ -79,7 +81,7 @@ public class TkConvertDataToController extends BaseController {
     queryMap.put("nodeType", nodeType);
     queryMap.put("name", name);
     queryMap.put("status", status);
-    checkTimeAndPut(queryMap,startTime,endTime);
+    checkTimeAndPut(queryMap, startTime, endTime);
     if (orderType != null) {
       queryMap.put(ORDER_TYPE, orderType.name());
     }
@@ -90,7 +92,7 @@ public class TkConvertDataToController extends BaseController {
   @ApiOperation("获取详情")
   public ResponseEntity<ConvertConfigDTO> findConvertConfigDTOById(@PathVariable("id") String id)
       throws ThingsboardException {
-    if(StringUtils.isEmpty(id)){
+    if (StringUtils.isEmpty(id)) {
       throw new TkDataValidationException(ErrorMessage.INVALID_PARAMETER.getMessage());
     }
     return ResponseEntity.ok(
@@ -230,6 +232,7 @@ public class TkConvertDataToController extends BaseController {
     Map<String, Map<String, String>> origConfig = new HashMap<>();
     Map<String, String> fields = new HashMap<>();
     fields.put("deviceProfileId", "deviceProfileId");
+    fields.put("tenantId", "tenantId");
     origConfig.put("fieldsMapping", fields);
     origNode.setConfiguration(JacksonUtil.valueToTree(origConfig));
     ruleNodes.add(origNode);
@@ -261,9 +264,12 @@ public class TkConvertDataToController extends BaseController {
         ruleChainService.loadRuleChainMetaData(getTenantId(), ruleChain.getId());
     // 3. SETUP CONNECTION AND ADD OR DELETE RULE NODE
     if (status == FastIotConstants.MagicNumber.ZERO) {
-      needSaveRuleNode = convertConfigService.deleteRuleNode(nodes, ruleChainMetaData, nodeType,getCurrentUser().getCurrentTenantId());
+      needSaveRuleNode =
+          convertConfigService.deleteRuleNode(
+              nodes, ruleChainMetaData, nodeType, getCurrentUser().getCurrentTenantId());
     } else {
-      convertConfigService.addRuleNode(nodes, ruleChainMetaData, nodeType,getCurrentUser().getCurrentTenantId());
+      convertConfigService.addRuleNode(
+          nodes, ruleChainMetaData, nodeType, getCurrentUser().getCurrentTenantId());
       needSaveRuleNode = true;
     }
     // 4. SAVE METADATA
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TbSceneReactNode.java
View file @30880e5
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TbSceneReactNode.java
View file @30880e5
@@ -16,6 +16,7 @@ package org.thingsboard.rule.engine.yunteng.scene;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 import lombok.extern.slf4j.Slf4j;
 import org.thingsboard.rule.engine.api.*;
@@ -58,6 +59,7 @@ public class TbSceneReactNode implements TbNode {
   public void onMsg(TbContext ctx, TbMsg msg) {
     String deviceId = msg.getOriginator().getId().toString();
     String tbProfileId = msg.getMetaData().getValue("deviceProfileId");
+    String tenantId = msg.getMetaData().getValue("tenantId");
     String projectId = config.getProfile().get(tbProfileId);
     boolean deviceHas = config.getScenes().containsKey(deviceId);
     boolean profileHas = config.getProject().containsKey(projectId);
@@ -73,7 +75,7 @@ public class TbSceneReactNode implements TbNode {
                 ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
                 if (react != null) {
                   try {
-                    react.process(ctx, msg,t.getRuleId(), deviceId);
+                    react.process(ctx, msg, t.getRuleId(), deviceId);
                   } catch (Exception e) {
                     ctx.tellFailure(msg, e);
                   }
@@ -85,14 +87,24 @@ public class TbSceneReactNode implements TbNode {
       projectScence.stream()
           .forEach(
               t -> {
-                ReactState react = getOrCreateReactState(ctx, config, t.getScenId());
-                if (react != null) {
-                  try {
-                    react.process(ctx, msg,t.getRuleId(), deviceId);
-                  } catch (Exception e) {
-                    ctx.tellFailure(msg, e);
-                  }
-                }
+                String scenId = t.getScenId();
+                List<String> orgDevices =
+                    ctx.getTkDeviceService()
+                        .rpcDevices(tenantId, config.getOrgs().get(scenId), projectId);
+                Optional.ofNullable(orgDevices)
+                    .ifPresent(
+                        f -> {
+                          if (f.contains(deviceId)) {
+                            ReactState react = getOrCreateReactState(ctx, config, scenId);
+                            if (react != null) {
+                              try {
+                                react.process(ctx, msg, t.getRuleId(), deviceId);
+                              } catch (Exception e) {
+                                ctx.tellFailure(msg, e);
+                              }
+                            }
+                          }
+                        });
               });
     }
   }
--- a/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TbSceneReactNodeConfig.java
View file @30880e5
+++ b/rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/yunteng/scene/TbSceneReactNodeConfig.java
View file @30880e5
@@ -13,13 +13,17 @@ public class TbSceneReactNodeConfig implements NodeConfiguration<TbSceneReactNod
   /** 【TB设备配置ID,TK产品ID】产品信息 */
   private Map<String, String> profile;
-  /** 【TK产品ID,场景】哪些产品会触发场景联动 */
+
+  /** 【TK产品ID,场景】哪些产品会触发场景联动，包含产品的每一个触发器 */
   private Map<String, List<RuleFilterDTO>> project;
-  /** 【TB设备ID,场景】哪些设备会触发场景联动 */
+
+  /** 【TB设备ID,场景】哪些设备会触发场景联动，包含设备的每一个触发器 */
   private Map<String, List<RuleFilterDTO>> scenes;
+
   /** 【TK场景ID,场景名称】场景联动信息 */
   private Map<String, String> names;
-  /** 【TK场景ID,组织ID】场景联动所属组织信息 */
+
+  /** 【TK场景ID,场景联动的根组织ID】场景联动所属组织信息 */
   private Map<String, String> orgs;
   @Override