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

Fix for entityType selection

Browse Source
This commit is contained in:
zbeacon 2020-07-21 10:51:14 +03:00
parent fc597f2c0b
commit 0e8f4daddb
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
dao/src/main/java/org/thingsboard/server/dao/sql/query/EntityKeyMapping.java
View File

@ -162,13 +162,17 @@ public class EntityKeyMapping {
public String toSelection(EntityFilterType filterType, EntityType entityType) { public String toSelection(EntityFilterType filterType, EntityType entityType) {
if (entityKey.getType().equals(EntityKeyType.ENTITY_FIELD)) { if (entityKey.getType().equals(EntityKeyType.ENTITY_FIELD)) {
Set<String> existingEntityFields = getExistingEntityFields(filterType, entityType); if (entityKey.getKey().equals("entityType") && !filterType.equals(EntityFilterType.RELATIONS_QUERY)) {
String alias = getEntityFieldAlias(filterType, entityType); return String.format("'%s' as %s", entityType.name(), getValueAlias());
if (existingEntityFields.contains(alias)) {
String column = entityFieldColumnMap.get(alias);
return String.format("e.%s as %s", column, getValueAlias());
} else { } else {
return String.format("'' as %s", getValueAlias()); Set<String> existingEntityFields = getExistingEntityFields(filterType, entityType);
String alias = getEntityFieldAlias(filterType, entityType);
if (existingEntityFields.contains(alias)) {
String column = entityFieldColumnMap.get(alias);
return String.format("e.%s as %s", column, getValueAlias());
} else {
return String.format("'' as %s", getValueAlias());
}
} }
} else if (entityKey.getType().equals(EntityKeyType.TIME_SERIES)) { } else if (entityKey.getType().equals(EntityKeyType.TIME_SERIES)) {
return buildTimeSeriesSelection(); return buildTimeSeriesSelection();