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

updated desscription

Browse Source
This commit is contained in:
IrynaMatveieva 2025-03-06 10:12:29 +02:00
parent 8e5cfb776d
commit b6b440fa2e
2 changed files with 33 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
application/src/main/java/org/thingsboard/server/service/cf/DefaultCalculatedFieldQueueService.java
View File

@ -93,10 +93,7 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
@Override @Override
public void pushRequestToQueue(TimeseriesSaveRequest request, FutureCallback<Void> callback) { public void pushRequestToQueue(TimeseriesSaveRequest request, FutureCallback<Void> callback) {
var tenantId = request.getTenantId(); pushRequestToQueue(request, null, callback);
var entityId = request.getEntityId();
checkEntityAndPushToQueue(tenantId, entityId, cf -> cf.matches(request.getEntries()), cf -> cf.linkMatches(entityId, request.getEntries()),
() -> toCalculatedFieldTelemetryMsgProto(request), callback);
} }
@Override @Override
@ -109,10 +106,7 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
@Override @Override
public void pushRequestToQueue(AttributesSaveRequest request, FutureCallback<Void> callback) { public void pushRequestToQueue(AttributesSaveRequest request, FutureCallback<Void> callback) {
var tenantId = request.getTenantId(); pushRequestToQueue(request, null, callback);
var entityId = request.getEntityId();
checkEntityAndPushToQueue(tenantId, entityId, cf -> cf.matches(request.getEntries(), request.getScope()), cf -> cf.linkMatches(entityId, request.getEntries(), request.getScope()),
() -> toCalculatedFieldTelemetryMsgProto(request), callback);
} }
@Override @Override
@ -170,10 +164,6 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
}; };
} }
private ToCalculatedFieldMsg toCalculatedFieldTelemetryMsgProto(TimeseriesSaveRequest request) {
return toCalculatedFieldTelemetryMsgProto(request, null);
}
private ToCalculatedFieldMsg toCalculatedFieldTelemetryMsgProto(TimeseriesSaveRequest request, TimeseriesSaveResult result) { private ToCalculatedFieldMsg toCalculatedFieldTelemetryMsgProto(TimeseriesSaveRequest request, TimeseriesSaveResult result) {
ToCalculatedFieldMsg.Builder msg = ToCalculatedFieldMsg.newBuilder(); ToCalculatedFieldMsg.Builder msg = ToCalculatedFieldMsg.newBuilder();
@ -194,10 +184,6 @@ public class DefaultCalculatedFieldQueueService implements CalculatedFieldQueueS
return msg.build(); return msg.build();
} }
private ToCalculatedFieldMsg toCalculatedFieldTelemetryMsgProto(AttributesSaveRequest request) {
return toCalculatedFieldTelemetryMsgProto(request, null);
}
private ToCalculatedFieldMsg toCalculatedFieldTelemetryMsgProto(AttributesSaveRequest request, List<Long> versions) { private ToCalculatedFieldMsg toCalculatedFieldTelemetryMsgProto(AttributesSaveRequest request, List<Long> versions) {
ToCalculatedFieldMsg.Builder msg = ToCalculatedFieldMsg.newBuilder(); ToCalculatedFieldMsg.Builder msg = ToCalculatedFieldMsg.newBuilder();

69
rule-engine/rule-engine-components/src/main/java/org/thingsboard/rule/engine/telemetry/TbCalculatedFieldsNode.java
View File

@ -16,7 +16,6 @@
package org.thingsboard.rule.engine.telemetry; package org.thingsboard.rule.engine.telemetry;
import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.FutureCallback;
import com.google.gson.JsonParser; import com.google.gson.JsonParser;
import jakarta.annotation.Nullable; import jakarta.annotation.Nullable;
@ -43,24 +42,23 @@ import org.thingsboard.server.common.data.plugin.ComponentType;
import org.thingsboard.server.common.msg.TbMsg; import org.thingsboard.server.common.msg.TbMsg;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.Optional;
import static org.thingsboard.server.common.data.DataConstants.SCOPE; import static org.thingsboard.server.common.data.DataConstants.SCOPE;
import static org.thingsboard.server.common.data.msg.TbMsgType.ATTRIBUTES_DELETED;
import static org.thingsboard.server.common.data.msg.TbMsgType.POST_ATTRIBUTES_REQUEST;
import static org.thingsboard.server.common.data.msg.TbMsgType.POST_TELEMETRY_REQUEST;
import static org.thingsboard.server.common.data.msg.TbMsgType.TIMESERIES_DELETED;
@Slf4j @Slf4j
@RuleNode( @RuleNode(
type = ComponentType.ACTION, type = ComponentType.ACTION,
name = "push to calculated fields", name = "apply to calculated fields",
configClazz = EmptyNodeConfiguration.class, configClazz = EmptyNodeConfiguration.class,
nodeDescription = "Pushes messages to the calculated fields for further processing", nodeDescription = "Processes incoming messages for calculated fields",
nodeDetails = "Forwards incoming messages to the calculated fields, where they will be processed to compute values based on predefined calculation rules without persisting any data in the database.", nodeDetails = "This node processes incoming messages to update telemetry or attributes for predefined calculated fields without storing the original telemetry or attributes in the database. " +
"It ensures that calculated fields receive and process the necessary data without persisting the incoming values.",
configDirective = "tbNodeEmptyConfig", configDirective = "tbNodeEmptyConfig",
icon = "send" icon = "call_made"
) )
public class TbCalculatedFieldsNode implements TbNode { public class TbCalculatedFieldsNode implements TbNode {
@ -73,29 +71,20 @@ public class TbCalculatedFieldsNode implements TbNode {
@Override @Override
public void onMsg(TbContext ctx, TbMsg msg) { public void onMsg(TbContext ctx, TbMsg msg) {
if (!msg.isTypeOneOf(POST_ATTRIBUTES_REQUEST, POST_TELEMETRY_REQUEST, ATTRIBUTES_DELETED, TIMESERIES_DELETED)) { switch (msg.getInternalType()) {
ctx.tellFailure(msg, new IllegalArgumentException("Unsupported msg type: " + msg.getType())); case POST_TELEMETRY_REQUEST -> processPostTelemetryRequest(ctx, msg);
return; case POST_ATTRIBUTES_REQUEST -> processPostAttributesRequest(ctx, msg);
case TIMESERIES_DELETED -> processTimeSeriesDeleted(ctx, msg);
case ATTRIBUTES_DELETED -> processAttributesDeleted(ctx, msg);
default -> ctx.tellFailure(msg, new IllegalArgumentException("Unsupported msg type: " + msg.getType()));
}
} }
String src = msg.getData(); private void processPostTelemetryRequest(TbContext ctx, TbMsg msg) {
Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToTelemetry(JsonParser.parseString(msg.getData()), System.currentTimeMillis());
if (msg.isTypeOf(POST_TELEMETRY_REQUEST)) {
processPostTelemetryRequest(ctx, msg, src);
} else if (msg.isTypeOf(POST_ATTRIBUTES_REQUEST)) {
processPostAttributesRequest(ctx, msg, src);
} else if (msg.isTypeOf(TIMESERIES_DELETED)) {
processTimeSeriesDeleted(ctx, msg, src);
} else {
processAttributesDeleted(ctx, msg, src);
}
}
private void processPostTelemetryRequest(TbContext ctx, TbMsg msg, String src) {
Map<Long, List<KvEntry>> tsKvMap = JsonConverter.convertToTelemetry(JsonParser.parseString(src), System.currentTimeMillis());
if (tsKvMap.isEmpty()) { if (tsKvMap.isEmpty()) {
ctx.tellFailure(msg, new IllegalArgumentException("Msg body is empty: " + src)); ctx.tellFailure(msg, new IllegalArgumentException("Msg body is empty: " + msg.getData()));
return; return;
} }
@ -120,8 +109,8 @@ public class TbCalculatedFieldsNode implements TbNode {
ctx.getCalculatedFieldQueueService().pushRequestToQueue(timeseriesSaveRequest, timeseriesSaveRequest.getCallback()); ctx.getCalculatedFieldQueueService().pushRequestToQueue(timeseriesSaveRequest, timeseriesSaveRequest.getCallback());
} }
private void processPostAttributesRequest(TbContext ctx, TbMsg msg, String src) { private void processPostAttributesRequest(TbContext ctx, TbMsg msg) {
List<AttributeKvEntry> newAttributes = new ArrayList<>(JsonConverter.convertToAttributes(JsonParser.parseString(src))); List<AttributeKvEntry> newAttributes = new ArrayList<>(JsonConverter.convertToAttributes(JsonParser.parseString(msg.getData())));
if (newAttributes.isEmpty()) { if (newAttributes.isEmpty()) {
ctx.tellSuccess(msg); ctx.tellSuccess(msg);
@ -141,10 +130,11 @@ public class TbCalculatedFieldsNode implements TbNode {
ctx.getCalculatedFieldQueueService().pushRequestToQueue(attributesSaveRequest, attributesSaveRequest.getCallback()); ctx.getCalculatedFieldQueueService().pushRequestToQueue(attributesSaveRequest, attributesSaveRequest.getCallback());
} }
private void processTimeSeriesDeleted(TbContext ctx, TbMsg msg, String src) { private void processTimeSeriesDeleted(TbContext ctx, TbMsg msg) {
JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData()); List<String> keysToDelete = Optional.ofNullable(
List<String> keysToDelete = JacksonUtil.convertValue(dataJson.get("timeSeries"), new TypeReference<>() { JacksonUtil.convertValue(JacksonUtil.toJsonNode(msg.getData()).get("timeseries"), new TypeReference<List<String>>() {
}); })
).orElse(Collections.emptyList());
if (keysToDelete.isEmpty()) { if (keysToDelete.isEmpty()) {
ctx.tellSuccess(msg); ctx.tellSuccess(msg);
@ -161,10 +151,12 @@ public class TbCalculatedFieldsNode implements TbNode {
.callback(new FutureCallback<List<String>>() { .callback(new FutureCallback<List<String>>() {
@Override @Override
public void onSuccess(@Nullable List<String> tmp) { public void onSuccess(@Nullable List<String> tmp) {
ctx.tellSuccess(msg);
} }
@Override @Override
public void onFailure(Throwable t) { public void onFailure(Throwable t) {
ctx.tellFailure(msg, t);
} }
}) })
.build(); .build();
@ -172,10 +164,11 @@ public class TbCalculatedFieldsNode implements TbNode {
ctx.getCalculatedFieldQueueService().pushRequestToQueue(timeseriesDeleteRequest, keysToDelete, getCalculatedFieldCallback(timeseriesDeleteRequest.getCallback(), keysToDelete)); ctx.getCalculatedFieldQueueService().pushRequestToQueue(timeseriesDeleteRequest, keysToDelete, getCalculatedFieldCallback(timeseriesDeleteRequest.getCallback(), keysToDelete));
} }
private void processAttributesDeleted(TbContext ctx, TbMsg msg, String src) { private void processAttributesDeleted(TbContext ctx, TbMsg msg) {
JsonNode dataJson = JacksonUtil.toJsonNode(msg.getData()); List<String> keysToDelete = Optional.ofNullable(
List<String> keysToDelete = JacksonUtil.convertValue(dataJson.get("attributes"), new TypeReference<>() { JacksonUtil.convertValue(JacksonUtil.toJsonNode(msg.getData()).get("attributes"), new TypeReference<List<String>>() {
}); })
).orElse(Collections.emptyList());
if (keysToDelete.isEmpty()) { if (keysToDelete.isEmpty()) {
ctx.tellSuccess(msg); ctx.tellSuccess(msg);