diff --git a/BLL/Integracion_DGA/BusinessLogic.cs b/BLL/Integracion_DGA/BusinessLogic.cs index 2f618ee..e1f42ba 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}/realtime"; - responseData = await _apiService.PostApiResponseAsync(apiUrlHistoric, headers, listTagsID); + string apiUrlHistoric = $"{apiUrlBase}/api/Documents/tagviews/{item.uid}/historic"; + responseData = await _apiService.PostApiResponseAsync(apiUrlHistoric, headers, historicRequest); List historicResponse = JsonSerializer.Deserialize>(responseData, options); List listDgaMacroResultados = new List(); @@ -88,7 +88,7 @@ namespace BLL.Integracion_DGA DgaMacroResultado dgaMacroResultado = new DgaMacroResultado(); - dgaMacroResultado.TagName = tag.Name; + dgaMacroResultado.TagName = $"SCADA001.{tag.Name}.F_CV"; dgaMacroResultado.Value = historic.Value; //dgaMacroResultado.TimeStamp = new DateTime(historic.TimeStamp); dgaMacroResultado.TimeStamp = fechaHoraChile; diff --git a/Integracion_DGA/Program.cs b/Integracion_DGA/Program.cs index 27ec017..a9def38 100644 --- a/Integracion_DGA/Program.cs +++ b/Integracion_DGA/Program.cs @@ -14,16 +14,6 @@ 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..."); @@ -45,7 +35,9 @@ 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 8f68902..a7b8ea3 100644 --- a/Recuperacion_DGA/Program.cs +++ b/Recuperacion_DGA/Program.cs @@ -14,16 +14,6 @@ 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..."); @@ -45,7 +35,9 @@ 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 9e0d268..0f16dd5 100644 --- a/Recuperacion_DGA/Recuperacion_DGA.csproj +++ b/Recuperacion_DGA/Recuperacion_DGA.csproj @@ -20,10 +20,4 @@ - - - PreserveNewest - - - diff --git a/Recuperacion_DGA/appsettings.json b/Recuperacion_DGA/appsettings.json deleted file mode 100644 index 8d964a3..0000000 --- a/Recuperacion_DGA/appsettings.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Logging": { - "LogFile": { - "Path": "logs/log.txt" - } - } -} diff --git a/SHARED/DTO/Integracion_DGA/HistoricResponse.cs b/SHARED/DTO/Integracion_DGA/HistoricResponse.cs index 9e3c1e7..64caacb 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 double TimeStamp { get; set; } + public long TimeStamp { get; set; } } }