Browse Source

The final modifications for passing preliminary tests

pull/1053/head
viktorbasanets 8 years ago
parent
commit
8ecd9628ca
  1. 4
      dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java
  2. 3
      dao/src/test/resources/sql/drop-all-tables.sql

4
dao/src/main/java/org/thingsboard/server/dao/model/sql/EntityViewEntity.java

@ -106,8 +106,8 @@ public class EntityViewEntity extends BaseSqlEntity<EntityView> implements Searc
} catch (IOException e) {
e.printStackTrace();
}
this.tsBegin = entityView.getTsBegin() != null ? String.valueOf(entityView.getTsBegin()) : "";
this.tsEnd = entityView.getTsEnd() != null ? String.valueOf(entityView.getTsEnd()) : "";
this.tsBegin = entityView.getTsBegin() != null ? String.valueOf(entityView.getTsBegin()) : "0";
this.tsEnd = entityView.getTsEnd() != null ? String.valueOf(entityView.getTsEnd()) : "0";
this.searchText = entityView.getSearchText();
this.additionalInfo = entityView.getAdditionalInfo();
}

3
dao/src/test/resources/sql/drop-all-tables.sql

@ -18,4 +18,5 @@ DROP TABLE IF EXISTS user_credentials;
DROP TABLE IF EXISTS widget_type;
DROP TABLE IF EXISTS widgets_bundle;
DROP TABLE IF EXISTS rule_node;
DROP TABLE IF EXISTS rule_chain;
DROP TABLE IF EXISTS rule_chain;
DROP TABLE IF EXISTS entity_views;
Loading…
Cancel
Save