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

refactoring

Browse Source
This commit is contained in:
dashevchenko 2022-12-20 15:14:45 +02:00
parent 7203c15dec
commit 955369a7f1
1 changed files with 0 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dao/src/main/java/org/thingsboard/server/dao/alarm/BaseAlarmCommentService.java
View File

@ -76,24 +76,6 @@ public class BaseAlarmCommentService extends AbstractEntityService implements Al
return alarmCommentDao.findAlarmComments(tenantId, alarmId, pageLink); return alarmCommentDao.findAlarmComments(tenantId, alarmId, pageLink);
} }
private ListenableFuture<PageData<AlarmCommentInfo>> fetchAlarmCommentUserNames(TenantId tenantId, PageData<AlarmCommentInfo> alarmComments) {
List<ListenableFuture<AlarmCommentInfo>> alarmCommentFutures = new ArrayList<>(alarmComments.getData().size());
for (AlarmCommentInfo alarmCommentInfo : alarmComments.getData()) {
alarmCommentFutures.add(Futures.transform(
userService.findUserByIdAsync(tenantId, alarmCommentInfo.getUserId()), user -> {
if (user != null) {
alarmCommentInfo.setFirstName(user.getFirstName());
alarmCommentInfo.setLastName(user.getLastName());
}
return alarmCommentInfo;
}, MoreExecutors.directExecutor()
));
}
return Futures.transform(Futures.successfulAsList(alarmCommentFutures),
alarmCommentInfos -> new PageData<>(alarmCommentInfos, alarmComments.getTotalPages(), alarmComments.getTotalElements(),
alarmComments.hasNext()), MoreExecutors.directExecutor());
}
@Override @Override
public ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId) { public ListenableFuture<AlarmComment> findAlarmCommentByIdAsync(TenantId tenantId, AlarmCommentId alarmCommentId) {
log.trace("Executing findAlarmCommentByIdAsync [{}]", alarmCommentId); log.trace("Executing findAlarmCommentByIdAsync [{}]", alarmCommentId);