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

EDQS: added error handling while data sync

Browse Source
This commit is contained in:
dashevchenko 2025-04-07 14:43:26 +03:00
parent 7e010385f1
commit 1f242df5eb
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
application/src/main/java/org/thingsboard/server/service/edqs/EdqsSyncService.java
View File

@ -161,13 +161,17 @@ public abstract class EdqsSyncService {
private void processRelationBatch(List<RelationEntity> relations) { private void processRelationBatch(List<RelationEntity> relations) {
for (RelationEntity relation : relations) { for (RelationEntity relation : relations) {
if (RelationTypeGroup.COMMON.name().equals(relation.getRelationTypeGroup())) { try {
EntityIdInfo entityIdInfo = entityInfoMap.get(relation.getFromId()); if (RelationTypeGroup.COMMON.name().equals(relation.getRelationTypeGroup())) {
if (entityIdInfo != null) { EntityIdInfo entityIdInfo = entityInfoMap.get(relation.getFromId());
process(entityIdInfo.tenantId(), RELATION, relation.toData()); if (entityIdInfo != null) {
} else { process(entityIdInfo.tenantId(), RELATION, relation.toData());
log.info("Relation from id not found: {} ", relation); } else {
log.info("Relation from id not found: {} ", relation);
}
} }
} catch (Exception e) {
log.error("Failed to sync relation batch: {}", relation, e);
} }
} }
} }
@ -207,19 +211,23 @@ public abstract class EdqsSyncService {
private void processAttributeBatch(List<AttributeKvEntity> batch) { private void processAttributeBatch(List<AttributeKvEntity> batch) {
for (AttributeKvEntity attribute : batch) { for (AttributeKvEntity attribute : batch) {
attribute.setStrKey(getStrKeyOrFetchFromDb(attribute.getId().getAttributeKey())); try {
UUID entityId = attribute.getId().getEntityId(); attribute.setStrKey(getStrKeyOrFetchFromDb(attribute.getId().getAttributeKey()));
EntityIdInfo entityIdInfo = entityInfoMap.get(entityId); UUID entityId = attribute.getId().getEntityId();
if (entityIdInfo == null) { EntityIdInfo entityIdInfo = entityInfoMap.get(entityId);
log.debug("Skipping attribute with entity UUID {} as it is not found in entityInfoMap", entityId); if (entityIdInfo == null) {
continue; log.debug("Skipping attribute with entity UUID {} as it is not found in entityInfoMap", entityId);
continue;
}
AttributeKv attributeKv = new AttributeKv(
EntityIdFactory.getByTypeAndUuid(entityIdInfo.entityType(), entityId),
AttributeScope.valueOf(attribute.getId().getAttributeType()),
attribute.toData(),
attribute.getVersion());
process(entityIdInfo.tenantId(), ATTRIBUTE_KV, attributeKv);
} catch (Exception e) {
log.error("Failed to sync attribute batch: {}", attribute, e);
} }
AttributeKv attributeKv = new AttributeKv(
EntityIdFactory.getByTypeAndUuid(entityIdInfo.entityType(), entityId),
AttributeScope.valueOf(attribute.getId().getAttributeType()),
attribute.toData(),
attribute.getVersion());
process(entityIdInfo.tenantId(), ATTRIBUTE_KV, attributeKv);
} }
} }