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

added ordering by id

Browse Source
This commit is contained in:
dashevchenko 2024-11-18 17:18:56 +02:00
parent ec7e615559
commit 7d088bda02
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
application/src/main/java/org/thingsboard/server/service/subscription/DefaultTbEntityDataSubscriptionService.java
View File

@ -470,7 +470,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
List<UUID> alarmIds = alarmService.findActiveOriginatorAlarms(subscription.getTenantId(), originatorAlarmFilter, alarmsPerAlarmStatusSubscriptionCacheSize); List<UUID> alarmIds = alarmService.findActiveOriginatorAlarms(subscription.getTenantId(), originatorAlarmFilter, alarmsPerAlarmStatusSubscriptionCacheSize);
subscription.getAlarmIds().addAll(alarmIds); subscription.getAlarmIds().addAll(alarmIds);
subscription.setFullCache(alarmIds.size() == alarmsPerAlarmStatusSubscriptionCacheSize); subscription.setCacheFull(alarmIds.size() == alarmsPerAlarmStatusSubscriptionCacheSize);
} }
private void sendUpdate(String sessionId, CmdUpdate update) { private void sendUpdate(String sessionId, CmdUpdate update) {
@ -487,7 +487,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
if (!subscription.matches(alarm) || subscriptionUpdate.isAlarmDeleted()) { if (!subscription.matches(alarm) || subscriptionUpdate.isAlarmDeleted()) {
alarmsIds.remove(alarm.getId().getId()); alarmsIds.remove(alarm.getId().getId());
if (alarmsIds.isEmpty()) { if (alarmsIds.isEmpty()) {
if (subscription.isFullCache()) { if (subscription.isCacheFull()) {
fetchActiveAlarms(subscription); fetchActiveAlarms(subscription);
if (alarmsIds.isEmpty()) { if (alarmsIds.isEmpty()) {
sendUpdate(subscription.getSessionId(), subscription.createUpdate()); sendUpdate(subscription.getSessionId(), subscription.createUpdate());
@ -504,7 +504,7 @@ public class DefaultTbEntityDataSubscriptionService implements TbEntityDataSubsc
sendUpdate(subscription.getSessionId(), subscription.createUpdate()); sendUpdate(subscription.getSessionId(), subscription.createUpdate());
} }
} else { } else {
subscription.setFullCache(true); subscription.setCacheFull(true);
} }
} }
} catch (Exception e) { } catch (Exception e) {

2
application/src/main/java/org/thingsboard/server/service/subscription/TbAlarmStatusSubscription.java
View File

@ -38,7 +38,7 @@ public class TbAlarmStatusSubscription extends TbSubscription<AlarmSubscriptionU
private final Set<UUID> alarmIds = new HashSet<>(); private final Set<UUID> alarmIds = new HashSet<>();
@Getter @Getter
@Setter @Setter
private boolean fullCache; private boolean cacheFull;
@Getter @Getter
private final List<String> typeList; private final List<String> typeList;
@Getter @Getter

2
dao/src/main/java/org/thingsboard/server/dao/sql/alarm/AlarmRepository.java
View File

@ -408,7 +408,7 @@ public interface AlarmRepository extends JpaRepository<AlarmEntity, UUID> {
"WHERE a.originator_id = :originatorId " + "WHERE a.originator_id = :originatorId " +
"AND (COALESCE(:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " + "AND (COALESCE(:alarmTypes) IS NULL OR a.type IN (:alarmTypes)) " +
"AND (COALESCE(:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " + "AND (COALESCE(:alarmSeverities) IS NULL OR a.severity IN (:alarmSeverities)) " +
"AND (a.cleared = false) LIMIT :limit", nativeQuery = true) "AND (a.cleared = false) ORDER BY id LIMIT :limit", nativeQuery = true)
List<UUID> findActiveOriginatorAlarms(@Param("originatorId") UUID originatorId, List<UUID> findActiveOriginatorAlarms(@Param("originatorId") UUID originatorId,
@Param("alarmTypes") List<String> alarmTypes, @Param("alarmTypes") List<String> alarmTypes,
@Param("alarmSeverities") List<String> alarmSeverities, @Param("alarmSeverities") List<String> alarmSeverities,