dendi-wang/thingsboard
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Was final changing

Browse Source
This commit is contained in:
viktorbasanets 2018-08-31 15:40:03 +03:00
parent 7009cbd8ac
commit de21d977a1
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewDao.java
View File

@ -56,7 +56,7 @@ public interface EntityViewDao extends Dao<EntityView> {
* @return the list of entity view objects * @return the list of entity view objects
*/ */
List<EntityView> findEntityViewByTenantIdAndEntityId(UUID tenantId, List<EntityView> findEntityViewByTenantIdAndEntityId(UUID tenantId,
EntityId entityId, UUID entityId,
TextPageLink pageLink); TextPageLink pageLink);
/** /**
@ -82,7 +82,7 @@ public interface EntityViewDao extends Dao<EntityView> {
*/ */
List<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(UUID tenantId, List<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(UUID tenantId,
UUID customerId, UUID customerId,
EntityId entityId, UUID entityId,
TextPageLink pageLink); TextPageLink pageLink);
} }

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

@ -135,7 +135,7 @@ public class EntityViewServiceImpl extends AbstractEntityService
validateString(entityId.toString(), "Incorrect entityId " + entityId.toString()); validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink); validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
List<EntityView> entityViews = entityViewDao.findEntityViewByTenantIdAndEntityId(tenantId.getId(), List<EntityView> entityViews = entityViewDao.findEntityViewByTenantIdAndEntityId(tenantId.getId(),
entityId, pageLink); entityId.getId(), pageLink);
return new TextPageData<>(entityViews, pageLink); return new TextPageData<>(entityViews, pageLink);
} }
@ -177,7 +177,7 @@ public class EntityViewServiceImpl extends AbstractEntityService
validateString(entityId.toString(), "Incorrect entityId " + entityId.toString()); validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink); validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
List<EntityView> entityViews = entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndEntityId( List<EntityView> entityViews = entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndEntityId(
tenantId.getId(), customerId.getId(), entityId, pageLink); tenantId.getId(), customerId.getId(), entityId.getId(), pageLink);
return new TextPageData<>(entityViews, pageLink); return new TextPageData<>(entityViews, pageLink);
} }