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

Was modified

Browse Source
This commit is contained in:
viktorbasanets 2018-09-05 18:10:39 +03:00
parent d28bd62b83
commit 48ff2b2723
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
application/src/main/data/upgrade/2.1.1/schema_update.sql
View File

@ -26,5 +26,6 @@ CREATE TABLE IF NOT EXISTS entity_views (
name varchar(255), name varchar(255),
search_text varchar(255), search_text varchar(255),
entity_id varchar(31), entity_id varchar(31),
entity_type varchar(255),
tenant_id varchar(31) tenant_id varchar(31)
); );

6
common/data/src/main/java/org/thingsboard/server/common/data/EntityView.java
View File

@ -20,9 +20,7 @@ import org.thingsboard.server.common.data.id.CustomerId;
import org.thingsboard.server.common.data.id.EntityId; import org.thingsboard.server.common.data.id.EntityId;
import org.thingsboard.server.common.data.id.EntityViewId; import org.thingsboard.server.common.data.id.EntityViewId;
import org.thingsboard.server.common.data.id.TenantId; import org.thingsboard.server.common.data.id.TenantId;
import org.thingsboard.server.common.data.objects.TelemetryEntityView;
import java.beans.ConstructorProperties;
import java.util.List;
/** /**
* Created by Victor Basanets on 8/27/2017. * Created by Victor Basanets on 8/27/2017.
@ -40,7 +38,7 @@ public class EntityView extends SearchTextBasedWithAdditionalInfo<EntityViewId>
private TenantId tenantId; private TenantId tenantId;
private CustomerId customerId; private CustomerId customerId;
private String name; private String name;
private List<String> keys; private TelemetryEntityView keys; //To Do: Changed from all code
private Long tsBegin; private Long tsBegin;
private Long tsEnd; private Long tsEnd;

2
common/data/src/main/java/org/thingsboard/server/common/data/id/EntityIdFactory.java
View File

@ -57,6 +57,8 @@ public class EntityIdFactory {
return new RuleChainId(uuid); return new RuleChainId(uuid);
case RULE_NODE: case RULE_NODE:
return new RuleNodeId(uuid); return new RuleNodeId(uuid);
case ENTITY_VIEW:
return new EntityViewId(uuid);
} }
throw new IllegalArgumentException("EntityType " + type + " is not supported!"); throw new IllegalArgumentException("EntityType " + type + " is not supported!");
} }