tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Fixed

pull/1102/head
viktorbasanets 8 years ago
parent
2269656b09
commit
7bcb64958d
2 changed files with 44 additions and 36 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      application/src/test/java/org/thingsboard/server/controller/ControllerSqlTestSuite.java
  2. 78
      dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java

2
application/src/test/java/org/thingsboard/server/controller/ControllerSqlTestSuite.java
View File

@ -24,7 +24,7 @@ import java.util.Arrays;
@RunWith(ClasspathSuite.class) @RunWith(ClasspathSuite.class)
@ClasspathSuite.ClassnameFilters({ @ClasspathSuite.ClassnameFilters({
"org.thingsboard.server.controller.sql.*Test", "org.thingsboard.server.controller.sql.EntityViewControllerSqlTest",
}) })
public class ControllerSqlTestSuite { public class ControllerSqlTestSuite {

78
dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
View File

@ -97,10 +97,19 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
log.trace("Executing save entity view [{}]", entityView); log.trace("Executing save entity view [{}]", entityView);
entityViewValidator.validate(entityView); entityViewValidator.validate(entityView);
EntityView savedEntityView = entityViewDao.save(entityView); EntityView savedEntityView = entityViewDao.save(entityView);
List<ListenableFuture<List<Void>>> futures = new ArrayList<>();
if (savedEntityView.getKeys() != null) { if (savedEntityView.getKeys() != null) {
copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.CLIENT_SCOPE, savedEntityView.getKeys().getAttributes().getCs()); futures.add(copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.CLIENT_SCOPE, savedEntityView.getKeys().getAttributes().getCs()));
copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.SERVER_SCOPE, savedEntityView.getKeys().getAttributes().getSs()); futures.add(copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.SERVER_SCOPE, savedEntityView.getKeys().getAttributes().getSs()));
copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.SHARED_SCOPE, savedEntityView.getKeys().getAttributes().getSh()); futures.add(copyAttributesFromEntityToEntityView(savedEntityView, DataConstants.SHARED_SCOPE, savedEntityView.getKeys().getAttributes().getSh()));
}
for (ListenableFuture<List<Void>> future : futures) {
try {
future.get();
} catch (InterruptedException | ExecutionException e) {
log.error("Failed to copy attributes to entity view", e);
throw new RuntimeException("Failed to copy attributes to entity view", e);
}
} }
return savedEntityView; return savedEntityView;
} }
@ -169,9 +178,9 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
@Override @Override
public TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId, public TextPageData<EntityView> findEntityViewsByTenantIdAndCustomerId(TenantId tenantId, CustomerId customerId,
TextPageLink pageLink) { TextPageLink pageLink) {
log.trace("Executing findEntityViewByTenantIdAndCustomerId, tenantId [{}], customerId [{}]," + log.trace("Executing findEntityViewByTenantIdAndCustomerId, tenantId [{}], customerId [{}]," +
" pageLink [{}]", tenantId, customerId, pageLink); " pageLink [{}]", tenantId, customerId, pageLink);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
validateId(customerId, INCORRECT_CUSTOMER_ID + customerId); validateId(customerId, INCORRECT_CUSTOMER_ID + customerId);
validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink); validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
@ -246,7 +255,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
log.trace("Executing deleteEntityViewsByTenantId, tenantId [{}]", tenantId); log.trace("Executing deleteEntityViewsByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
entityViewDao.findEntityViewsByTenantId(tenantId.getId(), new TextPageLink(DEFAULT_LIMIT)).stream() entityViewDao.findEntityViewsByTenantId(tenantId.getId(), new TextPageLink(DEFAULT_LIMIT)).stream()
.map(view -> view.getId()) .map(view -> view.getId())
.collect(Collectors.toList()) .collect(Collectors.toList())
.forEach(id -> cacheEvict(id, cacheManager.getCache(ENTITY_VIEW_CACHE))); .forEach(id -> cacheEvict(id, cacheManager.getCache(ENTITY_VIEW_CACHE)));
tenantEntityViewRemover.removeEntities(tenantId); tenantEntityViewRemover.removeEntities(tenantId);
@ -258,38 +267,37 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
cache.evict(Arrays.asList(entityView.getTenantId(), entityView.getEntityId())); cache.evict(Arrays.asList(entityView.getTenantId(), entityView.getEntityId()));
} }
private void copyAttributesFromEntityToEntityView(EntityView entityView, String scope, Collection<String> keys) { private ListenableFuture<List<Void>> copyAttributesFromEntityToEntityView(EntityView entityView, String scope, Collection<String> keys) {
if (keys != null && !keys.isEmpty()) { if (keys != null && !keys.isEmpty()) {
ListenableFuture<List<AttributeKvEntry>> getAttrFuture = attributesService.find(entityView.getEntityId(), scope, keys); ListenableFuture<List<AttributeKvEntry>> getAttrFuture = attributesService.find(entityView.getEntityId(), scope, keys);
Futures.addCallback(getAttrFuture, new FutureCallback<List<AttributeKvEntry>>() { return Futures.transform(getAttrFuture, attributeKvEntries -> {
@Override List<AttributeKvEntry> filteredAttributes = new ArrayList<>();
public void onSuccess(@Nullable List<AttributeKvEntry> attributeKvEntries) { if (attributeKvEntries != null && !attributeKvEntries.isEmpty()) {
if (attributeKvEntries != null && !attributeKvEntries.isEmpty()) { filteredAttributes =
List<AttributeKvEntry> filteredAttributes = attributeKvEntries.stream()
attributeKvEntries.stream() .filter(attributeKvEntry -> {
.filter(attributeKvEntry -> { if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() == 0) {
if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() == 0) { return true;
return true; }
} if (entityView.getEndTimeMs() == 0 && entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs()) {
if (entityView.getEndTimeMs() == 0 && entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs()) { return true;
return true; }
} if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs()) {
if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs()) { return true;
return true; }
} return entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs()
return entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs() && entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs();
&& entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs(); }).collect(Collectors.toList());
}).collect(Collectors.toList());
attributesService.save(entityView.getId(), scope, filteredAttributes);
}
} }
try {
@Override return attributesService.save(entityView.getId(), scope, filteredAttributes).get();
public void onFailure(Throwable throwable) { } catch (InterruptedException | ExecutionException e) {
log.error("Failed to fetch [{}] attributes [{}] for [{}] entity [{}]", log.error("Failed to copy attributes to entity view", e);
scope, keys, entityView.getEntityId().getEntityType().name(), entityView.getEntityId().getId().toString(), throwable); throw new RuntimeException("Failed to copy attributes to entity view", e);
} }
}); });
} else {
return Futures.immediateFuture(null);
} }
} }
@ -299,7 +307,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
@Override @Override
protected void validateCreate(EntityView entityView) { protected void validateCreate(EntityView entityView) {
entityViewDao.findEntityViewByTenantIdAndName(entityView.getTenantId().getId(), entityView.getName()) entityViewDao.findEntityViewByTenantIdAndName(entityView.getTenantId().getId(), entityView.getName())
.ifPresent( e -> { .ifPresent(e -> {
throw new DataValidationException("Entity view with such name already exists!"); throw new DataValidationException("Entity view with such name already exists!");
}); });
} }
@ -307,7 +315,7 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
@Override @Override
protected void validateUpdate(EntityView entityView) { protected void validateUpdate(EntityView entityView) {
entityViewDao.findEntityViewByTenantIdAndName(entityView.getTenantId().getId(), entityView.getName()) entityViewDao.findEntityViewByTenantIdAndName(entityView.getTenantId().getId(), entityView.getName())
.ifPresent( e -> { .ifPresent(e -> {
if (!e.getUuidId().equals(entityView.getUuidId())) { if (!e.getUuidId().equals(entityView.getUuidId())) {
throw new DataValidationException("Entity view with such name already exists!"); throw new DataValidationException("Entity view with such name already exists!");
} }

Write Preview
Loading…
Cancel
Save