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

Minor refactoring for AuditLogsCleanUpService and SqlPartitioningRepository

Browse Source
This commit is contained in:
ViacheslavKlimov 2022-10-12 10:12:29 +03:00
parent b4300b35bf
commit d2f67d33d1
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
application/src/main/java/org/thingsboard/server/service/ttl/AuditLogsCleanUpService.java
View File

@ -18,7 +18,6 @@ package org.thingsboard.server.service.ttl;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value; import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression; import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Scheduled; import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.thingsboard.server.dao.audit.AuditLogDao; import org.thingsboard.server.dao.audit.AuditLogDao;
@ -30,8 +29,7 @@ import java.util.concurrent.TimeUnit;
import static org.thingsboard.server.dao.model.ModelConstants.AUDIT_LOG_COLUMN_FAMILY_NAME; import static org.thingsboard.server.dao.model.ModelConstants.AUDIT_LOG_COLUMN_FAMILY_NAME;
@Service @Service
@ConditionalOnProperty(name = "sql.ttl.audit_logs.enabled", havingValue = "true") @ConditionalOnExpression("${sql.ttl.audit_logs.enabled:true} && ${sql.ttl.audit_logs.ttl:0} > 0")
@ConditionalOnExpression("${sql.ttl.audit_logs.ttl:0} > 0")
@Slf4j @Slf4j
public class AuditLogsCleanUpService extends AbstractCleanUpService { public class AuditLogsCleanUpService extends AbstractCleanUpService {

2
dao/src/main/java/org/thingsboard/server/dao/sqlts/insert/sql/SqlPartitioningRepository.java
View File

@ -129,7 +129,7 @@ public class SqlPartitioningRepository {
public List<Long> fetchPartitions(String table) { public List<Long> fetchPartitions(String table) {
List<Long> partitions = new ArrayList<>(); List<Long> partitions = new ArrayList<>();
List<String> partitionsTables = jdbcTemplate.queryForList(SELECT_PARTITIONS_STMT, new Object[]{table}, String.class); List<String> partitionsTables = jdbcTemplate.queryForList(SELECT_PARTITIONS_STMT, String.class, table);
for (String partitionTableName : partitionsTables) { for (String partitionTableName : partitionsTables) {
String partitionTsStr = partitionTableName.substring(table.length() + 1); String partitionTsStr = partitionTableName.substring(table.length() + 1);
try { try {