简柏林 / thingskit · Commits

Commit 2f85f7037aeea8562979ee591bdb032642ef8402

Authored by Volodymyr Babak
1 parent 3da17789

Visit only for SYSTEM rule chains

Inline Side-by-side
Showing 2 changed files with 5 additions and 2 deletions
@@ -24,6 +24,7 @@ import org.thingsboard.server.actors.ruleChain.RuleChainActor; @@ -24,6 +24,7 @@ import org.thingsboard.server.actors.ruleChain.RuleChainActor;
24 import org.thingsboard.server.actors.shared.EntityActorsManager; 24 import org.thingsboard.server.actors.shared.EntityActorsManager;
25 import org.thingsboard.server.common.data.id.RuleChainId; 25 import org.thingsboard.server.common.data.id.RuleChainId;
26 import org.thingsboard.server.common.data.rule.RuleChain; 26 import org.thingsboard.server.common.data.rule.RuleChain;
  27 +import org.thingsboard.server.common.data.rule.RuleChainType;
27 import org.thingsboard.server.dao.rule.RuleChainService; 28 import org.thingsboard.server.dao.rule.RuleChainService;
28 29
29 /** 30 /**
@@ -50,7 +51,7 @@ public abstract class RuleChainManager extends EntityActorsManager<RuleChainId, @@ -50,7 +51,7 @@ public abstract class RuleChainManager extends EntityActorsManager<RuleChainId,
50 51
51 @Override 52 @Override
52 public void visit(RuleChain entity, ActorRef actorRef) { 53 public void visit(RuleChain entity, ActorRef actorRef) {
53 - if (entity != null && entity.isRoot()) { 54 + if (entity != null && entity.isRoot() && entity.getType().equals(RuleChainType.SYSTEM)) {
54 rootChain = entity; 55 rootChain = entity;
55 rootChainActor = actorRef; 56 rootChainActor = actorRef;
56 } 57 }
@@ -141,7 +141,9 @@ public class TenantActor extends RuleChainManagerActor { @@ -141,7 +141,9 @@ public class TenantActor extends RuleChainManagerActor {
141 if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) { 141 if (msg.getEntityId().getEntityType() == EntityType.RULE_CHAIN) {
142 RuleChain ruleChain = systemContext.getRuleChainService(). 142 RuleChain ruleChain = systemContext.getRuleChainService().
143 findRuleChainById(tenantId, new RuleChainId(msg.getEntityId().getId())); 143 findRuleChainById(tenantId, new RuleChainId(msg.getEntityId().getId()));
144 - ruleChainManager.visit(ruleChain, target); 144 + if (ruleChain.getType().equals(RuleChainType.SYSTEM)) {
  145 + ruleChainManager.visit(ruleChain, target);
  146 + }
145 } 147 }
146 target.tell(msg, ActorRef.noSender()); 148 target.tell(msg, ActorRef.noSender());
147 } else { 149 } else {