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

refactored getOwnerName

Browse Source
This commit is contained in:
dashevchenko 2025-03-12 12:00:19 +02:00
parent 760d1cb280
commit 52c04a4e02
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
common/edqs/src/main/java/org/thingsboard/server/edqs/repo/TenantRepo.java
View File

@ -422,19 +422,19 @@ public class TenantRepo {
} }
public String getOwnerName(EntityId ownerId) { public String getOwnerName(EntityId ownerId) {
if (ownerId == null || (EntityType.CUSTOMER.equals(ownerId.getEntityType()) && CustomerId.NULL_UUID.equals(ownerId.getId()))) { if (ownerId == null || (ownerId.getEntityType() == EntityType.CUSTOMER && ownerId.isNullUid())) {
ownerId = tenantId; return getOwnerEntityName(tenantId);
} }
return getEntityName(ownerId); return getOwnerEntityName(ownerId);
} }
private String getEntityName(EntityId entityId) { private String getOwnerEntityName(EntityId entityId) {
EntityType entityType = entityId.getEntityType(); EntityType entityType = entityId.getEntityType();
if (entityType == EntityType.TENANT && entityId.getId().equals(TenantId.NULL_UUID)) {
return "";
}
return switch (entityType) { return switch (entityType) {
case CUSTOMER, TENANT -> getEntityMap(entityType).get(entityId.getId()).getFields().getName(); case CUSTOMER, TENANT -> {
EntityFields fields = getEntityMap(entityType).get(entityId.getId()).getFields();
yield fields != null ? fields.getName() : "";
}
default -> throw new RuntimeException("Unsupported entity type: " + entityType); default -> throw new RuntimeException("Unsupported entity type: " + entityType);
}; };
} }