简柏林 / thingskit · Commits

Commit 3c558a7d2a98cc1baffb5470fbb7e00819b799da

Authored by AndrewVolostnykhThingsboard
1 parent a4981a86

getHighestAlarmSeverity: cleared unwanted code

Inline Side-by-side
Showing 1 changed file with 5 additions and 28 deletions
@@ -28,12 +28,7 @@ import org.springframework.util.CollectionUtils; @@ -28,12 +28,7 @@ import org.springframework.util.CollectionUtils;
28 import org.springframework.util.StringUtils; 28 import org.springframework.util.StringUtils;
29 import org.thingsboard.common.util.ThingsBoardThreadFactory; 29 import org.thingsboard.common.util.ThingsBoardThreadFactory;
30 import org.thingsboard.server.common.data.Tenant; 30 import org.thingsboard.server.common.data.Tenant;
31 -import org.thingsboard.server.common.data.alarm.Alarm;  
32 -import org.thingsboard.server.common.data.alarm.AlarmInfo;  
33 -import org.thingsboard.server.common.data.alarm.AlarmQuery;  
34 -import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;  
35 -import org.thingsboard.server.common.data.alarm.AlarmSeverity;  
36 -import org.thingsboard.server.common.data.alarm.AlarmStatus; 31 +import org.thingsboard.server.common.data.alarm.*;
37 import org.thingsboard.server.common.data.id.AlarmId; 32 import org.thingsboard.server.common.data.id.AlarmId;
38 import org.thingsboard.server.common.data.id.CustomerId; 33 import org.thingsboard.server.common.data.id.CustomerId;
39 import org.thingsboard.server.common.data.id.EntityId; 34 import org.thingsboard.server.common.data.id.EntityId;
@@ -41,13 +36,8 @@ import org.thingsboard.server.common.data.id.TenantId; @@ -41,13 +36,8 @@ import org.thingsboard.server.common.data.id.TenantId;
41 import org.thingsboard.server.common.data.page.PageData; 36 import org.thingsboard.server.common.data.page.PageData;
42 import org.thingsboard.server.common.data.page.TimePageLink; 37 import org.thingsboard.server.common.data.page.TimePageLink;
43 import org.thingsboard.server.common.data.query.AlarmData; 38 import org.thingsboard.server.common.data.query.AlarmData;
44 -import org.thingsboard.server.common.data.query.AlarmDataPageLink;  
45 import org.thingsboard.server.common.data.query.AlarmDataQuery; 39 import org.thingsboard.server.common.data.query.AlarmDataQuery;
46 -import org.thingsboard.server.common.data.relation.EntityRelation;  
47 -import org.thingsboard.server.common.data.relation.EntityRelationsQuery;  
48 -import org.thingsboard.server.common.data.relation.EntitySearchDirection;  
49 -import org.thingsboard.server.common.data.relation.RelationTypeGroup;  
50 -import org.thingsboard.server.common.data.relation.RelationsSearchParameters; 40 +import org.thingsboard.server.common.data.relation.*;
51 import org.thingsboard.server.dao.entity.AbstractEntityService; 41 import org.thingsboard.server.dao.entity.AbstractEntityService;
52 import org.thingsboard.server.dao.entity.EntityService; 42 import org.thingsboard.server.dao.entity.EntityService;
53 import org.thingsboard.server.dao.exception.DataValidationException; 43 import org.thingsboard.server.dao.exception.DataValidationException;
@@ -57,13 +47,7 @@ import org.thingsboard.server.dao.tenant.TenantDao; @@ -57,13 +47,7 @@ import org.thingsboard.server.dao.tenant.TenantDao;
57 import javax.annotation.Nullable; 47 import javax.annotation.Nullable;
58 import javax.annotation.PostConstruct; 48 import javax.annotation.PostConstruct;
59 import javax.annotation.PreDestroy; 49 import javax.annotation.PreDestroy;
60 -import java.util.ArrayList;  
61 -import java.util.Collection;  
62 -import java.util.Collections;  
63 -import java.util.Comparator;  
64 -import java.util.LinkedHashSet;  
65 -import java.util.List;  
66 -import java.util.Set; 50 +import java.util.*;
67 import java.util.concurrent.ExecutionException; 51 import java.util.concurrent.ExecutionException;
68 import java.util.concurrent.ExecutorService; 52 import java.util.concurrent.ExecutorService;
69 import java.util.concurrent.Executors; 53 import java.util.concurrent.Executors;
@@ -320,13 +304,10 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ @@ -320,13 +304,10 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
320 boolean hasNext = true; 304 boolean hasNext = true;
321 AlarmSeverity highestSeverity = null; 305 AlarmSeverity highestSeverity = null;
322 AlarmQuery query; 306 AlarmQuery query;
323 - while (hasNext) { 307 + while (hasNext && AlarmSeverity.CRITICAL != highestSeverity) {
324 query = new AlarmQuery(entityId, nextPageLink, alarmSearchStatus, alarmStatus, false, null); 308 query = new AlarmQuery(entityId, nextPageLink, alarmSearchStatus, alarmStatus, false, null);
325 PageData<AlarmInfo> alarms = alarmDao.findAlarms(tenantId, query); 309 PageData<AlarmInfo> alarms = alarmDao.findAlarms(tenantId, query);
326 310
327 - if(alarms.getData().isEmpty()) {  
328 - return null;  
329 - }  
330 if (alarms.hasNext()) { 311 if (alarms.hasNext()) {
331 nextPageLink = nextPageLink.nextPageLink(); 312 nextPageLink = nextPageLink.nextPageLink();
332 } else { 313 } else {
@@ -338,11 +319,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ @@ -338,11 +319,7 @@ public class BaseAlarmService extends AbstractEntityService implements AlarmServ
338 continue; 319 continue;
339 } 320 }
340 321
341 - if(severity == AlarmSeverity.CRITICAL) {  
342 - return severity;  
343 - }  
344 -  
345 - if (highestSeverity == null) { 322 + if (severity == AlarmSeverity.CRITICAL || highestSeverity == null) {
346 highestSeverity = severity; 323 highestSeverity = severity;
347 } else { 324 } else {
348 highestSeverity = highestSeverity.compareTo(severity) < 0 ? highestSeverity : severity; 325 highestSeverity = highestSeverity.compareTo(severity) < 0 ? highestSeverity : severity;