简柏林 / thingskit · Commits

Commit de21d977a183bdadf8acfbb777b5ef5ac06c3157

Authored by viktorbasanets
1 parent 7009cbd8

Was final changing

Inline Side-by-side
Showing 2 changed files with 4 additions and 4 deletions
@@ -56,7 +56,7 @@ public interface EntityViewDao extends Dao<EntityView> { @@ -56,7 +56,7 @@ public interface EntityViewDao extends Dao<EntityView> {
56 * @return the list of entity view objects 56 * @return the list of entity view objects
57 */ 57 */
58 List<EntityView> findEntityViewByTenantIdAndEntityId(UUID tenantId, 58 List<EntityView> findEntityViewByTenantIdAndEntityId(UUID tenantId,
59 - EntityId entityId, 59 + UUID entityId,
60 TextPageLink pageLink); 60 TextPageLink pageLink);
61 61
62 /** 62 /**
@@ -82,7 +82,7 @@ public interface EntityViewDao extends Dao<EntityView> { @@ -82,7 +82,7 @@ public interface EntityViewDao extends Dao<EntityView> {
82 */ 82 */
83 List<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(UUID tenantId, 83 List<EntityView> findEntityViewsByTenantIdAndCustomerIdAndEntityId(UUID tenantId,
84 UUID customerId, 84 UUID customerId,
85 - EntityId entityId, 85 + UUID entityId,
86 TextPageLink pageLink); 86 TextPageLink pageLink);
87 87
88 } 88 }
@@ -135,7 +135,7 @@ public class EntityViewServiceImpl extends AbstractEntityService @@ -135,7 +135,7 @@ public class EntityViewServiceImpl extends AbstractEntityService
135 validateString(entityId.toString(), "Incorrect entityId " + entityId.toString()); 135 validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
136 validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink); 136 validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
137 List<EntityView> entityViews = entityViewDao.findEntityViewByTenantIdAndEntityId(tenantId.getId(), 137 List<EntityView> entityViews = entityViewDao.findEntityViewByTenantIdAndEntityId(tenantId.getId(),
138 - entityId, pageLink); 138 + entityId.getId(), pageLink);
139 139
140 return new TextPageData<>(entityViews, pageLink); 140 return new TextPageData<>(entityViews, pageLink);
141 } 141 }
@@ -177,7 +177,7 @@ public class EntityViewServiceImpl extends AbstractEntityService @@ -177,7 +177,7 @@ public class EntityViewServiceImpl extends AbstractEntityService
177 validateString(entityId.toString(), "Incorrect entityId " + entityId.toString()); 177 validateString(entityId.toString(), "Incorrect entityId " + entityId.toString());
178 validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink); 178 validatePageLink(pageLink, INCORRECT_PAGE_LINK + pageLink);
179 List<EntityView> entityViews = entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndEntityId( 179 List<EntityView> entityViews = entityViewDao.findEntityViewsByTenantIdAndCustomerIdAndEntityId(
180 - tenantId.getId(), customerId.getId(), entityId, pageLink); 180 + tenantId.getId(), customerId.getId(), entityId.getId(), pageLink);
181 181
182 return new TextPageData<>(entityViews, pageLink); 182 return new TextPageData<>(entityViews, pageLink);
183 } 183 }