From c84810aa1ed2104c16e114d87cc3df36be6bbf36 Mon Sep 17 00:00:00 2001 From: dashevchenko Date: Tue, 31 Mar 2026 16:46:32 +0300 Subject: [PATCH] refactoring --- .../coap/efento/CoapEfentoTransportResource.java | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java index dd23a20213..fb3abca4fb 100644 --- a/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java +++ b/common/transport/coap/src/main/java/org/thingsboard/server/transport/coap/efento/CoapEfentoTransportResource.java @@ -260,10 +260,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource { Map valuesMap = new TreeMap<>(); // general measurements per message - Optional channel1 = protoMeasurements.getChannelsList().stream() - .findFirst(); - long startTs = channel1.map(value -> TimeUnit.SECONDS.toMillis(value.getTimestamp())).orElseGet(System::currentTimeMillis); - valuesMap.put(startTs, CoapEfentoUtils.setDefaultMeasurements(serialNumber, batteryStatus, nextTransmissionAtMillis, signal)); + valuesMap.put(TimeUnit.SECONDS.toMillis(channelsList.get(0).getTimestamp()), CoapEfentoUtils.setDefaultMeasurements(serialNumber, batteryStatus, nextTransmissionAtMillis, signal)); for (int channel = 0; channel < channelsList.size(); channel++) { ProtoChannel protoChannel = channelsList.get(channel); @@ -280,7 +277,7 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource { // measurements per channel JsonObject tsValues = valuesMap.computeIfAbsent(startTimestampMillis, k -> new JsonObject()); - tsValues.addProperty("measurement_interval", measurementPeriod); + tsValues.addProperty("measurement_interval_" + channel, measurementPeriod); for (int i = 0; i < sampleOffsetsList.size(); i++) { int sampleOffset = sampleOffsetsList.get(i); @@ -311,10 +308,6 @@ public class CoapEfentoTransportResource extends AbstractCoapTransportResource { } } - if (CollectionUtils.isEmpty(valuesMap)) { - throw new IllegalStateException("[" + sessionId + "]: Failed to collect Efento measurements, reason, values map is empty!"); - } - return valuesMap.entrySet().stream() .map(entry -> new EfentoTelemetry(entry.getKey(), entry.getValue())) .collect(Collectors.toList());