Commit 2788623bd1e4cf356600a5910bd8a641d065340d
Merge branch 'master' of github.com:thingsboard/thingsboard
Showing
1 changed file
with
6 additions
and
0 deletions
| @@ -42,6 +42,7 @@ import org.thingsboard.server.common.data.query.EntityFilterType; | @@ -42,6 +42,7 @@ import org.thingsboard.server.common.data.query.EntityFilterType; | ||
| 42 | import org.thingsboard.server.common.data.query.EntityListFilter; | 42 | import org.thingsboard.server.common.data.query.EntityListFilter; |
| 43 | import org.thingsboard.server.common.data.query.EntityNameFilter; | 43 | import org.thingsboard.server.common.data.query.EntityNameFilter; |
| 44 | import org.thingsboard.server.common.data.query.EntitySearchQueryFilter; | 44 | import org.thingsboard.server.common.data.query.EntitySearchQueryFilter; |
| 45 | +import org.thingsboard.server.common.data.query.EntityViewSearchQueryFilter; | ||
| 45 | import org.thingsboard.server.common.data.query.EntityViewTypeFilter; | 46 | import org.thingsboard.server.common.data.query.EntityViewTypeFilter; |
| 46 | import org.thingsboard.server.common.data.query.RelationsQueryFilter; | 47 | import org.thingsboard.server.common.data.query.RelationsQueryFilter; |
| 47 | import org.thingsboard.server.common.data.query.SingleEntityFilter; | 48 | import org.thingsboard.server.common.data.query.SingleEntityFilter; |
| @@ -346,6 +347,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -346,6 +347,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 346 | case RELATIONS_QUERY: | 347 | case RELATIONS_QUERY: |
| 347 | case DEVICE_SEARCH_QUERY: | 348 | case DEVICE_SEARCH_QUERY: |
| 348 | case ASSET_SEARCH_QUERY: | 349 | case ASSET_SEARCH_QUERY: |
| 350 | + case ENTITY_VIEW_SEARCH_QUERY: | ||
| 349 | return this.defaultPermissionQuery(ctx, tenantId, customerId, entityType); | 351 | return this.defaultPermissionQuery(ctx, tenantId, customerId, entityType); |
| 350 | default: | 352 | default: |
| 351 | if (entityType == EntityType.TENANT) { | 353 | if (entityType == EntityType.TENANT) { |
| @@ -386,6 +388,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -386,6 +388,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 386 | case RELATIONS_QUERY: | 388 | case RELATIONS_QUERY: |
| 387 | case DEVICE_SEARCH_QUERY: | 389 | case DEVICE_SEARCH_QUERY: |
| 388 | case ASSET_SEARCH_QUERY: | 390 | case ASSET_SEARCH_QUERY: |
| 391 | + case ENTITY_VIEW_SEARCH_QUERY: | ||
| 389 | return ""; | 392 | return ""; |
| 390 | default: | 393 | default: |
| 391 | throw new RuntimeException("Not implemented!"); | 394 | throw new RuntimeException("Not implemented!"); |
| @@ -402,6 +405,9 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -402,6 +405,9 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 402 | case ASSET_SEARCH_QUERY: | 405 | case ASSET_SEARCH_QUERY: |
| 403 | AssetSearchQueryFilter assetQuery = (AssetSearchQueryFilter) entityFilter; | 406 | AssetSearchQueryFilter assetQuery = (AssetSearchQueryFilter) entityFilter; |
| 404 | return entitySearchQuery(ctx, assetQuery, EntityType.ASSET, assetQuery.getAssetTypes()); | 407 | return entitySearchQuery(ctx, assetQuery, EntityType.ASSET, assetQuery.getAssetTypes()); |
| 408 | + case ENTITY_VIEW_SEARCH_QUERY: | ||
| 409 | + EntityViewSearchQueryFilter entityViewQuery = (EntityViewSearchQueryFilter) entityFilter; | ||
| 410 | + return entitySearchQuery(ctx, entityViewQuery, EntityType.ENTITY_VIEW, entityViewQuery.getEntityViewTypes()); | ||
| 405 | default: | 411 | default: |
| 406 | return entityTableMap.get(entityType); | 412 | return entityTableMap.get(entityType); |
| 407 | } | 413 | } |