From 94d0bb2b42311d80b29e55977e3e2b8024703451 Mon Sep 17 00:00:00 2001 From: Halit Aksoy Date: Sun, 19 Jan 2025 13:23:42 +0300 Subject: [PATCH] feat(backend): add timestamp data --- .../mercury/backend/BackendApplication.java | 37 ++++++++++--------- .../java/org/mercury/backend/SensorData.java | 2 +- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/backend/src/main/java/org/mercury/backend/BackendApplication.java b/backend/src/main/java/org/mercury/backend/BackendApplication.java index a9ecda4..14692f1 100644 --- a/backend/src/main/java/org/mercury/backend/BackendApplication.java +++ b/backend/src/main/java/org/mercury/backend/BackendApplication.java @@ -11,25 +11,28 @@ import org.springframework.web.bind.annotation.RestController; @RestController public class BackendApplication { - private SensorData sensorData; + private SensorData sensorData; - public static void main(String[] args) { - SpringApplication.run(BackendApplication.class, args); - } + public static void main(String[] args) { + SpringApplication.run(BackendApplication.class, args); + } - @GetMapping("/") - public String hello() { - return String.format("Server up and running!"); - } + @GetMapping("/") + public String hello() { + return String.format("Server up and running!"); + } - @PostMapping("/sensor") - SensorData newEmployee(@RequestBody SensorData sensorData) { - this.sensorData = sensorData; - return sensorData; - } + @PostMapping("/sensor") + SensorData newEmployee(@RequestBody SensorData sensorData) { + if (sensorData.timestamp() == null) { + sensorData = new SensorData(sensorData.temperature(), sensorData.humidity(), System.currentTimeMillis()); + } + this.sensorData = sensorData; + return sensorData; + } - @GetMapping("/sensor") - SensorData getSensorData() { - return sensorData; - } + @GetMapping("/sensor") + SensorData getSensorData() { + return sensorData; + } } \ No newline at end of file diff --git a/backend/src/main/java/org/mercury/backend/SensorData.java b/backend/src/main/java/org/mercury/backend/SensorData.java index 609f15a..41856bf 100644 --- a/backend/src/main/java/org/mercury/backend/SensorData.java +++ b/backend/src/main/java/org/mercury/backend/SensorData.java @@ -1,4 +1,4 @@ package org.mercury.backend; -public record SensorData(double temperature, double humidity) { +public record SensorData(double temperature, double humidity, Long timestamp) { }