From 3745a022d1235dcebf123f70451cdbaf60b4db90 Mon Sep 17 00:00:00 2001 From: Leonel Toro Date: Sat, 12 Jul 2025 00:49:17 -0400 Subject: [PATCH 1/3] 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; } } } From 564f47d8ac9611631439969053e7ac735ef22219 Mon Sep 17 00:00:00 2001 From: bcastrogallardo Date: Mon, 14 Jul 2025 12:34:33 -0400 Subject: [PATCH 2/3] fix directorio --- Integracion_DGA/Program.cs | 2 +- Recuperacion_DGA/Program.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Integracion_DGA/Program.cs b/Integracion_DGA/Program.cs index 27ec017..e52f203 100644 --- a/Integracion_DGA/Program.cs +++ b/Integracion_DGA/Program.cs @@ -17,7 +17,7 @@ namespace Integracion_DGA IConfiguration configuration; configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) + .SetBasePath(AppContext.BaseDirectory) .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) .AddEnvironmentVariables() .Build(); diff --git a/Recuperacion_DGA/Program.cs b/Recuperacion_DGA/Program.cs index 8f68902..3d1b5df 100644 --- a/Recuperacion_DGA/Program.cs +++ b/Recuperacion_DGA/Program.cs @@ -17,7 +17,7 @@ namespace Recuperacion_DGA IConfiguration configuration; configuration = new ConfigurationBuilder() - .SetBasePath(Directory.GetCurrentDirectory()) + .SetBasePath(AppContext.BaseDirectory) .AddJsonFile("appsettings.json", optional: false, reloadOnChange: true) .AddEnvironmentVariables() .Build(); From e83a41cd54269bb74b1ad81a27a192a596261179 Mon Sep 17 00:00:00 2001 From: Leonel Toro Date: Mon, 21 Jul 2025 10:42:34 -0400 Subject: [PATCH 3/3] feat: se implementan informantes --- BLL/Recuperacion_DGA/EnvioDGA.cs | 6 +++--- DAL/MedicionDGARepository.cs | 3 ++- SHARED/DTO/Envios_DGA/DatoDGA.cs | 1 + SHARED/DTO/Envios_DGA/DatoDGATemporal.cs | 5 +++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/BLL/Recuperacion_DGA/EnvioDGA.cs b/BLL/Recuperacion_DGA/EnvioDGA.cs index 7b8cbdc..4e481d9 100644 --- a/BLL/Recuperacion_DGA/EnvioDGA.cs +++ b/BLL/Recuperacion_DGA/EnvioDGA.cs @@ -59,9 +59,9 @@ namespace BLL.Recuperacion_DGA { Autenticacion = new Autenticacion { - Password = CredencialDGA.Password, - RutEmpresa = medicion.TIPO_EMPRESA == "EV" ? CredencialDGA.RutEsval : CredencialDGA.RutAv, - RutUsuario = CredencialDGA.RutUsuario + Password = medicion.Password, + RutEmpresa = medicion.Empresa_Informante == "EV" ? CredencialDGA.RutEsval : CredencialDGA.RutAv, + RutUsuario = medicion.RUT }, MedicionSubterranea = new Medicion { diff --git a/DAL/MedicionDGARepository.cs b/DAL/MedicionDGARepository.cs index 72ddb8d..32db06b 100644 --- a/DAL/MedicionDGARepository.cs +++ b/DAL/MedicionDGARepository.cs @@ -33,7 +33,8 @@ namespace DAL await connection.ExecuteAsync(query, new { Ids = medicionesGuardadas }); return true; } - catch(Exception ex) { + catch (Exception ex) + { throw new Exception($"Error {ex.Message}"); } diff --git a/SHARED/DTO/Envios_DGA/DatoDGA.cs b/SHARED/DTO/Envios_DGA/DatoDGA.cs index 72160a6..8f93c37 100644 --- a/SHARED/DTO/Envios_DGA/DatoDGA.cs +++ b/SHARED/DTO/Envios_DGA/DatoDGA.cs @@ -6,6 +6,7 @@ public string? CODIGO_DGA { get; set; } + public string? ID_COMUNA { get; set; } public string? MACRO { get; set; } public string? SENSOR { get; set; } diff --git a/SHARED/DTO/Envios_DGA/DatoDGATemporal.cs b/SHARED/DTO/Envios_DGA/DatoDGATemporal.cs index d375bde..fcd4ffe 100644 --- a/SHARED/DTO/Envios_DGA/DatoDGATemporal.cs +++ b/SHARED/DTO/Envios_DGA/DatoDGATemporal.cs @@ -7,6 +7,8 @@ public string? CAUDAL { get; set; } + public string? ID_COMUNA { get; set; } + public string? TOTALIZADOR_CAUDAL { get; set; } public DateTime? FECHA_MEDICION_CAUDAL { get; set; } @@ -14,5 +16,8 @@ public string? NIVEL_FREATICO_DEL_POZO { get; set; } public string? TIPO_EMPRESA { get; set; } + public string? RUT { get; set; } + public string? Password { get; set; } + public string? Empresa_Informante { get; set; } } }