From 648e03c52e315a264e8d682b5f0bc1271a29978b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 21 May 2026 18:48:17 +0200 Subject: [PATCH] Ancora spostamento servizi base --- IOB-UT-NEXT/Config/IobConfTree.cs | 2 +- IOB-UT-NEXT/IOB-UT-NEXT.csproj | 13 ++++++++----- IOB-UT-NEXT/Iob/BaseObj.cs | 8 ++++---- IOB-UT-NEXT/Services/{ => Data}/DataSerializer.cs | 2 +- .../Services/{ => Data}/XmlDataSerializer.cs | 2 +- .../Services/{ => Networking}/HttpService.cs | 2 +- IOB-UT-NEXT/Services/{ => Networking}/NetService.cs | 2 +- IOB-UT-NEXT/utils.cs | 2 +- IOB-WIN-FANUC/Iob/Fanuc.cs | 2 +- IOB-WIN-FORM/AdapterForm.cs | 2 +- IOB-WIN-FORM/Iob/Generic.cs | 5 +++-- IOB-WIN-FORM/Iob/Simula.cs | 2 +- IOB-WIN-FORM/MainForm.cs | 2 +- IOB-WIN-KAWASAKI/Iob/Kawasaki.cs | 2 +- IOB-WIN-MTC/Iob/MTConn.cs | 2 +- IOB-WIN-OMRON/Iob/Omron.cs | 2 +- IOB-WIN-OPC-UA/IobOpc/OpcUa.cs | 2 +- IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs | 2 +- IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs | 2 +- IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs | 2 +- IOB-WIN-OSAI/Iob/OSAI.cs | 2 +- IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs | 2 +- IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs | 2 +- IOB-WIN-SQL/IobSql/SqlServLantek.cs | 2 +- IOB-WIN-SQL/IobSql/SqlServPama.cs | 2 +- 25 files changed, 37 insertions(+), 33 deletions(-) rename IOB-UT-NEXT/Services/{ => Data}/DataSerializer.cs (98%) rename IOB-UT-NEXT/Services/{ => Data}/XmlDataSerializer.cs (98%) rename IOB-UT-NEXT/Services/{ => Networking}/HttpService.cs (99%) rename IOB-UT-NEXT/Services/{ => Networking}/NetService.cs (98%) diff --git a/IOB-UT-NEXT/Config/IobConfTree.cs b/IOB-UT-NEXT/Config/IobConfTree.cs index bd244244..95b7c715 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 3b634451..43d605eb 100644 --- a/IOB-UT-NEXT/IOB-UT-NEXT.csproj +++ b/IOB-UT-NEXT/IOB-UT-NEXT.csproj @@ -202,10 +202,10 @@ - - - - + + + + @@ -249,7 +249,10 @@ Always - + + + + diff --git a/IOB-UT-NEXT/Iob/BaseObj.cs b/IOB-UT-NEXT/Iob/BaseObj.cs index ec58c572..d221558a 100644 --- a/IOB-UT-NEXT/Iob/BaseObj.cs +++ b/IOB-UT-NEXT/Iob/BaseObj.cs @@ -593,22 +593,22 @@ namespace IOB_UT_NEXT.Iob /// /// Serializza un oggetto in formato JSON. /// - protected string JsonSerialize(T obj) => IOB_UT_NEXT.Services.DataSerializer.Serialize(obj); + protected string JsonSerialize(T obj) => IOB_UT_NEXT.Services.Data.DataSerializer.Serialize(obj); /// /// Deserializza una stringa JSON in un oggetto. /// - protected T JsonDeserialize(string json) => IOB_UT_NEXT.Services.DataSerializer.Deserialize(json); + protected T JsonDeserialize(string json) => IOB_UT_NEXT.Services.Data.DataSerializer.Deserialize(json); /// /// Serializza un oggetto in formato XML. /// - protected string XmlSerialize(T obj) => IOB_UT_NEXT.Services.XmlDataSerializer.Serialize(obj); + protected string XmlSerialize(T obj) => IOB_UT_NEXT.Services.Data.XmlDataSerializer.Serialize(obj); /// /// Deserializza una stringa XML in un oggetto. /// - protected T XmlDeserialize(string xml) => IOB_UT_NEXT.Services.XmlDataSerializer.Deserialize(xml); + protected T XmlDeserialize(string xml) => IOB_UT_NEXT.Services.Data.XmlDataSerializer.Deserialize(xml); #endregion Protected Serialization Helpers diff --git a/IOB-UT-NEXT/Services/DataSerializer.cs b/IOB-UT-NEXT/Services/Data/DataSerializer.cs similarity index 98% rename from IOB-UT-NEXT/Services/DataSerializer.cs rename to IOB-UT-NEXT/Services/Data/DataSerializer.cs index e1e2a1dd..3046b9c8 100644 --- a/IOB-UT-NEXT/Services/DataSerializer.cs +++ b/IOB-UT-NEXT/Services/Data/DataSerializer.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Globalization; using Newtonsoft.Json; -namespace IOB_UT_NEXT.Services +namespace IOB_UT_NEXT.Services.Data { /// /// Gestisce tutte le operazioni di serializzazione e deserializzazione dei dati. diff --git a/IOB-UT-NEXT/Services/XmlDataSerializer.cs b/IOB-UT-NEXT/Services/Data/XmlDataSerializer.cs similarity index 98% rename from IOB-UT-NEXT/Services/XmlDataSerializer.cs rename to IOB-UT-NEXT/Services/Data/XmlDataSerializer.cs index 27ae4e77..edb84ff9 100644 --- a/IOB-UT-NEXT/Services/XmlDataSerializer.cs +++ b/IOB-UT-NEXT/Services/Data/XmlDataSerializer.cs @@ -2,7 +2,7 @@ using System; using System.IO; using System.Xml.Serialization; -namespace IOB_UT_NEXT.Services +namespace IOB_UT_NEXT.Services.Data { /// /// Gestisce le operazioni di serializzazione e deserializzazione in formato XML. diff --git a/IOB-UT-NEXT/Services/HttpService.cs b/IOB-UT-NEXT/Services/Networking/HttpService.cs similarity index 99% rename from IOB-UT-NEXT/Services/HttpService.cs rename to IOB-UT-NEXT/Services/Networking/HttpService.cs index e3766674..91a2e01a 100644 --- a/IOB-UT-NEXT/Services/HttpService.cs +++ b/IOB-UT-NEXT/Services/Networking/HttpService.cs @@ -7,7 +7,7 @@ using System.Text; using System.Threading; using System.Threading.Tasks; -namespace IOB_UT_NEXT.Services +namespace IOB_UT_NEXT.Services.Networking { /// /// Servizio dedicato alla gestione delle chiamate HTTP. diff --git a/IOB-UT-NEXT/Services/NetService.cs b/IOB-UT-NEXT/Services/Networking/NetService.cs similarity index 98% rename from IOB-UT-NEXT/Services/NetService.cs rename to IOB-UT-NEXT/Services/Networking/NetService.cs index 56e58227..dc2c71b7 100644 --- a/IOB-UT-NEXT/Services/NetService.cs +++ b/IOB-UT-NEXT/Services/Networking/NetService.cs @@ -6,7 +6,7 @@ using System.Net.NetworkInformation; using System.Text; using System.Threading.Tasks; -namespace IOB_UT_NEXT.Services +namespace IOB_UT_NEXT.Services.Networking { public class NetService { diff --git a/IOB-UT-NEXT/utils.cs b/IOB-UT-NEXT/utils.cs index e7b9fc96..b8069604 100644 --- a/IOB-UT-NEXT/utils.cs +++ b/IOB-UT-NEXT/utils.cs @@ -1,4 +1,4 @@ -using IOB_UT_NEXT.Services; +using IOB_UT_NEXT.Services.Networking; 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 022a6c74..6cd9523d 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.Services; +using IOB_UT_NEXT.Services.Networking; using MapoSDK; using NLog; using System; diff --git a/IOB-WIN-FORM/AdapterForm.cs b/IOB-WIN-FORM/AdapterForm.cs index 6b640176..15dd9866 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.Services; +using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; using NLog; diff --git a/IOB-WIN-FORM/Iob/Generic.cs b/IOB-WIN-FORM/Iob/Generic.cs index 4a3faf93..cda2d21a 100644 --- a/IOB-WIN-FORM/Iob/Generic.cs +++ b/IOB-WIN-FORM/Iob/Generic.cs @@ -1,7 +1,8 @@ using EgwProxy.Ftp; using IOB_UT_NEXT; using IOB_UT_NEXT.Config; -using IOB_UT_NEXT.Services; +using IOB_UT_NEXT.Services.Data; +using IOB_UT_NEXT.Services.Networking; using MapoSDK; using MathNet.Numerics.Statistics; using Newtonsoft.Json; @@ -410,7 +411,7 @@ namespace IOB_WIN_FORM.Iob /// public static Dictionary ConvertToStringDict(Dictionary input) { - return IOB_UT_NEXT.Services.DataSerializer.ToDictionary(input); + return IOB_UT_NEXT.Services.Data.DataSerializer.ToDictionary(input); } /// diff --git a/IOB-WIN-FORM/Iob/Simula.cs b/IOB-WIN-FORM/Iob/Simula.cs index 1ca5d7e4..744e92ca 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.Services; +using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; using System; diff --git a/IOB-WIN-FORM/MainForm.cs b/IOB-WIN-FORM/MainForm.cs index f0bcd492..f46ee82c 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 50d0ac44..765e4011 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 fdc546ac..5c7d7635 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 5292f148..e8a34f85 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 74ad5c40..6faeec24 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 4ee6a60d..23e278db 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 ae368359..becd145e 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 638599ae..74425e59 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 491073ae..6aa48741 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 e543d62f..6ff38b52 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 9a7d8c26..3bbd9cd4 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.Services; +using IOB_UT_NEXT.Services.Networking; 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 f7336a92..56731f8d 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.Services; +using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; using System; diff --git a/IOB-WIN-SQL/IobSql/SqlServPama.cs b/IOB-WIN-SQL/IobSql/SqlServPama.cs index 93fc6115..3666cd3f 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.Services; +using IOB_UT_NEXT.Services.Networking; using MapoSDK; using Newtonsoft.Json; using System;