Browse Source

Was modified addLocalWsSubscription(...)

pull/1070/head
viktorbasanets 8 years ago
parent
commit
0501e9d4b4
  1. 14
      application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java

14
application/src/main/java/org/thingsboard/server/service/telemetry/DefaultTelemetrySubscriptionService.java

@ -132,14 +132,8 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio
@Override @Override
public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) { public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) {
String familyName = ModelConstants.DEVICE_FAMILY_NAME; String familyName = entityId.getEntityType().equals(EntityType.ENTITY_VIEW)
? ModelConstants.ENTITY_VIEW_FAMILY_NAME : ModelConstants.DEVICE_FAMILY_NAME;
//To do
if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
familyName = ModelConstants.ENTITY_VIEW_FAMILY_NAME;
//EntityView entityView = entityViewService.findEntityViewById((EntityViewId) entityId)
}
Optional<ServerAddress> server = routingService.resolveById(entityId); Optional<ServerAddress> server = routingService.resolveById(entityId);
Subscription subscription; Subscription subscription;
if (server.isPresent()) { if (server.isPresent()) {
@ -151,10 +145,6 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio
log.trace("[{}] Registering local subscription [{}] for " + familyName + " [{}]", sessionId, sub.getSubscriptionId(), entityId); log.trace("[{}] Registering local subscription [{}] for " + familyName + " [{}]", sessionId, sub.getSubscriptionId(), entityId);
subscription = new Subscription(sub, true); subscription = new Subscription(sub, true);
} }
/*if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
registerSubscription(sessionId, entityId, subscription);
}*/
registerSubscription(sessionId, entityId, subscription); registerSubscription(sessionId, entityId, subscription);
} }

Loading…
Cancel
Save