From 0cd22631ab939b580dfca75dec393f4c78eb44f7 Mon Sep 17 00:00:00 2001
From: "Samuele E. Locatelli" <samuele@steamware.net>
Date: Sat, 23 Nov 2019 16:34:38 +0100
Subject: [PATCH] Modifica oggetto dataItem x ridurre dimensione oggetti da
 trasferire...

---
 MP-IO/Controllers/IOBController.cs |   4 +-
 MapoDb/MtcDataModelArchive.cs      |   4 +-
 MapoSDK/Objects.cs                 | 102 ++++++++---------------------
 3 files changed, 32 insertions(+), 78 deletions(-)

diff --git a/MP-IO/Controllers/IOBController.cs b/MP-IO/Controllers/IOBController.cs
index 42697b31..a9a9103d 100644
--- a/MP-IO/Controllers/IOBController.cs
+++ b/MP-IO/Controllers/IOBController.cs
@@ -414,11 +414,11 @@ namespace MP_IO.Controllers
         System.Web.HttpContext.Current.Request.InputStream.Position = 0;
 
         // procedo a deserializzare in blocco l'oggetto...
-        List<MTConnDataItem> dataItems = null;
+        List<machDataItem> dataItems = null;
         try
         {
           // deserializzo.
-          dataItems = JsonConvert.DeserializeObject<List<MTConnDataItem>>(content);
+          dataItems = JsonConvert.DeserializeObject<List<machDataItem>>(content);
           // se != null --> salvo!
           if (dataItems != null)
           {
diff --git a/MapoDb/MtcDataModelArchive.cs b/MapoDb/MtcDataModelArchive.cs
index ced619d9..b4b5b13e 100644
--- a/MapoDb/MtcDataModelArchive.cs
+++ b/MapoDb/MtcDataModelArchive.cs
@@ -17,7 +17,7 @@ namespace MapoDb
     /// <summary>
     /// Dizionario conf macchine
     /// </summary>
-    public Dictionary<string, List<MTConnDataItem>> machineDataItems = new Dictionary<string, List<MTConnDataItem>>();
+    public Dictionary<string, List<machDataItem>> machineDataItems = new Dictionary<string, List<machDataItem>>();
 
     /// <summary>
     /// Classe gestione archivio allarmi
@@ -36,7 +36,7 @@ namespace MapoDb
     /// <param name="idxMacchina"></param>
     /// <param name="currXmlDataModel"></param>
     /// <returns></returns>
-    public bool saveMachineDataItems(string idxMacchina, List<MTConnDataItem> dataItems)
+    public bool saveMachineDataItems(string idxMacchina, List<machDataItem> dataItems)
     {
       bool answ = false;
       try
diff --git a/MapoSDK/Objects.cs b/MapoSDK/Objects.cs
index 3eb75d54..c2555e18 100644
--- a/MapoSDK/Objects.cs
+++ b/MapoSDK/Objects.cs
@@ -549,85 +549,39 @@ namespace MapoSDK
     /// <summary>
     /// Setup della macchina
     /// </summary>
-    public List<MTConnDataItem> dataItems { get; set; }
+    public List<machDataItem> dataItems { get; set; }
   }
-
-  public class MTConnDataItem
+  /// <summary>
+  /// Descrittore oggetto DataItem generico
+  /// </summary>
+  public class machDataItem
   {
-    public MTConnDataItem()
+    public machDataItem()
     { }
-
-    [XmlAttribute("significantDigits")]
-    public int SignificantDigits { get; set; }
-    [XmlAttribute("respresentation")]
-    public string Representation { get; set; }
-    [XmlAttribute("sampleRate")]
-    public double SampleRate { get; set; }
-    [XmlAttribute("units")]
-    public string Units { get; set; }
-    [XmlAttribute("statistic")]
-    public string Statistic { get; set; }
-    [XmlAttribute("subType")]
-    public string SubType { get; set; }
-    [XmlAttribute("nativeUnits")]
-    public string NativeUnits { get; set; }
-    [XmlAttribute("nativeScale")]
-    public string NativeScale { get; set; }
-    [XmlAttribute("name")]
-    public string Name { get; set; }
-    [XmlAttribute("coordinateSystem")]
-    public string CoordinateSystem { get; set; }
-    [XmlAttribute("type")]
-    public string Type { get; set; }
-    [XmlAttribute("id")]
-    public string Id { get; set; }
-    [XmlAttribute("category")]
+    /// <summary>
+    /// ID generico
+    /// </summary>
+    public string uuid { get; set; }
+    /// <summary>
+    /// Categoria oggetto
+    /// </summary>
     public DataItemCategory Category { get; set; }
-    [XmlIgnore]
-    public string TypePath { get; set; }
-    [XmlIgnore]
-    public string XPath { get; set; }
-    [XmlElement("Source")]
-    public Source Source { get; set; }
-    [XmlElement("Constraints")]
-    public Constraints Constraints { get; set; }
-  }
-
-  public class Source
-  {
-    public Source()
-    { }
-
-    [XmlAttribute("componentId")]
-    public string ComponentID { get; set; }
-    [XmlAttribute("dataItemId")]
-    public string DataItemID { get; set; }
-    [XmlText]
-    public string CDATA { get; set; }
-  }
-
-  public class Constraints
-  {
-    [XmlElement("Filter")]
-    public Filter Filter;
-
-    public Constraints()
-    { }
-
-    [XmlElement("Maximum")]
-    public string Maximum { get; set; }
-    [XmlElement("Minimum")]
-    public string Minimum { get; set; }
-    [XmlElement("Value")]
-    public string Value { get; set; }
-  }
-  public class Filter
-  {
-    public Filter()
-    { }
-
-    [XmlAttribute("type")]
+    /// <summary>
+    /// Nome / descrizione
+    /// </summary>
+    public string Name { get; set; }
+    /// <summary>
+    /// Tipologia principale
+    /// </summary>
     public string Type { get; set; }
+    /// <summary>
+    /// Tipologia specifica
+    /// </summary>
+    public string SubType { get; set; }
+    /// <summary>
+    /// Unità di misura
+    /// </summary>
+    public string Units { get; set; }
   }
 
   #endregion