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

minor refactoring

Browse Source
This commit is contained in:
YevhenBondarenko 2023-08-01 16:17:51 +02:00
parent b8954da47b
commit ccdb0212a8
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,6 +98,6 @@ public interface AlarmDao extends Dao<Alarm> {
long countAlarmsByQuery(TenantId tenantId, CustomerId customerId, AlarmCountQuery query); long countAlarmsByQuery(TenantId tenantId, CustomerId customerId, AlarmCountQuery query);
List<EntitySubtype> findTenantAlarmTypesAsync(UUID tenantId); List<EntitySubtype> findTenantAlarmTypes(UUID tenantId);
} }

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

@ -401,7 +401,7 @@ public class BaseAlarmService extends AbstractCachedEntityService<TenantId, Arra
log.trace("Executing findAlarmTypesByTenantId, tenantId [{}]", tenantId); log.trace("Executing findAlarmTypesByTenantId, tenantId [{}]", tenantId);
validateId(tenantId, INCORRECT_TENANT_ID + tenantId); validateId(tenantId, INCORRECT_TENANT_ID + tenantId);
return cache.getAndPutInTransaction(tenantId, () -> return cache.getAndPutInTransaction(tenantId, () ->
alarmDao.findTenantAlarmTypesAsync(tenantId.getId()).stream() alarmDao.findTenantAlarmTypes(tenantId.getId()).stream()
.sorted(Comparator.comparing(EntitySubtype::getType)) .sorted(Comparator.comparing(EntitySubtype::getType))
.collect(Collectors.toCollection(ArrayList::new)), false); .collect(Collectors.toCollection(ArrayList::new)), false);
} }

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

@ -370,7 +370,7 @@ public class JpaAlarmDao extends JpaAbstractDao<AlarmEntity, Alarm> implements A
} }
@Override @Override
public List<EntitySubtype> findTenantAlarmTypesAsync(UUID tenantId) { public List<EntitySubtype> findTenantAlarmTypes(UUID tenantId) {
return convertTenantEntityTypesToDto(tenantId, EntityType.ALARM, alarmRepository.findTenantAlarmTypes(tenantId)); return convertTenantEntityTypesToDto(tenantId, EntityType.ALARM, alarmRepository.findTenantAlarmTypes(tenantId));
} }