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

Add alarm info to mobile notification data

Browse Source
This commit is contained in:
ViacheslavKlimov 2024-02-28 12:54:05 +02:00
parent 076ccbba97
commit db975f4568
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/src/main/java/org/thingsboard/server/service/notification/channels/MobileAppNotificationChannel.java
View File

@ -84,7 +84,10 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
Map<String, String> data = Optional.ofNullable(processedTemplate.getAdditionalConfig()) Map<String, String> data = Optional.ofNullable(processedTemplate.getAdditionalConfig())
.map(JacksonUtil::toFlatMap).orElseGet(HashMap::new); .map(JacksonUtil::toFlatMap).orElseGet(HashMap::new);
NotificationInfo info = ctx.getRequest().getInfo(); NotificationInfo info = ctx.getRequest().getInfo();
Optional.ofNullable(info).map(NotificationInfo::getStateEntityId).ifPresent(stateEntityId -> { if (info == null) {
return data;
}
Optional.ofNullable(info.getStateEntityId()).ifPresent(stateEntityId -> {
data.put("stateEntityId", stateEntityId.getId().toString()); data.put("stateEntityId", stateEntityId.getId().toString());
data.put("stateEntityType", stateEntityId.getEntityType().name()); data.put("stateEntityType", stateEntityId.getEntityType().name());
if (!"true".equals(data.get("onClick.enabled")) && info.getDashboardId() != null) { if (!"true".equals(data.get("onClick.enabled")) && info.getDashboardId() != null) {
@ -94,6 +97,16 @@ public class MobileAppNotificationChannel implements NotificationChannel<User, M
data.put("onClick.dashboardId", info.getDashboardId().toString()); data.put("onClick.dashboardId", info.getDashboardId().toString());
} }
}); });
data.put("notificationType", ctx.getNotificationType().name());
switch (ctx.getNotificationType()) {
case ALARM:
case ALARM_ASSIGNMENT:
case ALARM_COMMENT:
info.getTemplateData().forEach((key, value) -> {
data.put("info." + key, value);
});
break;
}
return data; return data;
} }