From 1c83051703bfa20c69bfef7849041168d936783d Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Wed, 6 Aug 2025 15:51:48 +0200 Subject: [PATCH] Update API x nuovi metodi chaimata generic con environment + dict da dlll nuget dell'EgwMEM --- .../EgwCoreLib.Lux.Core.csproj | 6 +- .../RestPayload/CalcRequestDTO.cs | 7 +- .../EgwCoreLib.Lux.Data.csproj | 2 +- Lux.API/Controllers/GenericController.cs | 11 +-- Lux.API/Controllers/WindowController.cs | 7 +- .../ExtLib/EgwMultiEngineManager.deps.json | 63 ------------------ Lux.API/ExtLib/EgwMultiEngineManager.dll | Bin 15360 -> 0 bytes Lux.API/Lux.API.csproj | 7 +- Lux.API/Services/ExternalMessageProcessor.cs | 3 +- 9 files changed, 25 insertions(+), 81 deletions(-) delete mode 100644 Lux.API/ExtLib/EgwMultiEngineManager.deps.json delete mode 100644 Lux.API/ExtLib/EgwMultiEngineManager.dll 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 d5eeb1e766d9096a2ed9e3271794c052407f43a1..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 15360 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 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)