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

added one more filtering for metrics data

Browse Source
This commit is contained in:
YevhenBondarenko 2024-09-13 10:02:06 +02:00
parent 137b1732bb
commit 55b6b8c564
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
common/transport/mqtt/src/main/java/org/thingsboard/server/transport/mqtt/session/AbstractGatewaySessionHandler.java
View File

@ -398,14 +398,19 @@ public abstract class AbstractGatewaySessionHandler<T extends AbstractGatewayDev
var serverReceiveTs = System.currentTimeMillis(); var serverReceiveTs = System.currentTimeMillis();
var metricsData = metadata.stream() var metricsData = metadata.stream()
.filter(JsonElement::isJsonObject) .filter(JsonElement::isJsonObject)
.map(je -> { .map(JsonElement::getAsJsonObject)
var jo = je.getAsJsonObject(); .filter(jo -> jo.has("connector")
&& jo.has("receivedTs")
&& jo.has("publishedTs"))
.map(jo -> {
var connector = jo.get("connector").getAsString(); var connector = jo.get("connector").getAsString();
var receivedTs = jo.get("receivedTs").getAsLong(); var receivedTs = jo.get("receivedTs").getAsLong();
var publishedTs = jo.get("publishedTs").getAsLong(); var publishedTs = jo.get("publishedTs").getAsLong();
return new GatewayMetricsData(connector, receivedTs, publishedTs); return new GatewayMetricsData(connector, receivedTs, publishedTs);
}).toList(); }).toList();
gatewayMetricsService.process(deviceSessionCtx.getSessionInfo(), gateway.getDeviceId(), metricsData, serverReceiveTs); if (!metadata.isEmpty()) {
gatewayMetricsService.process(deviceSessionCtx.getSessionInfo(), gateway.getDeviceId(), metricsData, serverReceiveTs);
}
} }
protected void onDeviceTelemetryProto(int msgId, ByteBuf payload) throws AdaptorException { protected void onDeviceTelemetryProto(int msgId, ByteBuf payload) throws AdaptorException {