Browse Source
Merge pull request #9416 from engix-ltd/entity-service-in-actor-context
Add entity service to actor context.
pull/9832/head
Andrew Shvayka
3 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with
15 additions and
0 deletions
-
application/src/main/java/org/thingsboard/server/actors/ActorSystemContext.java
-
application/src/main/java/org/thingsboard/server/actors/ruleChain/DefaultTbContext.java
-
rule-engine/rule-engine-api/src/main/java/org/thingsboard/rule/engine/api/TbContext.java
|
|
|
@ -68,6 +68,7 @@ import org.thingsboard.server.dao.device.DeviceProfileService; |
|
|
|
import org.thingsboard.server.dao.device.DeviceService; |
|
|
|
import org.thingsboard.server.dao.edge.EdgeEventService; |
|
|
|
import org.thingsboard.server.dao.edge.EdgeService; |
|
|
|
import org.thingsboard.server.dao.entity.EntityService; |
|
|
|
import org.thingsboard.server.dao.entityview.EntityViewService; |
|
|
|
import org.thingsboard.server.dao.event.EventService; |
|
|
|
import org.thingsboard.server.dao.nosql.CassandraBufferedRateReadExecutor; |
|
|
|
@ -455,6 +456,11 @@ public class ActorSystemContext { |
|
|
|
@Getter |
|
|
|
private WidgetTypeService widgetTypeService; |
|
|
|
|
|
|
|
@Lazy |
|
|
|
@Autowired(required = false) |
|
|
|
@Getter |
|
|
|
private EntityService entityService; |
|
|
|
|
|
|
|
@Value("${actors.session.max_concurrent_sessions_per_device:1}") |
|
|
|
@Getter |
|
|
|
private long maxConcurrentSessionsPerDevice; |
|
|
|
|
|
|
|
@ -84,6 +84,7 @@ import org.thingsboard.server.dao.device.DeviceProfileService; |
|
|
|
import org.thingsboard.server.dao.device.DeviceService; |
|
|
|
import org.thingsboard.server.dao.edge.EdgeEventService; |
|
|
|
import org.thingsboard.server.dao.edge.EdgeService; |
|
|
|
import org.thingsboard.server.dao.entity.EntityService; |
|
|
|
import org.thingsboard.server.dao.entityview.EntityViewService; |
|
|
|
import org.thingsboard.server.dao.nosql.CassandraStatementTask; |
|
|
|
import org.thingsboard.server.dao.nosql.TbResultSetFuture; |
|
|
|
@ -896,6 +897,11 @@ class DefaultTbContext implements TbContext { |
|
|
|
return mainCtx.getApiUsageStateService(); |
|
|
|
} |
|
|
|
|
|
|
|
@Override |
|
|
|
public EntityService getEntityService() { |
|
|
|
return mainCtx.getEntityService(); |
|
|
|
} |
|
|
|
|
|
|
|
private TbMsgMetaData getActionMetaData(RuleNodeId ruleNodeId) { |
|
|
|
TbMsgMetaData metaData = new TbMsgMetaData(); |
|
|
|
metaData.putValue("ruleNodeId", ruleNodeId.toString()); |
|
|
|
|
|
|
|
@ -57,6 +57,7 @@ import org.thingsboard.server.dao.device.DeviceProfileService; |
|
|
|
import org.thingsboard.server.dao.device.DeviceService; |
|
|
|
import org.thingsboard.server.dao.edge.EdgeEventService; |
|
|
|
import org.thingsboard.server.dao.edge.EdgeService; |
|
|
|
import org.thingsboard.server.dao.entity.EntityService; |
|
|
|
import org.thingsboard.server.dao.entityview.EntityViewService; |
|
|
|
import org.thingsboard.server.dao.nosql.CassandraStatementTask; |
|
|
|
import org.thingsboard.server.dao.nosql.TbResultSetFuture; |
|
|
|
@ -393,4 +394,6 @@ public interface TbContext { |
|
|
|
WidgetTypeService getWidgetTypeService(); |
|
|
|
|
|
|
|
RuleEngineApiUsageStateService getRuleEngineApiUsageStateService(); |
|
|
|
|
|
|
|
EntityService getEntityService(); |
|
|
|
} |
|
|
|
|
