From ca6f3cec82a67d20b79379f93148a93e765faf48 Mon Sep 17 00:00:00 2001 From: bcastrogallardo Date: Tue, 8 Jul 2025 11:23:41 -0400 Subject: [PATCH 1/2] fix log variables de entorno --- Integracion_DGA/Program.cs | 12 ++++++++++-- Recuperacion_DGA/Program.cs | 12 ++++++++++-- Recuperacion_DGA/Recuperacion_DGA.csproj | 6 ++++++ Recuperacion_DGA/appsettings.json | 7 +++++++ 4 files changed, 33 insertions(+), 4 deletions(-) create mode 100644 Recuperacion_DGA/appsettings.json diff --git a/Integracion_DGA/Program.cs b/Integracion_DGA/Program.cs index a9def38..27ec017 100644 --- a/Integracion_DGA/Program.cs +++ b/Integracion_DGA/Program.cs @@ -14,6 +14,16 @@ namespace Integracion_DGA { static async Task Main(string[] args) { + IConfiguration configuration; + + configuration = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) + .AddEnvironmentVariables() + .Build(); + + FileLoggerHelper.ConfigureLogger(configuration); + try { Console.Write("Obteniendo variables de entorno..."); @@ -35,9 +45,7 @@ namespace Integracion_DGA using IHost host = Host.CreateDefaultBuilder(args) .ConfigureServices((context, services) => { - IConfiguration configuration = context.Configuration; services.AddSingleton(configuration); - services.AddScoped(); services.AddScoped(); services.AddHttpClient(); diff --git a/Recuperacion_DGA/Program.cs b/Recuperacion_DGA/Program.cs index a7b8ea3..8f68902 100644 --- a/Recuperacion_DGA/Program.cs +++ b/Recuperacion_DGA/Program.cs @@ -14,6 +14,16 @@ namespace Recuperacion_DGA { static async Task Main(string[] args) { + IConfiguration configuration; + + configuration = new ConfigurationBuilder() + .SetBasePath(Directory.GetCurrentDirectory()) + .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) + .AddEnvironmentVariables() + .Build(); + + FileLoggerHelper.ConfigureLogger(configuration); + try { Console.WriteLine("Obteniendo variables de entorno..."); @@ -35,9 +45,7 @@ namespace Recuperacion_DGA using IHost host = Host.CreateDefaultBuilder(args) .ConfigureServices((context, services) => { - IConfiguration configuration = context.Configuration; services.AddSingleton(configuration); - services.AddScoped(); services.AddScoped(); services.AddHttpClient(); diff --git a/Recuperacion_DGA/Recuperacion_DGA.csproj b/Recuperacion_DGA/Recuperacion_DGA.csproj index 0f16dd5..9e0d268 100644 --- a/Recuperacion_DGA/Recuperacion_DGA.csproj +++ b/Recuperacion_DGA/Recuperacion_DGA.csproj @@ -20,4 +20,10 @@ + + + PreserveNewest + + + diff --git a/Recuperacion_DGA/appsettings.json b/Recuperacion_DGA/appsettings.json new file mode 100644 index 0000000..8d964a3 --- /dev/null +++ b/Recuperacion_DGA/appsettings.json @@ -0,0 +1,7 @@ +{ + "Logging": { + "LogFile": { + "Path": "logs/log.txt" + } + } +} From 3745a022d1235dcebf123f70451cdbaf60b4db90 Mon Sep 17 00:00:00 2001 From: Leonel Toro Date: Sat, 12 Jul 2025 00:49:17 -0400 Subject: [PATCH 2/2] feat: se ajusta peticion para nuevo endpoint que obtiene los valores en tiempo real --- BLL/Integracion_DGA/BusinessLogic.cs | 18 +++++++++--------- SHARED/DTO/Integracion_DGA/HistoricResponse.cs | 2 +- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/BLL/Integracion_DGA/BusinessLogic.cs b/BLL/Integracion_DGA/BusinessLogic.cs index e1f42ba..2f618ee 100644 --- a/BLL/Integracion_DGA/BusinessLogic.cs +++ b/BLL/Integracion_DGA/BusinessLogic.cs @@ -64,16 +64,16 @@ namespace BLL.Integracion_DGA listTagsID.Add(tag.Uid); } - HistoricRequest historicRequest = new HistoricRequest(); - historicRequest.DataSource = NexusApiUrl.DataSource; - historicRequest.Resolution = NexusApiUrl.Resolution; - historicRequest.Uids = listTagsID; - historicRequest.StartTs = dateStart.ToUnixTimeSeconds(); - historicRequest.EndTs = dateEnd.ToUnixTimeSeconds(); + //HistoricRequest historicRequest = new HistoricRequest(); + //historicRequest.DataSource = NexusApiUrl.DataSource; + //historicRequest.Resolution = NexusApiUrl.Resolution; + //historicRequest.Uids = listTagsID; + //historicRequest.StartTs = dateStart.ToUnixTimeSeconds(); + //historicRequest.EndTs = dateEnd.ToUnixTimeSeconds(); WriteLineAndLog($"Obteniendo Tagviews Historic"); - string apiUrlHistoric = $"{apiUrlBase}/api/Documents/tagviews/{item.uid}/historic"; - responseData = await _apiService.PostApiResponseAsync(apiUrlHistoric, headers, historicRequest); + string apiUrlHistoric = $"{apiUrlBase}/api/Documents/tagviews/{item.uid}/realtime"; + responseData = await _apiService.PostApiResponseAsync(apiUrlHistoric, headers, listTagsID); List historicResponse = JsonSerializer.Deserialize>(responseData, options); List listDgaMacroResultados = new List(); @@ -88,7 +88,7 @@ namespace BLL.Integracion_DGA DgaMacroResultado dgaMacroResultado = new DgaMacroResultado(); - dgaMacroResultado.TagName = $"SCADA001.{tag.Name}.F_CV"; + dgaMacroResultado.TagName = tag.Name; dgaMacroResultado.Value = historic.Value; //dgaMacroResultado.TimeStamp = new DateTime(historic.TimeStamp); dgaMacroResultado.TimeStamp = fechaHoraChile; diff --git a/SHARED/DTO/Integracion_DGA/HistoricResponse.cs b/SHARED/DTO/Integracion_DGA/HistoricResponse.cs index 64caacb..9e3c1e7 100644 --- a/SHARED/DTO/Integracion_DGA/HistoricResponse.cs +++ b/SHARED/DTO/Integracion_DGA/HistoricResponse.cs @@ -4,6 +4,6 @@ { public string Uid { get; set; } public double? Value { get; set; } - public long TimeStamp { get; set; } + public double TimeStamp { get; set; } } }