diff --git a/IOB-UT-NEXT/Config/IobConfTree.cs b/IOB-UT-NEXT/Config/IobConfTree.cs
index ee6d6996..bd244244 100644
--- a/IOB-UT-NEXT/Config/IobConfTree.cs
+++ b/IOB-UT-NEXT/Config/IobConfTree.cs
@@ -1,7 +1,7 @@
using IOB_UT_NEXT.Config;
using IOB_UT_NEXT.Config.Base;
using IOB_UT_NEXT.Config.Special;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using NLog;
diff --git a/IOB-UT-NEXT/IOB-UT-NEXT.csproj b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
index 298588a6..3b634451 100644
--- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj
+++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj
@@ -202,10 +202,10 @@
-
-
-
-
+
+
+
+
diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs
index c53a9160..ec58c572 100644
--- a/IOB-UT-NEXT/Iob/BaseObj.cs
+++ b/IOB-UT-NEXT/Iob/BaseObj.cs
@@ -588,6 +588,30 @@ namespace IOB_UT_NEXT.Iob
#endregion Protected Methods
+ #region Protected Serialization Helpers
+
+ ///
+ /// Serializza un oggetto in formato JSON.
+ ///
+ protected string JsonSerialize(T obj) => IOB_UT_NEXT.Services.DataSerializer.Serialize(obj);
+
+ ///
+ /// Deserializza una stringa JSON in un oggetto.
+ ///
+ protected T JsonDeserialize(string json) => IOB_UT_NEXT.Services.DataSerializer.Deserialize(json);
+
+ ///
+ /// Serializza un oggetto in formato XML.
+ ///
+ protected string XmlSerialize(T obj) => IOB_UT_NEXT.Services.XmlDataSerializer.Serialize(obj);
+
+ ///
+ /// Deserializza una stringa XML in un oggetto.
+ ///
+ protected T XmlDeserialize(string xml) => IOB_UT_NEXT.Services.XmlDataSerializer.Deserialize(xml);
+
+ #endregion Protected Serialization Helpers
+
#region Private Fields
///
diff --git a/IOB-UT-NEXT/Iob/Services/DataSerializer.cs b/IOB-UT-NEXT/Services/DataSerializer.cs
similarity index 98%
rename from IOB-UT-NEXT/Iob/Services/DataSerializer.cs
rename to IOB-UT-NEXT/Services/DataSerializer.cs
index d0bdad59..e1e2a1dd 100644
--- a/IOB-UT-NEXT/Iob/Services/DataSerializer.cs
+++ b/IOB-UT-NEXT/Services/DataSerializer.cs
@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Globalization;
using Newtonsoft.Json;
-namespace IOB_UT_NEXT.Iob.Services
+namespace IOB_UT_NEXT.Services
{
///
/// Gestisce tutte le operazioni di serializzazione e deserializzazione dei dati.
diff --git a/IOB-UT-NEXT/Iob/Services/HttpService.cs b/IOB-UT-NEXT/Services/HttpService.cs
similarity index 99%
rename from IOB-UT-NEXT/Iob/Services/HttpService.cs
rename to IOB-UT-NEXT/Services/HttpService.cs
index 9a2e5ab0..e3766674 100644
--- a/IOB-UT-NEXT/Iob/Services/HttpService.cs
+++ b/IOB-UT-NEXT/Services/HttpService.cs
@@ -7,7 +7,7 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
-namespace IOB_UT_NEXT.Iob.Services
+namespace IOB_UT_NEXT.Services
{
///
/// Servizio dedicato alla gestione delle chiamate HTTP.
diff --git a/IOB-UT-NEXT/Iob/Services/NetService.cs b/IOB-UT-NEXT/Services/NetService.cs
similarity index 98%
rename from IOB-UT-NEXT/Iob/Services/NetService.cs
rename to IOB-UT-NEXT/Services/NetService.cs
index 3ef5415c..56e58227 100644
--- a/IOB-UT-NEXT/Iob/Services/NetService.cs
+++ b/IOB-UT-NEXT/Services/NetService.cs
@@ -6,7 +6,7 @@ using System.Net.NetworkInformation;
using System.Text;
using System.Threading.Tasks;
-namespace IOB_UT_NEXT.Iob.Services
+namespace IOB_UT_NEXT.Services
{
public class NetService
{
diff --git a/IOB-UT-NEXT/Iob/Services/XmlDataSerializer.cs b/IOB-UT-NEXT/Services/XmlDataSerializer.cs
similarity index 98%
rename from IOB-UT-NEXT/Iob/Services/XmlDataSerializer.cs
rename to IOB-UT-NEXT/Services/XmlDataSerializer.cs
index e05e339c..27ae4e77 100644
--- a/IOB-UT-NEXT/Iob/Services/XmlDataSerializer.cs
+++ b/IOB-UT-NEXT/Services/XmlDataSerializer.cs
@@ -2,7 +2,7 @@ using System;
using System.IO;
using System.Xml.Serialization;
-namespace IOB_UT_NEXT.Iob.Services
+namespace IOB_UT_NEXT.Services
{
///
/// Gestisce le operazioni di serializzazione e deserializzazione in formato XML.
diff --git a/IOB-UT-NEXT/utils.cs b/IOB-UT-NEXT/utils.cs
index cc7bd526..e7b9fc96 100644
--- a/IOB-UT-NEXT/utils.cs
+++ b/IOB-UT-NEXT/utils.cs
@@ -1,4 +1,4 @@
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using System;
using System.IO;
using System.Linq;
diff --git a/IOB-WIN-FANUC/Iob/Fanuc.cs b/IOB-WIN-FANUC/Iob/Fanuc.cs
index 0e1d71ed..022a6c74 100644
--- a/IOB-WIN-FANUC/Iob/Fanuc.cs
+++ b/IOB-WIN-FANUC/Iob/Fanuc.cs
@@ -2,7 +2,7 @@
using EgwProxy.MultiCncLib.CNC;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using NLog;
using System;
diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs
index 613b9706..6b640176 100644
--- a/IOB-WIN-FORM/AdapterForm.cs
+++ b/IOB-WIN-FORM/AdapterForm.cs
@@ -1,7 +1,7 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using IOB_UT_NEXT.Config.Base;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using NLog;
diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs
index da8cc0ef..4a3faf93 100644
--- a/IOB-WIN-FORM/Iob/Generic.cs
+++ b/IOB-WIN-FORM/Iob/Generic.cs
@@ -1,7 +1,7 @@
using EgwProxy.Ftp;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using MathNet.Numerics.Statistics;
using Newtonsoft.Json;
@@ -369,7 +369,7 @@ namespace IOB_WIN_FORM.Iob
///
public string urlReboot
{
- get => $@"{urlCommandIobFile("sendReboot")}?mac={GetMACAddress()}";
+ get => $@"{urlCommandIobFile("sendReboot")}?mac={NetService.GetMACAddress()}";
}
///
@@ -404,13 +404,13 @@ namespace IOB_WIN_FORM.Iob
#region Public Methods
///
- /// Esegue conversione in un dizionario di tipo string/string serializzando e deserializzando
+ /// Conversione in un dizionario di tipo string/string serializzando e deserializzando
///
///
///
public static Dictionary ConvertToStringDict(Dictionary input)
{
- return DataSerializer.ToDictionary(input);
+ return IOB_UT_NEXT.Services.DataSerializer.ToDictionary(input);
}
///
@@ -544,7 +544,7 @@ namespace IOB_WIN_FORM.Iob
}
BaseRawTransf newVal = new BaseRawTransf(DateTime.Now, njObj, mesType);
- string encodedVal = DataSerializer.Serialize(newVal);
+ string encodedVal = JsonSerialize(newVal);
// --> accodo (valore già formattato)!
QueueRawTransf.Enqueue(encodedVal);
// se abilitato controllo coda Max (superiore a 0...)
@@ -1047,20 +1047,21 @@ namespace IOB_WIN_FORM.Iob
foreach (var rawJob in listaValori)
{
// deserializzo...
- JobTaskData jobTaskReq = JsonConvert.DeserializeObject(rawJob);
+ JobTaskData jobTaskReq = JsonDeserialize(rawJob);
+
// processo!
var reqDict = JobTaskData.TaskDict(jobTaskReq.RawData);
if (reqDict.Count > 0)
{
var taskDone = ProcessTask(JobTaskData.TaskDict(jobTaskReq.RawData), jobTaskReq.CodTav);
// accodo task eseguiti...
- string serVal = JsonConvert.SerializeObject(taskDone);
+ string serVal = JsonSerialize(taskDone);
accodaServResp(jobTaskReq.CodTav, serVal);
}
}
-
- // svuoto!
- QueueSrvReq = new DataQueue(IOBConfFull.General.FilenameIOB, "QueueServResp", IOBConfFull.General.EnabRedisQue, redisMan);
+
+ // svuoto!
+ QueueSrvReq = new DataQueue(IOBConfFull.General.FilenameIOB, "QueueServResp", IOBConfFull.General.EnabRedisQue, redisMan);
}
}
}
diff --git a/IOB-WIN-FORM/Iob/Simula.cs b/IOB-WIN-FORM/Iob/Simula.cs
index 992dd3ec..1ca5d7e4 100644
--- a/IOB-WIN-FORM/Iob/Simula.cs
+++ b/IOB-WIN-FORM/Iob/Simula.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using System;
diff --git a/IOB-WIN-FORM/MainForm.cs b/IOB-WIN-FORM/MainForm.cs
index 72ec1d1d..f0bcd492 100644
--- a/IOB-WIN-FORM/MainForm.cs
+++ b/IOB-WIN-FORM/MainForm.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using MathNet.Numerics.Distributions;
using Newtonsoft.Json;
diff --git a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs b/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs
index 876916e9..50d0ac44 100644
--- a/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs
+++ b/IOB-WIN-KAWASAKI/Iob/Kawasaki.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using System;
using System.Collections.Generic;
diff --git a/IOB-WIN-MTC/Iob/MTConn.cs b/IOB-WIN-MTC/Iob/MTConn.cs
index 3a3c8cd2..fdc546ac 100644
--- a/IOB-WIN-MTC/Iob/MTConn.cs
+++ b/IOB-WIN-MTC/Iob/MTConn.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using MTConnect.Assets;
using MTConnect.Clients;
diff --git a/IOB-WIN-OMRON/Iob/Omron.cs b/IOB-WIN-OMRON/Iob/Omron.cs
index 5b67ebbc..5292f148 100644
--- a/IOB-WIN-OMRON/Iob/Omron.cs
+++ b/IOB-WIN-OMRON/Iob/Omron.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using System;
using System.Collections.Generic;
diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
index c0c8b7fb..74ad5c40 100644
--- a/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
+++ b/IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
@@ -1,7 +1,7 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
using IOB_UT_NEXT.DataModel;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using NLog;
diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs
index f6bb14ad..4ee6a60d 100644
--- a/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs
+++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs
index a54941a9..ae368359 100644
--- a/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs
+++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using System;
diff --git a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs
index 22c99d53..638599ae 100644
--- a/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs
+++ b/IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using Opc.Ua;
diff --git a/IOB-WIN-OSAI/Iob/OSAI.cs b/IOB-WIN-OSAI/Iob/OSAI.cs
index c1e11386..491073ae 100644
--- a/IOB-WIN-OSAI/Iob/OSAI.cs
+++ b/IOB-WIN-OSAI/Iob/OSAI.cs
@@ -2,7 +2,7 @@
using EgwProxy.OsaiCncLib;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using System;
using System.Collections.Generic;
diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs
index a1f7504d..e543d62f 100644
--- a/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs
+++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs b/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs
index 11d18196..9a7d8c26 100644
--- a/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs
+++ b/IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs
@@ -1,6 +1,6 @@
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using System;
using System.Collections.Generic;
using System.Linq;
diff --git a/IOB-WIN-SQL/IobSql/SqlServLantek.cs b/IOB-WIN-SQL/IobSql/SqlServLantek.cs
index f292a883..f7336a92 100644
--- a/IOB-WIN-SQL/IobSql/SqlServLantek.cs
+++ b/IOB-WIN-SQL/IobSql/SqlServLantek.cs
@@ -2,7 +2,7 @@
using EgwProxy.SqlDb.DbModels;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using System;
diff --git a/IOB-WIN-SQL/IobSql/SqlServPama.cs b/IOB-WIN-SQL/IobSql/SqlServPama.cs
index 5d0648c6..93fc6115 100644
--- a/IOB-WIN-SQL/IobSql/SqlServPama.cs
+++ b/IOB-WIN-SQL/IobSql/SqlServPama.cs
@@ -2,7 +2,7 @@
using EgwProxy.SqlDb.DbModels;
using IOB_UT_NEXT;
using IOB_UT_NEXT.Config;
-using IOB_UT_NEXT.Iob.Services;
+using IOB_UT_NEXT.Services;
using MapoSDK;
using Newtonsoft.Json;
using System;