简柏林 / thingskit · Commits

Commit 4e39ed53fe3b2ed6a21cebdb0f2da67007a09850

Authored by viktorbasanets
1 parent 1adb36cd

Minor changes

Inline Side-by-side
Showing 3 changed files with 27 additions and 2 deletions
@@ -27,9 +27,11 @@ import org.springframework.util.StringUtils; @@ -27,9 +27,11 @@ import org.springframework.util.StringUtils;
27 import org.thingsboard.rule.engine.api.util.DonAsynchron; 27 import org.thingsboard.rule.engine.api.util.DonAsynchron;
28 import org.thingsboard.server.common.data.DataConstants; 28 import org.thingsboard.server.common.data.DataConstants;
29 import org.thingsboard.server.common.data.EntityType; 29 import org.thingsboard.server.common.data.EntityType;
  30 +import org.thingsboard.server.common.data.EntityView;
30 import org.thingsboard.server.common.data.id.DeviceId; 31 import org.thingsboard.server.common.data.id.DeviceId;
31 import org.thingsboard.server.common.data.id.EntityId; 32 import org.thingsboard.server.common.data.id.EntityId;
32 import org.thingsboard.server.common.data.id.EntityIdFactory; 33 import org.thingsboard.server.common.data.id.EntityIdFactory;
  34 +import org.thingsboard.server.common.data.id.EntityViewId;
33 import org.thingsboard.server.common.data.kv.AttributeKvEntry; 35 import org.thingsboard.server.common.data.kv.AttributeKvEntry;
34 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry; 36 import org.thingsboard.server.common.data.kv.BaseAttributeKvEntry;
35 import org.thingsboard.server.common.data.kv.BaseTsKvQuery; 37 import org.thingsboard.server.common.data.kv.BaseTsKvQuery;
@@ -44,6 +46,8 @@ import org.thingsboard.server.common.data.kv.TsKvEntry; @@ -44,6 +46,8 @@ import org.thingsboard.server.common.data.kv.TsKvEntry;
44 import org.thingsboard.server.common.data.kv.TsKvQuery; 46 import org.thingsboard.server.common.data.kv.TsKvQuery;
45 import org.thingsboard.server.common.msg.cluster.ServerAddress; 47 import org.thingsboard.server.common.msg.cluster.ServerAddress;
46 import org.thingsboard.server.dao.attributes.AttributesService; 48 import org.thingsboard.server.dao.attributes.AttributesService;
  49 +import org.thingsboard.server.dao.entityview.EntityViewService;
  50 +import org.thingsboard.server.dao.model.ModelConstants;
47 import org.thingsboard.server.dao.timeseries.TimeseriesService; 51 import org.thingsboard.server.dao.timeseries.TimeseriesService;
48 import org.thingsboard.server.gen.cluster.ClusterAPIProtos; 52 import org.thingsboard.server.gen.cluster.ClusterAPIProtos;
49 import org.thingsboard.server.service.cluster.routing.ClusterRoutingService; 53 import org.thingsboard.server.service.cluster.routing.ClusterRoutingService;
@@ -97,6 +101,9 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio @@ -97,6 +101,9 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio
97 @Autowired 101 @Autowired
98 private ClusterRpcService rpcService; 102 private ClusterRpcService rpcService;
99 103
  104 + /*@Autowired
  105 + private EntityViewService entityViewService;*/
  106 +
100 @Autowired 107 @Autowired
101 @Lazy 108 @Lazy
102 private DeviceStateService stateService; 109 private DeviceStateService stateService;
@@ -125,17 +132,29 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio @@ -125,17 +132,29 @@ public class DefaultTelemetrySubscriptionService implements TelemetrySubscriptio
125 132
126 @Override 133 @Override
127 public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) { 134 public void addLocalWsSubscription(String sessionId, EntityId entityId, SubscriptionState sub) {
  135 + String familyName = ModelConstants.DEVICE_FAMILY_NAME;
  136 +
  137 + //To do
  138 + if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
  139 + familyName = ModelConstants.ENTITY_VIEW_FAMILY_NAME;
  140 + //EntityView entityView = entityViewService.findEntityViewById((EntityViewId) entityId)
  141 + }
  142 +
128 Optional<ServerAddress> server = routingService.resolveById(entityId); 143 Optional<ServerAddress> server = routingService.resolveById(entityId);
129 Subscription subscription; 144 Subscription subscription;
130 if (server.isPresent()) { 145 if (server.isPresent()) {
131 ServerAddress address = server.get(); 146 ServerAddress address = server.get();
132 - log.trace("[{}] Forwarding subscription [{}] for device [{}] to [{}]", sessionId, sub.getSubscriptionId(), entityId, address); 147 + log.trace("[{}] Forwarding subscription [{}] for " + familyName + " [{}] to [{}]", sessionId, sub.getSubscriptionId(), entityId, address);
133 subscription = new Subscription(sub, true, address); 148 subscription = new Subscription(sub, true, address);
134 tellNewSubscription(address, sessionId, subscription); 149 tellNewSubscription(address, sessionId, subscription);
135 } else { 150 } else {
136 - log.trace("[{}] Registering local subscription [{}] for device [{}]", sessionId, sub.getSubscriptionId(), entityId); 151 + log.trace("[{}] Registering local subscription [{}] for " + familyName + " [{}]", sessionId, sub.getSubscriptionId(), entityId);
137 subscription = new Subscription(sub, true); 152 subscription = new Subscription(sub, true);
138 } 153 }
  154 +
  155 + /*if (entityId.getEntityType().equals(EntityType.ENTITY_VIEW)) {
  156 + registerSubscription(sessionId, entityId, subscription);
  157 + }*/
139 registerSubscription(sessionId, entityId, subscription); 158 registerSubscription(sessionId, entityId, subscription);
140 } 159 }
141 160
@@ -37,6 +37,10 @@ public class Subscription { @@ -37,6 +37,10 @@ public class Subscription {
37 this(sub, local, null, 0L, 0L); 37 this(sub, local, null, 0L, 0L);
38 } 38 }
39 39
  40 + public Subscription(SubscriptionState sub, boolean local, ServerAddress server) {
  41 + this(sub, local, server, 0L, 0L);
  42 + }
  43 +
40 public String getWsSessionId() { 44 public String getWsSessionId() {
41 return getSub().getWsSessionId(); 45 return getSub().getWsSessionId();
42 } 46 }
@@ -131,6 +131,7 @@ public class ModelConstants { @@ -131,6 +131,7 @@ public class ModelConstants {
131 * Cassandra device constants. 131 * Cassandra device constants.
132 */ 132 */
133 public static final String DEVICE_COLUMN_FAMILY_NAME = "device"; 133 public static final String DEVICE_COLUMN_FAMILY_NAME = "device";
  134 + public static final String DEVICE_FAMILY_NAME = "device";
134 public static final String DEVICE_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; 135 public static final String DEVICE_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
135 public static final String DEVICE_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY; 136 public static final String DEVICE_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY;
136 public static final String DEVICE_NAME_PROPERTY = "name"; 137 public static final String DEVICE_NAME_PROPERTY = "name";
@@ -147,6 +148,7 @@ public class ModelConstants { @@ -147,6 +148,7 @@ public class ModelConstants {
147 * Cassandra entityView constants. 148 * Cassandra entityView constants.
148 */ 149 */
149 public static final String ENTITY_VIEW_TABLE_FAMILY_NAME = "entity_views"; 150 public static final String ENTITY_VIEW_TABLE_FAMILY_NAME = "entity_views";
  151 + public static final String ENTITY_VIEW_FAMILY_NAME = "entity-view";
150 public static final String ENTITY_VIEW_ENTITY_ID_PROPERTY = ENTITY_ID_COLUMN; 152 public static final String ENTITY_VIEW_ENTITY_ID_PROPERTY = ENTITY_ID_COLUMN;
151 public static final String ENTITY_VIEW_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY; 153 public static final String ENTITY_VIEW_TENANT_ID_PROPERTY = TENANT_ID_PROPERTY;
152 public static final String ENTITY_VIEW_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY; 154 public static final String ENTITY_VIEW_CUSTOMER_ID_PROPERTY = CUSTOMER_ID_PROPERTY;