Egalware/Mapo-IOB-WIN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Spostamento servizi in proj base + continuo reorg classi

Browse Source
This commit is contained in:
Samuele Locatelli
2026-05-21 18:40:54 +02:00
parent 94933d72d1
commit 7e234807a7
25 changed files with 61 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
IOB-UT-NEXT/Config/IobConfTree.cs
+1 -1
View File
@@ -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;
IOB-UT-NEXT/IOB-UT-NEXT.csproj
+4 -4
View File
@@ -202,10 +202,10 @@
<Compile Include="iobRefreshedEventArgs.cs" />
<Compile Include="IobWinStatus.cs" />
<Compile Include="Iob\BaseObj.cs" />
<Compile Include="Iob\Services\DataSerializer.cs" />
<Compile Include="Iob\Services\HttpService.cs" />
<Compile Include="Iob\Services\NetService.cs" />
<Compile Include="Iob\Services\XmlDataSerializer.cs" />
<Compile Include="Services\DataSerializer.cs" />
<Compile Include="Services\HttpService.cs" />
<Compile Include="Services\NetService.cs" />
<Compile Include="Services\XmlDataSerializer.cs" />
<Compile Include="JobTask2Exe.cs" />
<Compile Include="MeasureUtils.cs" />
<Compile Include="plcMemMapExt.cs" />
IOB-UT-NEXT/Iob/BaseObj.cs
+24
View File
@@ -588,6 +588,30 @@ namespace IOB_UT_NEXT.Iob
#endregion Protected Methods
#region Protected Serialization Helpers
/// <summary>
/// Serializza un oggetto in formato JSON.
/// </summary>
protected string JsonSerialize<T>(T obj) => IOB_UT_NEXT.Services.DataSerializer.Serialize(obj);
/// <summary>
/// Deserializza una stringa JSON in un oggetto.
/// </summary>
protected T JsonDeserialize<T>(string json) => IOB_UT_NEXT.Services.DataSerializer.Deserialize<T>(json);
/// <summary>
/// Serializza un oggetto in formato XML.
/// </summary>
protected string XmlSerialize<T>(T obj) => IOB_UT_NEXT.Services.XmlDataSerializer.Serialize(obj);
/// <summary>
/// Deserializza una stringa XML in un oggetto.
/// </summary>
protected T XmlDeserialize<T>(string xml) => IOB_UT_NEXT.Services.XmlDataSerializer.Deserialize<T>(xml);
#endregion Protected Serialization Helpers
#region Private Fields
/// <summary>
IOB-UT-NEXT/Iob/Services/DataSerializer.cs → IOB-UT-NEXT/Services/DataSerializer.cs
+1 -1
View File
@@ -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
{
/// <summary>
/// Gestisce tutte le operazioni di serializzazione e deserializzazione dei dati.
IOB-UT-NEXT/Iob/Services/HttpService.cs → IOB-UT-NEXT/Services/HttpService.cs
+1 -1
View File
@@ -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
{
/// <summary>
/// Servizio dedicato alla gestione delle chiamate HTTP.
IOB-UT-NEXT/Iob/Services/NetService.cs → IOB-UT-NEXT/Services/NetService.cs
+1 -1
View File
@@ -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
{
IOB-UT-NEXT/Iob/Services/XmlDataSerializer.cs → IOB-UT-NEXT/Services/XmlDataSerializer.cs
+1 -1
View File
@@ -2,7 +2,7 @@ using System;
using System.IO;
using System.Xml.Serialization;
namespace IOB_UT_NEXT.Iob.Services
namespace IOB_UT_NEXT.Services
{
/// <summary>
/// Gestisce le operazioni di serializzazione e deserializzazione in formato XML.
IOB-UT-NEXT/utils.cs
+1 -1
View File
@@ -1,4 +1,4 @@
using IOB_UT_NEXT.Iob.Services;
using IOB_UT_NEXT.Services;
using System;
using System.IO;
using System.Linq;
IOB-WIN-FANUC/Iob/Fanuc.cs
+1 -1
View File
@@ -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;
IOB-WIN-FORM/AdapterForm.cs
+1 -1
View File
@@ -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;
IOB-WIN-FORM/Iob/Generic.cs
+11 -10
View File
@@ -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
/// </summary>
public string urlReboot
{
get => $@"{urlCommandIobFile("sendReboot")}?mac={GetMACAddress()}";
get => $@"{urlCommandIobFile("sendReboot")}?mac={NetService.GetMACAddress()}";
}
/// <summary>
@@ -404,13 +404,13 @@ namespace IOB_WIN_FORM.Iob
#region Public Methods
/// <summary>
/// Esegue conversione in un dizionario di tipo string/string serializzando e deserializzando
/// Conversione in un dizionario di tipo string/string serializzando e deserializzando
/// </summary>
/// <param name="input"></param>
/// <returns></returns>
public static Dictionary<string, string> ConvertToStringDict(Dictionary<string, object> input)
{
return DataSerializer.ToDictionary(input);
return IOB_UT_NEXT.Services.DataSerializer.ToDictionary(input);
}
/// <summary>
@@ -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<JobTaskData>(rawJob);
JobTaskData jobTaskReq = JsonDeserialize<JobTaskData>(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);
}
}
}
IOB-WIN-FORM/Iob/Simula.cs
+1 -1
View File
@@ -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;
IOB-WIN-FORM/MainForm.cs
+1 -1
View File
@@ -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;
IOB-WIN-KAWASAKI/Iob/Kawasaki.cs
+1 -1
View File
@@ -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;
IOB-WIN-MTC/Iob/MTConn.cs
+1 -1
View File
@@ -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;
IOB-WIN-OMRON/Iob/Omron.cs
+1 -1
View File
@@ -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;
IOB-WIN-OPC-UA/IobOpc/OpcUa.cs
+1 -1
View File
@@ -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;
IOB-WIN-OPC-UA/IobOpc/OpcUaKpwRama.cs
+1 -1
View File
@@ -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;
IOB-WIN-OPC-UA/IobOpc/OpcUaMBHCimolai.cs
+1 -1
View File
@@ -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;
IOB-WIN-OPC-UA/IobOpc/OpcUaSiemensRama.cs
+1 -1
View File
@@ -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;
IOB-WIN-OSAI/Iob/OSAI.cs
+1 -1
View File
@@ -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;
IOB-WIN-SIEMENS/IobSiemens/SiemensFape.cs
+1 -1
View File
@@ -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;
IOB-WIN-SIEMENS/IobSiemens/SiemensFapeV2.cs
+1 -1
View File
@@ -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;
IOB-WIN-SQL/IobSql/SqlServLantek.cs
+1 -1
View File
@@ -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;
IOB-WIN-SQL/IobSql/SqlServPama.cs
+1 -1
View File
@@ -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;