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

Add missing entity view search query

Browse Source
This commit is contained in:
Igor Kulikov 2020-07-15 15:40:46 +03:00
parent 349909be87
commit ac5fd2cec8
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dao/src/main/java/org/thingsboard/server/dao/sql/query/DefaultEntityQueryRepository.java
View File

@ -42,6 +42,7 @@ import org.thingsboard.server.common.data.query.EntityFilterType;
import org.thingsboard.server.common.data.query.EntityListFilter; import org.thingsboard.server.common.data.query.EntityListFilter;
import org.thingsboard.server.common.data.query.EntityNameFilter; import org.thingsboard.server.common.data.query.EntityNameFilter;
import org.thingsboard.server.common.data.query.EntitySearchQueryFilter; import org.thingsboard.server.common.data.query.EntitySearchQueryFilter;
import org.thingsboard.server.common.data.query.EntityViewSearchQueryFilter;
import org.thingsboard.server.common.data.query.EntityViewTypeFilter; import org.thingsboard.server.common.data.query.EntityViewTypeFilter;
import org.thingsboard.server.common.data.query.RelationsQueryFilter; import org.thingsboard.server.common.data.query.RelationsQueryFilter;
import org.thingsboard.server.common.data.query.SingleEntityFilter; import org.thingsboard.server.common.data.query.SingleEntityFilter;
@ -341,6 +342,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
case RELATIONS_QUERY: case RELATIONS_QUERY:
case DEVICE_SEARCH_QUERY: case DEVICE_SEARCH_QUERY:
case ASSET_SEARCH_QUERY: case ASSET_SEARCH_QUERY:
case ENTITY_VIEW_SEARCH_QUERY:
return this.defaultPermissionQuery(ctx, tenantId, customerId, entityType); return this.defaultPermissionQuery(ctx, tenantId, customerId, entityType);
default: default:
if (entityType == EntityType.TENANT) { if (entityType == EntityType.TENANT) {
@ -381,6 +383,7 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
case RELATIONS_QUERY: case RELATIONS_QUERY:
case DEVICE_SEARCH_QUERY: case DEVICE_SEARCH_QUERY:
case ASSET_SEARCH_QUERY: case ASSET_SEARCH_QUERY:
case ENTITY_VIEW_SEARCH_QUERY:
return ""; return "";
default: default:
throw new RuntimeException("Not implemented!"); throw new RuntimeException("Not implemented!");
@ -397,6 +400,9 @@ public class DefaultEntityQueryRepository implements EntityQueryRepository {
case ASSET_SEARCH_QUERY: case ASSET_SEARCH_QUERY:
AssetSearchQueryFilter assetQuery = (AssetSearchQueryFilter) entityFilter; AssetSearchQueryFilter assetQuery = (AssetSearchQueryFilter) entityFilter;
return entitySearchQuery(ctx, assetQuery, EntityType.ASSET, assetQuery.getAssetTypes()); return entitySearchQuery(ctx, assetQuery, EntityType.ASSET, assetQuery.getAssetTypes());
case ENTITY_VIEW_SEARCH_QUERY:
EntityViewSearchQueryFilter entityViewQuery = (EntityViewSearchQueryFilter) entityFilter;
return entitySearchQuery(ctx, entityViewQuery, EntityType.ENTITY_VIEW, entityViewQuery.getEntityViewTypes());
default: default:
return entityTableMap.get(entityType); return entityTableMap.get(entityType);
} }