From 98c08201f3580519845e3ba98b91c107c825ef91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Patrick=20Ha=C3=9Fel?= Date: Tue, 18 Nov 2025 08:28:03 +0100 Subject: [PATCH] EspHome --- .../java/de/ph87/data/topic/TopicType.java | 2 + .../de/ph87/data/topic/parser/EspHome.java | 58 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 src/main/java/de/ph87/data/topic/parser/EspHome.java diff --git a/src/main/java/de/ph87/data/topic/TopicType.java b/src/main/java/de/ph87/data/topic/TopicType.java index ef8971a..ff87a4f 100644 --- a/src/main/java/de/ph87/data/topic/TopicType.java +++ b/src/main/java/de/ph87/data/topic/TopicType.java @@ -1,5 +1,6 @@ package de.ph87.data.topic; +import de.ph87.data.topic.parser.EspHome; import de.ph87.data.topic.parser.PatrixOpenDtu; import de.ph87.data.topic.parser.PatrixSmartMeter; import de.ph87.data.topic.parser.ShellyPlus1PM; @@ -12,6 +13,7 @@ public enum TopicType { PatrixSmartMeter(PatrixSmartMeter.class), TasmotaSmartMeter(TasmotaSmartMeter.class), ShellyPlus1PM(ShellyPlus1PM.class), + EspHome(EspHome.class), ; public final Class clazz; diff --git a/src/main/java/de/ph87/data/topic/parser/EspHome.java b/src/main/java/de/ph87/data/topic/parser/EspHome.java new file mode 100644 index 0000000..1b07172 --- /dev/null +++ b/src/main/java/de/ph87/data/topic/parser/EspHome.java @@ -0,0 +1,58 @@ +package de.ph87.data.topic.parser; + +import com.fasterxml.jackson.annotation.JsonProperty; +import de.ph87.data.series.data.delta.DeltaService; +import de.ph87.data.series.data.varying.VaryingService; +import de.ph87.data.topic.TopicDto; +import de.ph87.data.topic.TopicParserAbstract; +import lombok.NonNull; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; +import tools.jackson.databind.ObjectMapper; + +import java.time.Instant; +import java.time.ZoneId; +import java.time.ZonedDateTime; + +@Slf4j +@Service +public class EspHome extends TopicParserAbstract { + + public EspHome(@NonNull final ObjectMapper mapper, @NonNull final DeltaService deltaService, @NonNull final VaryingService varyingService) { + super(Dto.class, mapper, deltaService, varyingService); + } + + @Override + protected void handle2(@NonNull final TopicDto topic, @NonNull final Dto dto) { + if (topic.series0 != null) { + if (topic.series0.unit.equals(dto.unit)) { + varying(topic.series0, dto.date, dto.value); + } else { + log.warn("Unit mismatch: dto={}, series={}", dto, topic.series0); + } + } + } + + public static class Dto { + + @NonNull + public final ZonedDateTime date; + + public final double value; + + @NonNull + public final String unit; + + public Dto( + @JsonProperty(value = "timestamp", required = true) @NonNull final long epochSeconds, + @JsonProperty(value = "value", required = true) final double value, + @JsonProperty(value = "unit", required = true) final String unit + ) { + this.date = ZonedDateTime.ofInstant(Instant.ofEpochSecond(epochSeconds), ZoneId.systemDefault()); + this.value = value; + this.unit = unit; + } + + } + +}