feat(monitoring): add stationId to BatonDetection

12urenloop · Mar 8, 2023 · d28bbc0 · d28bbc0
1 parent f558b3c
commit d28bbc0
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/src/main/java/telraam/monitoring/BatonDetectionManager.java b/src/main/java/telraam/monitoring/BatonDetectionManager.java
@@ -60,7 +60,7 @@ public Map<Integer, List<BatonDetection>> getBatonDetections() {
             }
             var batonDetections = batonDetectionMap.get(batonId);
             var team = teamMap.get(batonTeamMap.get(batonId));
-            var batonDetection = new BatonDetection(Math.toIntExact(d.getTimestamp().getTime() / 1000), d.getRssi(), batonId, team.getName());
+            var batonDetection = new BatonDetection(Math.toIntExact(d.getTimestamp().getTime() / 1000), d.getRssi(),d.getStationId(), batonId, team.getName());
             batonDetections.add(batonDetection);
         });
         return batonDetectionMap;

diff --git a/src/main/java/telraam/monitoring/models/BatonDetection.java b/src/main/java/telraam/monitoring/models/BatonDetection.java
@@ -1,6 +1,7 @@
 package telraam.monitoring.models;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.models.auth.In;
 
 public class BatonDetection {
     @JsonProperty("detected_time")
@@ -9,12 +10,15 @@ public class BatonDetection {
     private Integer rssi;
     @JsonProperty("team_id")
     private Integer teamId;
+    @JsonProperty("station_id")
+    private Integer stationId;
     @JsonProperty("team_name")
     private String teamName;
 
-    public BatonDetection(Integer detectionTime, Integer rssi, Integer teamId, String teamName) {
+    public BatonDetection(Integer detectionTime, Integer rssi, Integer stationId, Integer teamId, String teamName) {
         this.detectionTime = detectionTime;
         this.rssi = rssi;
+        this.stationId = stationId;
         this.teamId = teamId;
         this.teamName = teamName;
     }
@@ -37,6 +41,12 @@ public Integer getTeamId() {
     public void setTeamId(Integer teamId) {
         this.teamId = teamId;
     }
+    public Integer getStationId() {
+        return stationId;
+    }
+    public void setStationId(Integer stationId) {
+        this.stationId = stationId;
+    }
     public String getTeamName() {
         return teamName;
     }