From 2478acc42d31c62f90fa511c47c79c03eb241a23 Mon Sep 17 00:00:00 2001 From: Volodymyr Babak Date: Mon, 14 Apr 2025 13:25:32 +0300 Subject: [PATCH] Refactoring - introduced new method - findActiveEdges for all tenants --- .../edge/rpc/processor/BaseEdgeProcessor.java | 19 ++++++------------- .../server/dao/edge/EdgeService.java | 2 ++ .../thingsboard/server/dao/edge/EdgeDao.java | 2 ++ .../server/dao/edge/EdgeServiceImpl.java | 7 +++++++ .../server/dao/sql/edge/EdgeRepository.java | 12 ++++++++++++ .../server/dao/sql/edge/JpaEdgeDao.java | 8 ++++++++ 6 files changed, 37 insertions(+), 13 deletions(-) diff --git a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java index 4356a1d60c..d622963737 100644 --- a/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java +++ b/application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/BaseEdgeProcessor.java @@ -65,7 +65,6 @@ import java.util.ArrayList; import java.util.List; import java.util.Optional; import java.util.UUID; -import java.util.concurrent.TimeUnit; import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReentrantLock; @@ -144,23 +143,17 @@ public abstract class BaseEdgeProcessor implements EdgeProcessor { protected ListenableFuture processActionForAllEdges(TenantId tenantId, EdgeEventType type, EdgeEventActionType actionType, EntityId entityId, JsonNode body, EdgeId sourceEdgeId) { + List> futures = new ArrayList<>(); if (TenantId.SYS_TENANT_ID.equals(tenantId)) { - PageDataIterable tenantIds = new PageDataIterable<>(link -> edgeCtx.getTenantService().findTenantsIds(link), 500); - for (TenantId tenantId1 : tenantIds) { - try { - List> sysTenantFutures = processActionForAllEdgesByTenantId(tenantId1, type, actionType, entityId, body, sourceEdgeId); - for (ListenableFuture future : sysTenantFutures) { - future.get(10, TimeUnit.SECONDS); - } - } catch (Exception e) { - log.error("Failed to process action for all edges by SYS_TENANT_ID. Failed tenantId = [{}]", tenantId1, e); - } + PageDataIterable edges = new PageDataIterable<>(link -> edgeCtx.getEdgeService().findActiveEdges(link), 1024); + for (Edge edge : edges) { + futures.add(saveEdgeEvent(edge.getTenantId(), edge.getId(), type, actionType, entityId, body)); } return Futures.immediateFuture(null); } else { - List> tenantFutures = processActionForAllEdgesByTenantId(tenantId, type, actionType, entityId, null, sourceEdgeId); - return Futures.transform(Futures.allAsList(tenantFutures), voids -> null, dbCallbackExecutorService); + futures = processActionForAllEdgesByTenantId(tenantId, type, actionType, entityId, null, sourceEdgeId); } + return Futures.transform(Futures.allAsList(futures), voids -> null, dbCallbackExecutorService); } private List> processActionForAllEdgesByTenantId(TenantId tenantId, diff --git a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java index 59ad6f64b3..a8993a4a37 100644 --- a/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java +++ b/common/dao-api/src/main/java/org/thingsboard/server/dao/edge/EdgeService.java @@ -47,6 +47,8 @@ public interface EdgeService extends EntityDaoService { Optional findEdgeByRoutingKey(TenantId tenantId, String routingKey); + PageData findActiveEdges(PageLink pageLink); + Edge saveEdge(Edge edge); Edge assignEdgeToCustomer(TenantId tenantId, EdgeId edgeId, CustomerId customerId); diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeDao.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeDao.java index fdb9144ab2..405b2446b0 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeDao.java @@ -41,6 +41,8 @@ public interface EdgeDao extends Dao, TenantEntityDao { EdgeInfo findEdgeInfoById(TenantId tenantId, UUID edgeId); + PageData findActiveEdges(PageLink pageLink); + PageData findEdgeIdsByTenantId(UUID tenantId, PageLink pageLink); PageData findEdgesByTenantId(UUID tenantId, PageLink pageLink); diff --git a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java index 8163109686..0655d05572 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java +++ b/dao/src/main/java/org/thingsboard/server/dao/edge/EdgeServiceImpl.java @@ -192,6 +192,13 @@ public class EdgeServiceImpl extends AbstractCachedEntityService findActiveEdges(PageLink pageLink) { + log.trace("Executing findActiveEdges [{}]", pageLink); + Validator.validatePageLink(pageLink); + return edgeDao.findActiveEdges(pageLink); + } + @Override public Edge saveEdge(Edge edge) { log.trace("Executing saveEdge [{}]", edge); diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/EdgeRepository.java b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/EdgeRepository.java index c11db0a348..bd1dda54b8 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/EdgeRepository.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/EdgeRepository.java @@ -44,6 +44,18 @@ public interface EdgeRepository extends JpaRepository { "WHERE d.id = :edgeId") EdgeInfoEntity findEdgeInfoById(@Param("edgeId") UUID edgeId); + @Query(value = "SELECT ee.id, ee.created_time, ee.additional_info, ee.customer_id, " + + "ee.root_rule_chain_id, ee.type, ee.name, ee.label, ee.routing_key, " + + "ee.secret, ee.tenant_id, ee.version " + + "FROM edge ee " + + "JOIN attribute_kv ON ee.id = attribute_kv.entity_id " + + "JOIN key_dictionary ON attribute_kv.attribute_key = key_dictionary.key_id " + + "WHERE attribute_kv.bool_v = true AND key_dictionary.key = 'active' " + + "AND (:textSearch IS NULL OR ee.name ILIKE CONCAT('%', :textSearch, '%')) " + + "ORDER BY ee.id", nativeQuery = true) + Page findActiveEdges(@Param("textSearch") String textSearch, + Pageable pageable); + @Query("SELECT d.id FROM EdgeEntity d WHERE d.tenantId = :tenantId " + "AND (:textSearch IS NULL OR ilike(d.name, CONCAT('%', :textSearch, '%')) = true)") Page findIdsByTenantId(@Param("tenantId") UUID tenantId, diff --git a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java index 3f45b1ca1a..50b8092731 100644 --- a/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java +++ b/dao/src/main/java/org/thingsboard/server/dao/sql/edge/JpaEdgeDao.java @@ -66,6 +66,14 @@ public class JpaEdgeDao extends JpaAbstractDao implements Edge return DaoUtil.getData(edgeRepository.findEdgeInfoById(edgeId)); } + @Override + public PageData findActiveEdges(PageLink pageLink) { + return DaoUtil.toPageData( + edgeRepository.findActiveEdges( + pageLink.getTextSearch(), + DaoUtil.toPageable(pageLink))); + } + @Override public PageData findEdgeIdsByTenantId(UUID tenantId, PageLink pageLink) { return DaoUtil.pageToPageData(