简柏林 / thingskit · Commits

Commit 5a65ec75fe6dece007277555044770ed8952efd4

Authored by viktorbasanets
1 parent 87eb21d6

Reviewed

Inline Side-by-side
Showing 1 changed file with 7 additions and 11 deletions
... ... @@ -228,17 +228,13 @@ public class EntityViewServiceImpl extends AbstractEntityService implements Enti
228 228 filteredAttributes =
229 229 attributeKvEntries.stream()
230 230 .filter(attributeKvEntry -> {
231   - if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() == 0) {
232   - return true;
233   - }
234   - if (entityView.getEndTimeMs() == 0 && entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs()) {
235   - return true;
236   - }
237   - if (entityView.getStartTimeMs() == 0 && entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs()) {
238   - return true;
239   - }
240   - return entityView.getStartTimeMs() < attributeKvEntry.getLastUpdateTs()
241   - && entityView.getEndTimeMs() > attributeKvEntry.getLastUpdateTs();
  231 + long startTime = entityView.getStartTimeMs();
  232 + long endTime = entityView.getEndTimeMs();
  233 + long lastUpdateTs = attributeKvEntry.getLastUpdateTs();
  234 + return startTime == 0 && endTime == 0 ||
  235 + (endTime == 0 && startTime < lastUpdateTs) ||
  236 + (startTime == 0 && endTime > lastUpdateTs) ||
  237 + (startTime < lastUpdateTs && endTime > lastUpdateTs);
242 238 }).collect(Collectors.toList());
243 239 }
244 240 try {
... ...