Commit ac5fd2cec8847dec49a1cb7ba38eaa40f52bee85
1 parent
349909be
Add missing entity view search query
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; |
| @@ -341,6 +342,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -341,6 +342,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 341 | case RELATIONS_QUERY: | 342 | case RELATIONS_QUERY: |
| 342 | case DEVICE_SEARCH_QUERY: | 343 | case DEVICE_SEARCH_QUERY: |
| 343 | case ASSET_SEARCH_QUERY: | 344 | case ASSET_SEARCH_QUERY: |
| 345 | + case ENTITY_VIEW_SEARCH_QUERY: | ||
| 344 | return this.defaultPermissionQuery(ctx, tenantId, customerId, entityType); | 346 | return this.defaultPermissionQuery(ctx, tenantId, customerId, entityType); |
| 345 | default: | 347 | default: |
| 346 | if (entityType == EntityType.TENANT) { | 348 | if (entityType == EntityType.TENANT) { |
| @@ -381,6 +383,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -381,6 +383,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 381 | case RELATIONS_QUERY: | 383 | case RELATIONS_QUERY: |
| 382 | case DEVICE_SEARCH_QUERY: | 384 | case DEVICE_SEARCH_QUERY: |
| 383 | case ASSET_SEARCH_QUERY: | 385 | case ASSET_SEARCH_QUERY: |
| 386 | + case ENTITY_VIEW_SEARCH_QUERY: | ||
| 384 | return ""; | 387 | return ""; |
| 385 | default: | 388 | default: |
| 386 | throw new RuntimeException("Not implemented!"); | 389 | throw new RuntimeException("Not implemented!"); |
| @@ -397,6 +400,9 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | @@ -397,6 +400,9 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository { | ||
| 397 | case ASSET_SEARCH_QUERY: | 400 | case ASSET_SEARCH_QUERY: |
| 398 | AssetSearchQueryFilter assetQuery = (AssetSearchQueryFilter) entityFilter; | 401 | AssetSearchQueryFilter assetQuery = (AssetSearchQueryFilter) entityFilter; |
| 399 | return entitySearchQuery(ctx, assetQuery, EntityType.ASSET, assetQuery.getAssetTypes()); | 402 | return entitySearchQuery(ctx, assetQuery, EntityType.ASSET, assetQuery.getAssetTypes()); |
| 403 | + case ENTITY_VIEW_SEARCH_QUERY: | ||
| 404 | + EntityViewSearchQueryFilter entityViewQuery = (EntityViewSearchQueryFilter) entityFilter; | ||
| 405 | + return entitySearchQuery(ctx, entityViewQuery, EntityType.ENTITY_VIEW, entityViewQuery.getEntityViewTypes()); | ||
| 400 | default: | 406 | default: |
| 401 | return entityTableMap.get(entityType); | 407 | return entityTableMap.get(entityType); |
| 402 | } | 408 | } |