Updated MQTT input models

TrakHound · Dec 10, 2023 · a6795b8 · a6795b8
1 parent 71ff0ad
commit a6795b8
Show file tree

Hide file tree

Showing 3 changed files with 43 additions and 6 deletions.
diff --git a/libraries/MTConnect.NET-MQTT/Input/MTConnectMqttInputDevices.cs b/libraries/MTConnect.NET-MQTT/Input/MTConnectMqttInputDevices.cs
@@ -0,0 +1,37 @@
+using MTConnect.Devices;
+using System.Collections.Generic;
+using System.Text.Json.Serialization;
+
+namespace MTConnect.Mqtt
+{
+    public class MTConnectMqttInputDevices
+    {
+        [JsonPropertyName("devices")]
+        public Dictionary<string, string> Devices { get; set; }
+
+
+        public MTConnectMqttInputDevices() { }
+
+        public MTConnectMqttInputDevices(IDevice device)
+        {
+            if (device != null && !string.IsNullOrEmpty(device.Uuid))
+            {
+
+            }
+        }
+
+        public MTConnectMqttInputDevices(IEnumerable<IDevice> devices)
+        {
+            if (!devices.IsNullOrEmpty())
+            {
+                foreach (var device in devices)
+                {
+                    if (device != null && !string.IsNullOrEmpty(device.Uuid))
+                    {
+
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/libraries/MTConnect.NET-MQTT/Input/MTConnectMqttInputObservation.cs b/libraries/MTConnect.NET-MQTT/Input/MTConnectMqttInputObservation.cs
@@ -5,8 +5,8 @@ namespace MTConnect.Mqtt
 {
     public class MTConnectMqttInputObservation
     {
-        [JsonPropertyName("dataItemKey")]
-        public string DataItemKey { get; set; }
+        [JsonPropertyName("dataItem")]
+        public string DataItem { get; set; }
 
         [JsonPropertyName("values")]
         public Dictionary<string, string> Values { get; set; }
@@ -16,7 +16,7 @@ public MTConnectMqttInputObservation() { }
 
         public MTConnectMqttInputObservation(string dataItemKey, Dictionary<string, string> values)
         {
-            DataItemKey = dataItemKey;
+            DataItem = dataItemKey;
             Values = values;
         }
     }

diff --git a/...NET-MQTT/Input/MTConnectMqttInputModel.cs → ...T/Input/MTConnectMqttInputObservations.cs b/...NET-MQTT/Input/MTConnectMqttInputModel.cs → ...T/Input/MTConnectMqttInputObservations.cs
@@ -8,7 +8,7 @@
 
 namespace MTConnect.Mqtt
 {
-    public class MTConnectMqttInputModel
+    public class MTConnectMqttInputObservations
     {
         [JsonPropertyName("timestamp")]
         public DateTime Timestamp { get; set; }
@@ -34,10 +34,10 @@ private static IEnumerable<IObservationInput> ToObservationInputs(DateTime times
 
                 foreach (var mqttObservation in mqttObservations)
                 {
-                    if (!string.IsNullOrEmpty(mqttObservation.DataItemKey) && !mqttObservation.Values.IsNullOrEmpty())
+                    if (!string.IsNullOrEmpty(mqttObservation.DataItem) && !mqttObservation.Values.IsNullOrEmpty())
                     {
                         var observation = new ObservationInput();
-                        observation.DataItemKey = mqttObservation.DataItemKey;
+                        observation.DataItemKey = mqttObservation.DataItem;
                         observation.Timestamp = ts;
 
                         foreach (var value in mqttObservation.Values)