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

Merge branch 'master' of github.com:thingsboard/thingsboard

Browse Source
This commit is contained in:
Andrii Shvaika 2022-01-20 13:24:12 +02:00
commit 522a68a1a8
7 changed files with 26 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/src/main/java/org/thingsboard/server/service/ttl/EdgeEventsCleanUpService.java
View File

@ -28,6 +28,9 @@ import org.thingsboard.server.queue.util.TbCoreComponent;
@Service @Service
public class EdgeEventsCleanUpService extends AbstractCleanUpService { public class EdgeEventsCleanUpService extends AbstractCleanUpService {
public static final String RANDOM_DELAY_INTERVAL_MS_EXPRESSION =
"#{T(org.apache.commons.lang3.RandomUtils).nextLong(0, ${sql.ttl.edge_events.execution_interval_ms})}";
@Value("${sql.ttl.edge_events.edge_events_ttl}") @Value("${sql.ttl.edge_events.edge_events_ttl}")
private long ttl; private long ttl;
@ -41,7 +44,7 @@ public class EdgeEventsCleanUpService extends AbstractCleanUpService {
this.edgeEventService = edgeEventService; this.edgeEventService = edgeEventService;
} }
@Scheduled(initialDelayString = "${sql.ttl.edge_events.execution_interval_ms}", fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}") @Scheduled(initialDelayString = RANDOM_DELAY_INTERVAL_MS_EXPRESSION, fixedDelayString = "${sql.ttl.edge_events.execution_interval_ms}")
public void cleanUp() { public void cleanUp() {
if (ttlTaskExecutionEnabled && isSystemTenantPartitionMine()) { if (ttlTaskExecutionEnabled && isSystemTenantPartitionMine()) {
edgeEventService.cleanupEvents(ttl); edgeEventService.cleanupEvents(ttl);

4
common/data/src/main/java/org/thingsboard/server/common/data/id/EdgeId.java
View File

@ -32,8 +32,8 @@ public class EdgeId extends UUIDBased implements EntityId {
super(id); super(id);
} }
public static EdgeId fromString(String integrationId) { public static EdgeId fromString(String edgeId) {
return new EdgeId(UUID.fromString(integrationId)); return new EdgeId(UUID.fromString(edgeId));
} }
@ApiModelProperty(position = 2, required = true, value = "string", example = "EDGE", allowableValues = "EDGE") @ApiModelProperty(position = 2, required = true, value = "string", example = "EDGE", allowableValues = "EDGE")

4
common/data/src/main/java/org/thingsboard/server/common/data/query/AlarmDataPageLink.java
View File

@ -18,7 +18,9 @@ package org.thingsboard.server.common.data.query;
import com.fasterxml.jackson.annotation.JsonIgnore; import com.fasterxml.jackson.annotation.JsonIgnore;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.Getter; import lombok.Getter;
import lombok.ToString;
import org.thingsboard.server.common.data.alarm.AlarmSearchStatus; import org.thingsboard.server.common.data.alarm.AlarmSearchStatus;
import org.thingsboard.server.common.data.alarm.AlarmSeverity; import org.thingsboard.server.common.data.alarm.AlarmSeverity;
import org.thingsboard.server.common.data.alarm.AlarmStatus; import org.thingsboard.server.common.data.alarm.AlarmStatus;
@ -26,6 +28,8 @@ import org.thingsboard.server.common.data.alarm.AlarmStatus;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
@AllArgsConstructor @AllArgsConstructor
public class AlarmDataPageLink extends EntityDataPageLink { public class AlarmDataPageLink extends EntityDataPageLink {

4
common/data/src/main/java/org/thingsboard/server/common/data/query/AssetSearchQueryFilter.java
View File

@ -16,10 +16,14 @@
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class AssetSearchQueryFilter extends EntitySearchQueryFilter { public class AssetSearchQueryFilter extends EntitySearchQueryFilter {
@Override @Override

4
common/data/src/main/java/org/thingsboard/server/common/data/query/DeviceSearchQueryFilter.java
View File

@ -16,10 +16,14 @@
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class DeviceSearchQueryFilter extends EntitySearchQueryFilter { public class DeviceSearchQueryFilter extends EntitySearchQueryFilter {
@Override @Override

4
common/data/src/main/java/org/thingsboard/server/common/data/query/EdgeSearchQueryFilter.java
View File

@ -16,10 +16,14 @@
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class EdgeSearchQueryFilter extends EntitySearchQueryFilter { public class EdgeSearchQueryFilter extends EntitySearchQueryFilter {
@Override @Override

4
common/data/src/main/java/org/thingsboard/server/common/data/query/EntityViewSearchQueryFilter.java
View File

@ -16,10 +16,14 @@
package org.thingsboard.server.common.data.query; package org.thingsboard.server.common.data.query;
import lombok.Data; import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.ToString;
import java.util.List; import java.util.List;
@Data @Data
@EqualsAndHashCode(callSuper = true)
@ToString(callSuper = true)
public class EntityViewSearchQueryFilter extends EntitySearchQueryFilter { public class EntityViewSearchQueryFilter extends EntitySearchQueryFilter {
@Override @Override