tsai
/
thingsboard
mirror of https://github.com/thingsboard/thingsboard.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Reviewed

pull/1102/head
viktorbasanets 8 years ago
parent
87eb21d68f
commit
5a65ec75fe
1 changed files with 7 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java

18
dao/src/main/java/org/thingsboard/server/dao/entityview/EntityViewServiceImpl.java
View File

@ -228,17 +228,13 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
filteredAttributes = filteredAttributes =
attributeKvEntries.stream() attributeKvEntries.stream()
.filter(attributeKvEntry -> { .filter(attributeKvEntry -> {
if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() == 0) { long startTime = entityView.getStartTimeMs();
return true; long endTime = entityView.getEndTimeMs();
} long lastUpdateTs = attributeKvEntry.getLastUpdateTs();
if (entityView.getEndTimeMs() == 0 && entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs()) { return startTime == 0 && endTime == 0 ||
return true; (endTime == 0 && startTime < lastUpdateTs) ||
} (startTime == 0 && endTime > lastUpdateTs) ||
if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs()) { (startTime < lastUpdateTs && endTime > lastUpdateTs);
return true;
}
return entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs()
&& entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs();
}).collect(Collectors.toList()); }).collect(Collectors.toList());
} }
try { try {

Write Preview
Loading…
Cancel
Save