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

Removed maxAllowedScheduledUpdateIntervalInSecForCF from tenantProfileConfiguration

Browse Source
This commit is contained in:
dshvaika 2025-08-13 13:24:52 +03:00
parent ad511e9355
commit bf83848076
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
common/data/src/main/java/org/thingsboard/server/common/data/tenant/profile/DefaultTenantProfileConfiguration.java
View File

@ -174,8 +174,6 @@ public class DefaultTenantProfileConfiguration implements TenantProfileConfigura
private long maxArgumentsPerCF = 10; private long maxArgumentsPerCF = 10;
@Schema(example = "3600") @Schema(example = "3600")
private int minAllowedScheduledUpdateIntervalInSecForCF = 3600; private int minAllowedScheduledUpdateIntervalInSecForCF = 3600;
@Schema(example = "86400")
private int maxAllowedScheduledUpdateIntervalInSecForCF = 86400;
@Builder.Default @Builder.Default
@Min(value = 1, message = "must be at least 1") @Min(value = 1, message = "must be at least 1")
@Schema(example = "1000") @Schema(example = "1000")

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

@ -97,10 +97,10 @@ public class BaseCalculatedFieldService extends AbstractEntityService implements
if (!configuration.isScheduledUpdateEnabled()) { if (!configuration.isScheduledUpdateEnabled()) {
return; return;
} }
var defaultProfileConfiguration = tbTenantProfileCache.get(calculatedField.getTenantId()).getDefaultProfileConfiguration(); int tenantProfileMinAllowedValue = tbTenantProfileCache.get(calculatedField.getTenantId())
int min = defaultProfileConfiguration.getMinAllowedScheduledUpdateIntervalInSecForCF(); .getDefaultProfileConfiguration()
int max = defaultProfileConfiguration.getMaxAllowedScheduledUpdateIntervalInSecForCF(); .getMinAllowedScheduledUpdateIntervalInSecForCF();
configuration.setScheduledUpdateIntervalSec(Math.max(min, Math.min(configuration.getScheduledUpdateIntervalSec(), max))); configuration.setScheduledUpdateIntervalSec(Math.max(configuration.getScheduledUpdateIntervalSec(), tenantProfileMinAllowedValue));
} }
@Override @Override