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

Refactor SaveEntityEvent to make it more generic in EdgeEventSourcingListener

Browse Source
This commit is contained in:
Andrii Landiak 2024-01-16 09:24:45 +02:00
parent 28e9aae2e5
commit 67fe8067b7
1 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
application/src/main/java/org/thingsboard/server/service/edge/EdgeEventSourcingListener.java
View File

@ -80,24 +80,16 @@ public class EdgeEventSourcingListener {
} }
log.trace("[{}] SaveEntityEvent called: {}", event.getTenantId(), event); log.trace("[{}] SaveEntityEvent called: {}", event.getTenantId(), event);
boolean isAdded = Boolean.TRUE.equals(event.getAdded()); boolean isAdded = Boolean.TRUE.equals(event.getAdded());
EdgeEventActionType action = isAdded ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED; String body = getBodyMsgForEntityEvent(event.getEntity());
if (event.getEntity() instanceof AlarmComment) { EdgeEventType type = getEdgeEventTypeForEntityEvent(event.getEntity());
processAlarmCommentEvent(event, isAdded); EdgeEventActionType action = getActionForEntityEvent(event.getEntity(), isAdded);
return;
}
tbClusterService.sendNotificationMsgToEdge(event.getTenantId(), null, event.getEntityId(), tbClusterService.sendNotificationMsgToEdge(event.getTenantId(), null, event.getEntityId(),
null, null, action, edgeSynchronizationManager.getEdgeId().get()); body, type, action, edgeSynchronizationManager.getEdgeId().get());
} catch (Exception e) { } catch (Exception e) {
log.error("[{}] failed to process SaveEntityEvent: {}", event.getTenantId(), event, e); log.error("[{}] failed to process SaveEntityEvent: {}", event.getTenantId(), event, e);
} }
} }
private void processAlarmCommentEvent(SaveEntityEvent<?> event, boolean added) {
EdgeEventActionType action = added ? EdgeEventActionType.ADDED_COMMENT : EdgeEventActionType.UPDATED_COMMENT;
tbClusterService.sendNotificationMsgToEdge(event.getTenantId(), null, event.getEntityId(),
JacksonUtil.toString(event.getEntity()), EdgeEventType.ALARM_COMMENT, action, edgeSynchronizationManager.getEdgeId().get());
}
@TransactionalEventListener(fallbackExecution = true) @TransactionalEventListener(fallbackExecution = true)
public void handleEvent(DeleteEntityEvent<?> event) { public void handleEvent(DeleteEntityEvent<?> event) {
try { try {
@ -207,4 +199,11 @@ public class EdgeEventSourcingListener {
} }
return null; return null;
} }
private EdgeEventActionType getActionForEntityEvent(Object entity, boolean isAdded) {
if (entity instanceof AlarmComment) {
return isAdded ? EdgeEventActionType.ADDED_COMMENT : EdgeEventActionType.UPDATED_COMMENT;
}
return isAdded ? EdgeEventActionType.ADDED : EdgeEventActionType.UPDATED;
}
} }