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

CalculatedField functionality support for Edge

Browse Source 
- changed find by TenantId to EntityId
This commit is contained in:
Yevhenii 2025-06-09 13:25:22 +03:00
parent 411943d993
commit 2a42cb8a05
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/src/main/java/org/thingsboard/server/service/edge/rpc/processor/calculated/BaseCalculatedFieldProcessor.java
View File

@ -65,7 +65,7 @@ public abstract class BaseCalculatedFieldProcessor extends BaseEdgeProcessor {
}
String calculatedFieldName = calculatedField.getName();
CalculatedField calculatedFieldByName = edgeCtx.getCalculatedFieldService().findByTenantIdAndName(tenantId, calculatedFieldName);
CalculatedField calculatedFieldByName = edgeCtx.getCalculatedFieldService().findByEntityIdAndName(calculatedField.getEntityId(), calculatedFieldName);
if (calculatedFieldByName != null && !calculatedFieldByName.getId().equals(calculatedFieldId)) {
calculatedFieldName = calculatedFieldName + "_" + StringUtils.randomAlphabetic(15);
log.warn("[{}] calculatedField with name {} already exists. Renaming calculatedField name to {}",

2
common/dao-api/src/main/java/org/thingsboard/server/dao/cf/CalculatedFieldService.java
View File

@ -35,7 +35,7 @@ public interface CalculatedFieldService extends EntityDaoService {
CalculatedField findById(TenantId tenantId, CalculatedFieldId calculatedFieldId);
CalculatedField findByTenantIdAndName(TenantId tenantId, String name);
CalculatedField findByEntityIdAndName(EntityId entityId, String name);
List<CalculatedFieldId> findCalculatedFieldIdsByEntityId(TenantId tenantId, EntityId entityId);

8
dao/src/main/java/org/thingsboard/server/dao/cf/BaseCalculatedFieldService.java
View File

@ -100,11 +100,11 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
}
@Override
public CalculatedField findByTenantIdAndName(TenantId tenantId, String name) {
log.trace("Executing findByTenantIdAndName [{}], calculatedFieldName[{}]", tenantId, name);
validateId(tenantId, id -> INCORRECT_TENANT_ID + id);
public CalculatedField findByEntityIdAndName(EntityId entityId, String name) {
log.trace("Executing findByEntityIdAndName [{}], calculatedFieldName[{}]", entityId, name);
validateId(entityId.getId(), id -> INCORRECT_ENTITY_ID + id);
return calculatedFieldDao.findByTenantIdAndName(tenantId, name).orElse(null);
return calculatedFieldDao.findByEntityIdAndName(entityId, name).orElse(null);
}
@Override

2
dao/src/main/java/org/thingsboard/server/dao/cf/CalculatedFieldDao.java
View File

@ -36,7 +36,7 @@ public interface CalculatedFieldDao extends Dao<CalculatedField> {
List<CalculatedField> findAll();
Optional<CalculatedField> findByTenantIdAndName(TenantId tenantId, String name);
Optional<CalculatedField> findByEntityIdAndName(EntityId entityId, String name);
PageData<CalculatedField> findAll(PageLink pageLink);

2
dao/src/main/java/org/thingsboard/server/dao/sql/cf/CalculatedFieldRepository.java
View File

@ -28,7 +28,7 @@ public interface CalculatedFieldRepository extends JpaRepository<CalculatedField
boolean existsByTenantIdAndEntityId(UUID tenantId, UUID entityId);
CalculatedFieldEntity findByTenantIdAndName(UUID tenantId, String name);
CalculatedFieldEntity findByEntityIdAndName(UUID entityId, String name);
List<CalculatedFieldId> findCalculatedFieldIdsByTenantIdAndEntityId(UUID tenantId, UUID entityId);

4
dao/src/main/java/org/thingsboard/server/dao/sql/cf/JpaCalculatedFieldDao.java
View File

@ -67,8 +67,8 @@ public class JpaCalculatedFieldDao extends JpaAbstractDao<CalculatedFieldEntity,
}
@Override
public Optional<CalculatedField> findByTenantIdAndName(TenantId tenantId, String name) {
CalculatedField calculatedField = DaoUtil.getData(calculatedFieldRepository.findByTenantIdAndName(tenantId.getId(), name));
public Optional<CalculatedField> findByEntityIdAndName(EntityId entityId, String name) {
CalculatedField calculatedField = DaoUtil.getData(calculatedFieldRepository.findByEntityIdAndName(entityId.getId(), name));
return Optional.ofNullable(calculatedField);
}