From 89ee2034614a663c3ed14424070112c57154d434 Mon Sep 17 00:00:00 2001 From: "Samuele E. Locatelli" Date: Thu, 4 Feb 2021 10:55:36 +0100 Subject: [PATCH] test x output conf IO --- .../DTOModels/ThIO/DTOChannelsSetup.cs | 16 ++++ .../Thermo.Active.Model.csproj | 1 + .../WebApi/ConfigurationController.cs | 86 +++++++----------- UpgradeLog.htm | Bin 0 -> 29046 bytes 4 files changed, 50 insertions(+), 53 deletions(-) create mode 100644 Thermo.Active.Model/DTOModels/ThIO/DTOChannelsSetup.cs create mode 100644 UpgradeLog.htm diff --git a/Thermo.Active.Model/DTOModels/ThIO/DTOChannelsSetup.cs b/Thermo.Active.Model/DTOModels/ThIO/DTOChannelsSetup.cs new file mode 100644 index 00000000..8c26c8b9 --- /dev/null +++ b/Thermo.Active.Model/DTOModels/ThIO/DTOChannelsSetup.cs @@ -0,0 +1,16 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Thermo.Active.Model.DTOModels.ThIO +{ + public class DTOChannelsSetup + { + public List DI { get; set; } = new List(); + public List DO { get; set; } = new List(); + public List AI { get; set; } = new List(); + public List AO { get; set; } = new List(); + } +} diff --git a/Thermo.Active.Model/Thermo.Active.Model.csproj b/Thermo.Active.Model/Thermo.Active.Model.csproj index 24c9a727..37483ff3 100644 --- a/Thermo.Active.Model/Thermo.Active.Model.csproj +++ b/Thermo.Active.Model/Thermo.Active.Model.csproj @@ -113,6 +113,7 @@ + diff --git a/Thermo.Active/Controllers/WebApi/ConfigurationController.cs b/Thermo.Active/Controllers/WebApi/ConfigurationController.cs index 32ce7a7f..5a0efe06 100644 --- a/Thermo.Active/Controllers/WebApi/ConfigurationController.cs +++ b/Thermo.Active/Controllers/WebApi/ConfigurationController.cs @@ -125,67 +125,47 @@ namespace Thermo.Active.Controllers.WebApi return Ok(recipeConfig); } -#if false - [Route("IO"), HttpGet] + + [Route("recipeTest"), HttpGet] + public IHttpActionResult GetRecipeTest() + { + List recipeConfig = RecipeConfig.Select(x => new DTORecipeConfigModel() + { + Id = x.Id, + ScaleFactor = x.ScaleFactor, + NumDec = x.NumDec, + Category = x.Category.ToString(), + SubCategory_1 = x.SubCategory_1, + SubCategory_2 = x.SubCategory_2, + Name = x.Name, + Description = x.Description, + Format = x.Format, + Label = $"{x.Category}_{x.SubCategory_1}_{x.SubCategory_2}_{x.Name}".Replace("__", "_").Replace("__", "_").ToLower(), + EnumVal = x.EnumVal + }).ToList(); + + return Ok(recipeConfig); + } + + [Route("configIO"), HttpGet] public IHttpActionResult GetIOConfig() { - DTOChannelsIOModel ChannelsIO = new DTOChannelsIOModel(); + DTOChannelsSetup configIO = new DTOChannelsSetup(); // leggo i 4 tipi di oggetti e popolo - List listDI = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.DI).Select(x => new DigitalIN() - { - Id = x.Id, - Bank = x.Bank, - Position = x.Position, - //Page = x.Category.ToString(), - Page = x.Page, - Wire = x.Wire, - Profinet = x.Profinet, - Label = x.Label.Replace("__", "_").Replace("__", "_").ToLower() - }).ToList(); - List listDO = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.DO).Select(x => new DigitalOUT() - { - Id = x.Id, - Bank = x.Bank, - Position = x.Position, - //Page = x.Category.ToString(), - Page = x.Page, - Wire = x.Wire, - Profinet = x.Profinet, - Label = x.Label.Replace("__", "_").Replace("__", "_").ToLower() - }).ToList(); - List listAI = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.AI).Select(x => new AnalogIN() - { - Id = x.Id, - Bank = x.Bank, - Position = x.Position, - //Page = x.Category.ToString(), - Page = x.Page, - Wire = x.Wire, - Profinet = x.Profinet, - Label = x.Label.Replace("__", "_").Replace("__", "_").ToLower() - }).ToList(); - List listAO = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.AO).Select(x => new AnalogOUT() - { - Id = x.Id, - Bank = x.Bank, - Position = x.Position, - //Page = x.Category.ToString(), - Page = x.Page, - Wire = x.Wire, - Profinet = x.Profinet, - Label = x.Label.Replace("__", "_").Replace("__", "_").ToLower() - }).ToList(); + List listDI = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.DI).GroupBy(x => x.Bank).Select(x => x.Key).ToList(); + List listDO = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.DO).GroupBy(x => x.Bank).Select(x => x.Key).ToList(); + List listAI = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.AI).GroupBy(x => x.Bank).Select(x => x.Key).ToList(); + List listAO = IOConfig.Where(x => x.Category == Model.Constants.TACT_IO_TYPE.AO).GroupBy(x => x.Bank).Select(x => x.Key).ToList(); // assegno! - ChannelsIO.DI = listDI; - ChannelsIO.DO = listDO; - ChannelsIO.AI = listAI; - ChannelsIO.AO = listAO; + configIO.DI = listDI; + configIO.DO = listDO; + configIO.AI = listAI; + configIO.AO = listAO; // restituisco - return Ok(ChannelsIO); + return Ok(configIO); } -#endif [Route("thermoProd"), HttpGet] public IHttpActionResult GetThermoProdConfig() diff --git a/UpgradeLog.htm b/UpgradeLog.htm new file mode 100644 index 0000000000000000000000000000000000000000..864f64988bd4677ec422b533e16e4b85df14aabd GIT binary patch literal 29046 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 literal 0 HcmV?d00001