diff --git a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj index 62f890dd..d9baabcb 100644 --- a/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj +++ b/EgwCoreLib.Lux.Core/EgwCoreLib.Lux.Core.csproj @@ -17,6 +17,10 @@ - + + + + + diff --git a/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs b/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs index f7408892..88eaa020 100644 --- a/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs +++ b/EgwCoreLib.Lux.Core/RestPayload/CalcRequestDTO.cs @@ -1,7 +1,9 @@ -using System; +using Newtonsoft.Json.Converters; +using System; using System.Collections.Generic; using System.Linq; using System.Text; +using System.Text.Json.Serialization; using System.Threading.Tasks; namespace EgwCoreLib.Lux.Core.RestPayload @@ -11,7 +13,8 @@ namespace EgwCoreLib.Lux.Core.RestPayload /// /// Tipologia di richiesta da inviare al calcolo /// - public string ReqType { get; set; } = ""; + ///[JsonConverter(typeof(StringEnumConverter))] + public EgwMultiEngineManager.Data.Constants.ENVIRONMENTS EnvType { get; set; } = EgwMultiEngineManager.Data.Constants.ENVIRONMENTS.NULL; /// /// Dizionario completo dei parametri da inviare diff --git a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj index d1e85a6e..c3d746d3 100644 --- a/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj +++ b/EgwCoreLib.Lux.Data/EgwCoreLib.Lux.Data.csproj @@ -41,7 +41,7 @@ - + diff --git a/Lux.API/Controllers/GenericController.cs b/Lux.API/Controllers/GenericController.cs index 57e5ef66..ce430bda 100644 --- a/Lux.API/Controllers/GenericController.cs +++ b/Lux.API/Controllers/GenericController.cs @@ -1,6 +1,5 @@ using EgwCoreLib.Lux.Core.RestPayload; using EgwCoreLib.Lux.Data.Services; -using EgwMultiEngineManager; using Microsoft.AspNetCore.Mvc; using NLog; using System.Diagnostics; @@ -50,21 +49,17 @@ namespace Lux.API.Controllers { Dictionary DictExec = currReq.DictExec; // controllo se mancassero parametri... - if(!DictExec.ContainsKey("Mode")) + if (!DictExec.ContainsKey("Mode")) { - DictExec.Add("Mode", "1"); + DictExec.Add("Mode", "1"); } if (!DictExec.ContainsKey("UID")) { DictExec.Add("UID", id); } - if (!DictExec.ContainsKey("Jwd")) - { - DictExec.Add("Jwd", demoJwd); - } int nId = 1; // da modificare con tipo richiesta... - ProcessArgs currArgs = new ProcessArgs(nId, DictExec); + EgwMultiEngineManager.Data.Question currArgs = new EgwMultiEngineManager.Data.Question(nId, currReq.EnvType, DictExec); await _redisService.PublishAsync(pubChannel, currArgs.sProcessArgs); svgContent = "DONE"; diff --git a/Lux.API/Controllers/WindowController.cs b/Lux.API/Controllers/WindowController.cs index e05cbcb3..3b953422 100644 --- a/Lux.API/Controllers/WindowController.cs +++ b/Lux.API/Controllers/WindowController.cs @@ -1,5 +1,4 @@ using EgwCoreLib.Lux.Data.Services; -using EgwMultiEngineManager; using Microsoft.AspNetCore.Mvc; using NLog; using System.Diagnostics; @@ -62,7 +61,8 @@ namespace Lux.API.Controllers DictExec.Add("UID", id); DictExec.Add("Jwd", currJwd); int nId = 1; - ProcessArgs currArgs = new ProcessArgs(nId, DictExec); + // da modificare con tipo richiesta... + EgwMultiEngineManager.Data.Question currArgs = new EgwMultiEngineManager.Data.Question(nId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS.WINDOW, DictExec); await _redisService.PublishAsync(pubChannel, currArgs.sProcessArgs); svgContent = "DONE"; @@ -157,7 +157,8 @@ namespace Lux.API.Controllers DictExec.Add("UID", id); DictExec.Add("Jwd", currJwd); int nId = 1; - ProcessArgs currArgs = new ProcessArgs(nId, DictExec); + // da modificare con tipo richiesta... + EgwMultiEngineManager.Data.Question currArgs = new EgwMultiEngineManager.Data.Question(nId, EgwMultiEngineManager.Data.Constants.ENVIRONMENTS.WINDOW, DictExec); await _redisService.PublishAsync(pubChannel, currArgs.sProcessArgs); svgContent = "DONE"; diff --git a/Lux.API/ExtLib/EgwMultiEngineManager.deps.json b/Lux.API/ExtLib/EgwMultiEngineManager.deps.json deleted file mode 100644 index d97fa9f9..00000000 --- a/Lux.API/ExtLib/EgwMultiEngineManager.deps.json +++ /dev/null @@ -1,63 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETStandard,Version=v2.0/", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETStandard,Version=v2.0": {}, - ".NETStandard,Version=v2.0/": { - "EgwMultiEngineManager/1.0.0": { - "dependencies": { - "NETStandard.Library": "2.0.3", - "Newtonsoft.Json": "13.0.3" - }, - "runtime": { - "EgwMultiEngineManager.dll": {} - } - }, - "Microsoft.NETCore.Platforms/1.1.0": {}, - "NETStandard.Library/2.0.3": { - "dependencies": { - "Microsoft.NETCore.Platforms": "1.1.0" - } - }, - "Newtonsoft.Json/13.0.3": { - "runtime": { - "lib/netstandard2.0/Newtonsoft.Json.dll": { - "assemblyVersion": "13.0.0.0", - "fileVersion": "13.0.3.27908" - } - } - } - } - }, - "libraries": { - "EgwMultiEngineManager/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - }, - "Microsoft.NETCore.Platforms/1.1.0": { - "type": "package", - "serviceable": true, - "sha512": "sha512-kz0PEW2lhqygehI/d6XsPCQzD7ff7gUJaVGPVETX611eadGsA3A877GdSlU0LRVMCTH/+P3o2iDTak+S08V2+A==", - "path": "microsoft.netcore.platforms/1.1.0", - "hashPath": "microsoft.netcore.platforms.1.1.0.nupkg.sha512" - }, - "NETStandard.Library/2.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-st47PosZSHrjECdjeIzZQbzivYBJFv6P2nv4cj2ypdI204DO+vZ7l5raGMiX4eXMJ53RfOIg+/s4DHVZ54Nu2A==", - "path": "netstandard.library/2.0.3", - "hashPath": "netstandard.library.2.0.3.nupkg.sha512" - }, - "Newtonsoft.Json/13.0.3": { - "type": "package", - "serviceable": true, - "sha512": "sha512-HrC5BXdl00IP9zeV+0Z848QWPAoCr9P3bDEZguI+gkLcBKAOxix/tLEAAHC+UvDNPv4a2d18lOReHMOagPa+zQ==", - "path": "newtonsoft.json/13.0.3", - "hashPath": "newtonsoft.json.13.0.3.nupkg.sha512" - } - } -} \ No newline at end of file diff --git a/Lux.API/ExtLib/EgwMultiEngineManager.dll b/Lux.API/ExtLib/EgwMultiEngineManager.dll deleted file mode 100644 index d5eeb1e7..00000000 Binary files a/Lux.API/ExtLib/EgwMultiEngineManager.dll and /dev/null differ diff --git a/Lux.API/Lux.API.csproj b/Lux.API/Lux.API.csproj index e29a0f2b..5dcf6752 100644 --- a/Lux.API/Lux.API.csproj +++ b/Lux.API/Lux.API.csproj @@ -4,7 +4,7 @@ net8.0 enable enable - 0.9.2508.0511 + 0.9.2508.0615 @@ -58,6 +58,7 @@ + @@ -79,6 +80,10 @@ PreserveNewest + + + + diff --git a/Lux.API/Services/ExternalMessageProcessor.cs b/Lux.API/Services/ExternalMessageProcessor.cs index 6c714e46..46b413dd 100644 --- a/Lux.API/Services/ExternalMessageProcessor.cs +++ b/Lux.API/Services/ExternalMessageProcessor.cs @@ -1,5 +1,4 @@ using EgwCoreLib.Lux.Data.Services; -using EgwMultiEngineManager; using EgwCoreLib.Lux.Data; using Newtonsoft.Json; using NLog; @@ -32,7 +31,7 @@ namespace Lux.API.Services { try { - var retData = JsonConvert.DeserializeObject(rawData); + var retData = JsonConvert.DeserializeObject(rawData); if (retData != null) { if (retData.Args != null && retData.Args.Count > 0)