diff --git a/BLL/BLL.csproj b/BLL/BLL.csproj index b0d3427..61194cb 100644 --- a/BLL/BLL.csproj +++ b/BLL/BLL.csproj @@ -6,10 +6,6 @@ enable - - - - diff --git a/BLL/Recuperacion_DGA/EnvioDGA.cs b/BLL/EnvioDGA.cs similarity index 96% rename from BLL/Recuperacion_DGA/EnvioDGA.cs rename to BLL/EnvioDGA.cs index f2fcaf9..8f8ec69 100644 --- a/BLL/Recuperacion_DGA/EnvioDGA.cs +++ b/BLL/EnvioDGA.cs @@ -2,9 +2,8 @@ using Shared.DTO; using DAL; using DAS; -using Shared.DTO.Envios_DGA; -namespace BLL.Recuperacion_DGA +namespace BLL { public class EnvioDGA { diff --git a/BLL/Integracion_DGA/ApiService.cs b/BLL/Integracion_DGA/ApiService.cs deleted file mode 100644 index d666502..0000000 --- a/BLL/Integracion_DGA/ApiService.cs +++ /dev/null @@ -1,111 +0,0 @@ -using System.Text.Json; -using System.Text; -using Azure.Core; -using System; -using Newtonsoft.Json; - -namespace BLL.Integracion_DGA -{ - public class ApiService - { - private readonly HttpClient _httpClient; - - public ApiService(HttpClient httpClient) - { - _httpClient = httpClient ?? throw new ArgumentNullException(nameof(httpClient)); - } - - public async Task GetApiResponseAsync(string apiUrl, Dictionary headers = null) - { - - using (var httpClient = new HttpClient()) - { - // Configura la URL base - httpClient.BaseAddress = new Uri(apiUrl); - - var request = new HttpRequestMessage(HttpMethod.Get, apiUrl); - - // Configura los encabezados personalizados si se proporcionan - if (headers != null) - { - foreach (var header in headers) - { - request.Headers.Add(header.Key, header.Value); - } - } - - // Realiza la solicitud con la solicitud personalizada - try - { - var response = await httpClient.SendAsync(request); - if (response.IsSuccessStatusCode) - { - return await response.Content.ReadAsStringAsync(); - } - else - { - // Maneja errores aquí según sea necesario. - Console.WriteLine($"Error en la solicitud: {response.StatusCode}"); - throw new HttpRequestException($"Error en la solicitud HTTP. Código de estado: {response.StatusCode}"); - } - }catch (Exception ex) - { - Console.WriteLine("Error: " + ex.Message); - throw new Exception($"Error en la solicitud HTTP: {ex.Message}"); - // Maneja la excepción según sea necesario - } - } - } - - public async Task PostApiResponseAsync(string apiUrl, Dictionary headers = null, object data = null) - { - using (var httpClient = new HttpClient()) - { - try - { - httpClient.BaseAddress = new Uri(apiUrl); - var request = new HttpRequestMessage(HttpMethod.Post, apiUrl); - - // Serializa el objeto data a JSON - //string jsonData = JsonSerializer.Serialize(data); - string jsonData = JsonConvert.SerializeObject(data); - // Crea el contenido de la solicitud HTTP con el cuerpo JSON - HttpContent contenido = new StringContent(jsonData, Encoding.UTF8, "application/json"); - request.Content = contenido; - - // Configura los encabezados personalizados si se proporcionan - if (headers != null) - { - foreach (var header in headers) - { - request.Headers.Add(header.Key, header.Value); - } - } - - // Realiza la solicitud POST - HttpResponseMessage response = await httpClient.SendAsync(request); - - // Verifica si la solicitud fue exitosa - if (response.IsSuccessStatusCode) - { - // Lee la respuesta como una cadena - return await response.Content.ReadAsStringAsync(); - } - else - { - // La solicitud no fue exitosa, maneja el error según sea necesario - Console.WriteLine($"Error en la solicitud HTTP. Código de estado: {response.StatusCode}"); - throw new HttpRequestException($"Error en la solicitud HTTP. Código de estado: {response.StatusCode}"); - } - } - catch (Exception ex) - { - // Maneja excepciones si ocurren - Console.WriteLine($"Error en la solicitud HTTP: {ex.Message}"); - throw new Exception($"Error en la solicitud HTTP: {ex.Message}"); - } - } - } - } -} - diff --git a/BLL/Integracion_DGA/BusinessLogic.cs b/BLL/Integracion_DGA/BusinessLogic.cs deleted file mode 100644 index 63d0871..0000000 --- a/BLL/Integracion_DGA/BusinessLogic.cs +++ /dev/null @@ -1,228 +0,0 @@ -using Azure; -using DAL; -using Microsoft.Extensions.Configuration; -using Shared.DTO; -using Shared.DTO.Integracion_DGA; -using Shared.Helper; -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Text.Json; -using System.Threading.Tasks; - -namespace BLL.Integracion_DGA -{ - public class BusinessLogic - { - private readonly IConfiguration _configuration; - private readonly ApiService _apiService; - private readonly JobsDgaRepository _jobs; - private readonly JobsDgaVilosRepository _jobsVilos; - private readonly JobsDgaSupFlujRepository _jobsSupFluj; - private readonly FileLoggerHelper _fileLoggerHelper; - - public BusinessLogic(IConfiguration configuration, ApiService apiService, JobsDgaRepository jobs, JobsDgaVilosRepository jobsVilos, JobsDgaSupFlujRepository jobsSupFluj) { - _configuration = configuration; - _apiService = apiService; - _jobs = jobs; - _jobsVilos = jobsVilos; - _jobsSupFluj = jobsSupFluj; - - FileLoggerHelper.ConfigureLogger(_configuration); - } - - public async Task Run() - { - - DateTimeOffset dateEnd = DateTimeOffset.Now; - DateTimeOffset dateStart = dateEnd.AddHours(-1); - - JsonSerializerOptions options = new JsonSerializerOptions() { PropertyNameCaseInsensitive = true }; - - //FileLoggerHelper.ConfigureLogger(_configuration); - WriteLineAndLog($"Inicia Proceso DGA"); - try - { - string apiUrlBase = _configuration["ApiSettings:ApiUrl"]; - Dictionary headers = new Dictionary - { - { "nexustoken", _configuration["ApiSettings:ApiKey"] }, - { "nexusapiversion", _configuration["ApiSettings:Version"] }, - { "accept", "application/json" } - }; - - WriteLineAndLog($"Obteniendo Documentos"); - string apiUrlDocuments = apiUrlBase + "/api/Documents"; - - // Utiliza el servicio para realizar la solicitud a la API con URL y encabezados personalizados - string responseData = await _apiService.GetApiResponseAsync(apiUrlDocuments, headers); - - var documento = JsonSerializer.Deserialize>(responseData, options); - foreach (DocumentResponse item in documento) - { - WriteLineAndLog($"Obteniendo Tagviews"); - string apiUrlTagViews = $"{apiUrlBase}/api/Documents/tagviews/{item.uid}"; - responseData = await _apiService.GetApiResponseAsync(apiUrlTagViews, headers); - TagviewsResponse tagviews = JsonSerializer.Deserialize(responseData, options); - - List listTagsID = new List(); - foreach (Column tag in tagviews.Columns) - { - listTagsID.Add(tag.Uid); - } - - HistoricRequest historicRequest = new HistoricRequest(); - historicRequest.DataSource = _configuration["ApiSettings:DataSource"]; - historicRequest.Resolution = _configuration["ApiSettings: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); - List historicResponse = JsonSerializer.Deserialize>(responseData, options); - - List listDgaMacroResultados = new List(); - foreach (Column tag in tagviews.Columns) - { - IEnumerable filter = historicResponse.Where(h => h.Uid == tag.Uid); - foreach (HistoricResponse historic in filter) - { - TimeZoneInfo zonaHorariaChile = TimeZoneInfo.FindSystemTimeZoneById("Pacific SA Standard Time"); - DateTime now = new DateTime(1970, 1, 1, 0, 0, 0, DateTimeKind.Utc).AddSeconds(historic.TimeStamp); - DateTime fechaHoraChile = TimeZoneInfo.ConvertTimeFromUtc(now, zonaHorariaChile); - - - DgaMacroResultado dgaMacroResultado = new DgaMacroResultado(); - dgaMacroResultado.TagName = $"SCADA001.{tag.Name}.F_CV"; - dgaMacroResultado.Value = historic.Value; - //dgaMacroResultado.TimeStamp = new DateTime(historic.TimeStamp); - dgaMacroResultado.TimeStamp = fechaHoraChile; - - listDgaMacroResultados.Add(dgaMacroResultado); - } - } - - /**************/ - WriteLineAndLog($"Inicia Envio DGA", ConsoleColor.Green); - WriteLineAndLog($"\t Descargar datos historian: Insertar DgaMacroResultado"); - var resultMacro = await _jobs.InsertarDgaMacroResultado(listDgaMacroResultados); - - WriteLineAndLog($"\t Descargar datos historian: Insertar DgaSensorResultado"); - List listDgaSensorResultado = listDgaMacroResultados.Select(item => new DgaSensorResultado - { - TagName = item.TagName, - TimeStamp = item.TimeStamp, - Value = item.Value, - Quality = item.Quality - }).ToList(); - - var resultSensor = await _jobs.InsertarDgaSensorResultado(listDgaSensorResultado); - - WriteLineAndLog($"\t Calculo DGA"); - var resultCalculo = await _jobs.SpCalculoDga(); - - WriteLineAndLog($"\t descargar datos suma reversibilidad : Insertar DgaMacroResultadoSupFlujSuma"); - List listDgaMacroResultadoSupFlujSuma = listDgaMacroResultados.Select(item => new DgaMacroResultadoSupFlujSuma - { - TagName = item.TagName, - TimeStamp = item.TimeStamp, - Value = item.Value, - Quality = item.Quality - }).ToList(); - - var resultSupFlujSuma = await _jobs.InsertarDgaMacroResultadoSupFlujSuma(listDgaMacroResultadoSupFlujSuma); - - WriteLineAndLog($"\t Calculo Suma"); - var resultCalculoDgaSup = await _jobs.SpCalculoDgaSupFlujSumaSnreversibilidad(); - - - WriteLineAndLog($"\t Traspaso datos achird"); - var result = await _jobs.SpTraspasoDatosAchird(); - WriteLineAndLog($"Fin Envio DGA", ConsoleColor.Green); - /**************/ - /**************/ - WriteLineAndLog($"Inicio Envio DGA Vilos", ConsoleColor.Green); - WriteLineAndLog($"\t Descargar datos historian: Insertar InsertarDgaMacroResultadoVilos"); - List listDgaMacroResultadoVilos = listDgaMacroResultados.Select(item => new DgaMacroResultadoVilos - { - TagName = item.TagName, - TimeStamp = item.TimeStamp, - Value = item.Value, - Quality = item.Quality - }).ToList(); - - var resultVilos = await _jobsVilos.InsertarDgaMacroResultadoVilos(listDgaMacroResultadoVilos); - - WriteLineAndLog($"\t Descargar datos historian: Insertar InsertarDgaSensorResultadoVilos"); - List listDgaSensorResultadoVilos = listDgaMacroResultados.Select(item => new DgaSensorResultadoVilos - { - TagName = item.TagName, - TimeStamp = item.TimeStamp, - Value = item.Value, - Quality = item.Quality - }).ToList(); - - var resultSensorVilos = await _jobsVilos.InsertarDgaSensorResultadoVilos(listDgaSensorResultadoVilos); - - WriteLineAndLog($"\t Calculo Suma"); - var resultCalculoVilos = await _jobsVilos.SpCalculoDgaVilos(); - - - WriteLineAndLog($"\t Traspaso datos achird"); - var resultAchirdVilos = await _jobsVilos.SpTraspasoDatosAchirdVilos(); - WriteLineAndLog($"Fin Envio DGA Vilos", ConsoleColor.Green); - /**************/ - /**************/ - WriteLineAndLog($"Inicio Envio DGA Sup Fluj", ConsoleColor.Green); - WriteLineAndLog($"\t Descargar datos historian: Insertar InsertarDgaMacroResultadoSupFluj"); - List listDgaMacroResultadoSupFluj = listDgaMacroResultados.Select(item => new DgaMacroResultadoSupFluj - { - TagName = item.TagName, - TimeStamp = item.TimeStamp, - Value = item.Value, - Quality = item.Quality - }).ToList(); - - var resultSensorSup = await _jobsSupFluj.InsertarDgaMacroResultadoSupFluj(listDgaMacroResultadoSupFluj); - - WriteLineAndLog($"\t Calculo Suma"); - var resultCalculoSup = await _jobsSupFluj.SpCalculoDgaSupFluj(); - - - WriteLineAndLog($"\t Traspaso datos achird"); - var resultAchirdSup = await _jobsSupFluj.SpTraspasoDatosAchirdSupFluj(); - WriteLineAndLog($"Fin Envio DGA Sup Fluj", ConsoleColor.Green); - /**************/ - /**************/ - } - WriteLineAndLog($"FIN Proceso DGA"); - } - catch (Exception ex) - { - FileLoggerHelper.LogError($"{ex.Message}", ex); - WriteLineAndLog($"{ex.Message}", ConsoleColor.Red); - } - - } - - static void WriteLineAndLog(string msj, ConsoleColor? color = null) - { - if (color.HasValue && Enum.IsDefined(typeof(ConsoleColor), color.Value)) - { - Console.ForegroundColor = (ConsoleColor)color; - Console.WriteLine(msj); - Console.ResetColor(); - } - else - { - Console.WriteLine($"{msj}"); - } - - FileLoggerHelper.LogInformation($"{msj}"); - } - } -} diff --git a/DAL/Encriptador.cs b/DAL/Encriptador.cs deleted file mode 100644 index 3153883..0000000 --- a/DAL/Encriptador.cs +++ /dev/null @@ -1,58 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Security.Cryptography; -using System.Text; -using System.Threading.Tasks; - -namespace DAL -{ - public static class Encriptador - { - private static readonly byte[] key = Encoding.ASCII.GetBytes("1234567891234567"); - private static readonly byte[] iv = Encoding.ASCII.GetBytes("Devjoker7.37hAES"); - - public static string Encripta(string Cadena) - { - - using Aes aesAlg = Aes.Create(); - aesAlg.Key = key; - aesAlg.IV = iv; - - ICryptoTransform encryptor = aesAlg.CreateEncryptor(aesAlg.Key, aesAlg.IV); - - using (MemoryStream msEncrypt = new MemoryStream()) - { - using (CryptoStream csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write)) - { - using (StreamWriter swEncrypt = new StreamWriter(csEncrypt)) - { - swEncrypt.Write(Cadena); - } - } - - return Convert.ToBase64String(msEncrypt.ToArray()); - } - } - - public static string Desencripta(string Cadena) - { - using Aes aesAlg = Aes.Create(); - aesAlg.Key = key; - aesAlg.IV = iv; - - ICryptoTransform decryptor = aesAlg.CreateDecryptor(aesAlg.Key, aesAlg.IV); - - using (MemoryStream msDecrypt = new MemoryStream(Convert.FromBase64String(Cadena))) - { - using (CryptoStream csDecrypt = new CryptoStream(msDecrypt, decryptor, CryptoStreamMode.Read)) - { - using (StreamReader srDecrypt = new StreamReader(csDecrypt)) - { - return srDecrypt.ReadToEnd(); - } - } - } - } - } -} diff --git a/DAL/JobsDgaRepository.cs b/DAL/JobsDgaRepository.cs deleted file mode 100644 index d68c233..0000000 --- a/DAL/JobsDgaRepository.cs +++ /dev/null @@ -1,159 +0,0 @@ -using Microsoft.Data.SqlClient; -using Microsoft.Win32; -using Shared.DTO.Integracion_DGA; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Dapper; -using Microsoft.Extensions.Configuration; - -namespace DAL -{ - public class JobsDgaRepository - { - private static string connectionString = string.Empty; - private readonly IConfiguration _configuration; - public JobsDgaRepository(IConfiguration configuration) - { - _configuration = configuration; - connectionString = _configuration.GetConnectionString("DefaultConnection") ?? ""; - - } - - public async Task InsertarDgaMacroResultado(List dgaMacroResultados) - { - try - { - using (SqlConnection connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - // 1. Truncar la tabla antes de insertar - await connection.ExecuteAsync("TRUNCATE TABLE DGA_MACRO_RESULTADO"); - // 2. Insertar la lista de registros - string sql = "INSERT INTO DGA_MACRO_RESULTADO (TagName, TimeStamp, Value, Quality) VALUES (@TagName, @TimeStamp, @Value, @Quality)"; - // Esto inserta todos los elementos de la lista en la tabla - await connection.ExecuteAsync(sql, dgaMacroResultados); - return true; - } - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task InsertarDgaSensorResultado(List dgaSensorResultado) - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - - // 1. Truncar la tabla DGA_SENSOR_RESULTADO - await connection.ExecuteAsync("TRUNCATE TABLE DGA_SENSOR_RESULTADO"); - - // 2. Llamar al stored procedure SP_CALCULO_DGA - await connection.ExecuteAsync("SP_CALCULO_DGA", commandType: System.Data.CommandType.StoredProcedure); - - // 3. Insertar todos los registros de la lista con Dapper - string sql = "INSERT INTO DGA_SENSOR_RESULTADO (TagName, TimeStamp, Value, Quality) VALUES (@TagName, @TimeStamp, @Value, @Quality)"; - await connection.ExecuteAsync(sql, dgaSensorResultado); - - return true; - } - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task InsertarDgaMacroResultadoSupFlujSuma(List dgaMacroResultadoSupFlujSuma) - { - try - { - // Configurar la conexión a la base de datos - using (SqlConnection connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - // Truncar la tabla antes de insertar - await connection.ExecuteAsync("TRUNCATE TABLE DGA_MACRO_RESULTADO_SUP_FLUJ_SUMA"); - - // Crear un adaptador de datos - SqlDataAdapter adapter = new SqlDataAdapter(); - - // Configurar el comando de inserción - string sql = "INSERT INTO DGA_MACRO_RESULTADO_SUP_FLUJ_SUMA (TagName, TimeStamp, Value, Quality) VALUES (@TagName, @TimeStamp, @Value, @Quality)"; - await connection.ExecuteAsync(sql, dgaMacroResultadoSupFlujSuma); - - return true; // Éxito - } - }catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task SpCalculoDga() - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - // Ejecuta el stored procedure sin parámetros - await connection.ExecuteAsync("SP_CALCULO_DGA", commandType: CommandType.StoredProcedure); - } - return true; // Éxito - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task SpCalculoDgaSupFlujSumaSnreversibilidad() - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - await connection.ExecuteAsync( - "SP_CALCULO_DGA_SUP_FLUJ_SUMA_SNREVERSIBILIDAD", - commandType: CommandType.StoredProcedure - ); - } - return true; // Éxito - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task SpTraspasoDatosAchird() - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - await connection.ExecuteAsync( - "SP_TRASPASO_DATOS_ACHIRD", - commandType: CommandType.StoredProcedure - ); - } - return true; // Éxito - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - } -} diff --git a/DAL/JobsDgaSupFlujRepository.cs b/DAL/JobsDgaSupFlujRepository.cs deleted file mode 100644 index 9ccd075..0000000 --- a/DAL/JobsDgaSupFlujRepository.cs +++ /dev/null @@ -1,88 +0,0 @@ -using Dapper; -using Microsoft.Data.SqlClient; -using Microsoft.Extensions.Configuration; -using Shared.DTO.Integracion_DGA; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DAL -{ - public class JobsDgaSupFlujRepository - { - private static string connectionString = string.Empty; - private readonly IConfiguration _configuration; - - public JobsDgaSupFlujRepository(IConfiguration configuration) - { - _configuration = configuration; - connectionString = _configuration.GetConnectionString("DefaultConnection") ?? ""; - } - - public async Task InsertarDgaMacroResultadoSupFluj(List dgaMacroResultadoSupFluj) - { - try - { - // Configurar la conexión a la base de datos - using (SqlConnection connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - await connection.ExecuteAsync("TRUNCATE TABLE DGA_MACRO_RESULTADO_SUP_FLUJ"); - - await SpCalculoDgaSupFluj(); - - string sql = "INSERT INTO DGA_MACRO_RESULTADO_SUP_FLUJ (TagName, TimeStamp, Value, Quality) VALUES (@TagName, @TimeStamp, @Value, @Quality)"; - await connection.ExecuteAsync(sql, dgaMacroResultadoSupFluj); - return true; - } - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task SpCalculoDgaSupFluj() - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - await connection.ExecuteAsync( - "SP_CALCULO_DGA_SUP_FLUJ", - commandType: CommandType.StoredProcedure - ); - } - return true; // Éxito - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task SpTraspasoDatosAchirdSupFluj() - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - await connection.ExecuteAsync( - "SP_TRASPASO_DATOS_ACHIRD_SUP_FLUJ", - commandType: CommandType.StoredProcedure - ); - } - return true; // Éxito - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - } -} diff --git a/DAL/JobsDgaVilosRepository.cs b/DAL/JobsDgaVilosRepository.cs deleted file mode 100644 index 822c6bb..0000000 --- a/DAL/JobsDgaVilosRepository.cs +++ /dev/null @@ -1,116 +0,0 @@ -using Dapper; -using Microsoft.Data.SqlClient; -using Microsoft.Extensions.Configuration; -using Shared.DTO.Integracion_DGA; -using System; -using System.Collections.Generic; -using System.Data; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace DAL -{ - public class JobsDgaVilosRepository - { - private IConfiguration _configuration; - private static string connectionString = string.Empty; - - public JobsDgaVilosRepository(IConfiguration configuration) - { - _configuration = configuration; - connectionString = _configuration.GetConnectionString("DefaultConnection") ?? ""; - } - - public async Task InsertarDgaMacroResultadoVilos(List dgaMacroResultadoVilos) - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - - // 1. Truncar la tabla antes de insertar - await connection.ExecuteAsync("TRUNCATE TABLE DGA_MACRO_RESULTADO_VILOS"); - - // 2. Llamar al stored procedure - await connection.ExecuteAsync("SP_CALCULO_DGA_VILOS", commandType: System.Data.CommandType.StoredProcedure); - - // 3. Insertar todos los datos de la lista usando Dapper - string sql = "INSERT INTO DGA_MACRO_RESULTADO_VILOS (TagName, TimeStamp, Value, Quality) VALUES (@TagName, @TimeStamp, @Value, @Quality)"; - await connection.ExecuteAsync(sql, dgaMacroResultadoVilos); - - return true; // Éxito - } - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task InsertarDgaSensorResultadoVilos(List dgaSensorResultadoVilos) - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - - // 1. Truncar la tabla antes de insertar - await connection.ExecuteAsync("TRUNCATE TABLE DGA_SENSOR_RESULTADO_VILOS"); - - // 2. Insertar todos los datos de la lista usando Dapper - string sql = "INSERT INTO DGA_SENSOR_RESULTADO_VILOS (TagName, TimeStamp, Value, Quality) VALUES (@TagName, @TimeStamp, @Value, @Quality)"; - await connection.ExecuteAsync(sql, dgaSensorResultadoVilos); - - return true; // Éxito - } - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task SpCalculoDgaVilos() - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - await connection.ExecuteAsync( - "SP_CALCULO_DGA_VILOS", - commandType: CommandType.StoredProcedure - ); - } - return true; // Éxito - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - - public async Task SpTraspasoDatosAchirdVilos() - { - try - { - using (var connection = new SqlConnection(connectionString)) - { - await connection.OpenAsync(); - await connection.ExecuteAsync( - "SP_TRASPASO_DATOS_ACHIRD_VILOS", - commandType: CommandType.StoredProcedure - ); - } - return true; // Éxito - } - catch (Exception ex) - { - throw new Exception($"Error: {ex.Message}"); - } - } - } -} diff --git a/DAL/MedicionScadaRepository.cs b/DAL/MedicionScadaRepository.cs index f2143cd..71f5a7b 100644 --- a/DAL/MedicionScadaRepository.cs +++ b/DAL/MedicionScadaRepository.cs @@ -1,7 +1,7 @@ using Dapper; using Microsoft.Data.SqlClient; using Microsoft.Extensions.Configuration; -using Shared.DTO.Envios_DGA; +using Shared.DTO; using System.Data; namespace DAL diff --git a/DAS/RegistrarMedicion.cs b/DAS/RegistrarMedicion.cs index ee4765a..5ed4372 100644 --- a/DAS/RegistrarMedicion.cs +++ b/DAS/RegistrarMedicion.cs @@ -1,5 +1,5 @@ using Microsoft.Extensions.Configuration; -using Shared.DTO.Envios_DGA; +using Shared.DTO; using System.Text; using System.Text.Json; diff --git a/Integracion_DGA/Program.cs b/Integracion_DGA/Program.cs index d2d54ff..5e70bfa 100644 --- a/Integracion_DGA/Program.cs +++ b/Integracion_DGA/Program.cs @@ -1,10 +1,9 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Hosting; using Microsoft.Extensions.Configuration; +using BLL; using DAL; using DAS; -using BLL.Recuperacion_DGA; -using BLL.Integracion_DGA; namespace Integracion_DGA { @@ -21,18 +20,10 @@ namespace Integracion_DGA services.AddScoped(); services.AddScoped(); services.AddHttpClient(); - //Estos dos servicios son los que migre del otro proyecto - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); - services.AddScoped(); }) .Build(); var envioDGA = host.Services.GetRequiredService(); - var BussinessLogic = host.Services.GetRequiredService(); - var ApiService = host.Services.GetRequiredService(); var mediciones = await envioDGA.ObtenerMedicionesAsync(); Console.WriteLine($"Se obtuvieron {mediciones.Count} registros."); diff --git a/Integracion_DGA/appsettings.json b/Integracion_DGA/appsettings.json index 4140b3b..f928e3b 100644 --- a/Integracion_DGA/appsettings.json +++ b/Integracion_DGA/appsettings.json @@ -1,19 +1,14 @@ { - "ConnectionStrings": { - "DefaultConnection": "Server=10.224.7.53,1433;Initial Catalog=ENVIO_DGA;Persist Security Info=False;User ID=enviodga;Password=esval++2022;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=true;Connection Timeout=30;" - }, - "ApiSubterranea": { - "BaseUrl": "https://apimee.mop.gob.cl", - "Endpoint": "/api/v1/mediciones/subterraneas" - }, - "Credenciales": { - "rutEmpresa": "9A4PUqd1t4", - "rutUsuario": "77555666-7", - "password": "20999888-7" - }, - "Logging": { - "LogFile": { - "Path": "logs/log.txt" - } - } -} + "ConnectionStrings": { + "DefaultConnection": "Server=10.224.7.53,1433;Initial Catalog=ENVIO_DGA;Persist Security Info=False;User ID=enviodga;Password=esval++2022;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=true;Connection Timeout=30;" + }, + "ApiSubterranea": { + "BaseUrl": "https://apimee.mop.gob.cl", + "Endpoint": "/api/v1/mediciones/subterraneas" + }, + "Credenciales": { + "rutEmpresa": "9A4PUqd1t4", + "rutUsuario": "77555666-7", + "password": "20999888-7" + } +} \ No newline at end of file diff --git a/SHARED/DTO/DocumentResponse.cs b/SHARED/DTO/DocumentResponse.cs deleted file mode 100644 index 9b963c6..0000000 --- a/SHARED/DTO/DocumentResponse.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Shared.DTO -{ - public class DocumentResponse - { - public string owner { get; set; } - public string type { get; set; } - public string uid { get; set; } - public string name { get; set; } - } -} diff --git a/SHARED/DTO/HistoricRequest.cs b/SHARED/DTO/HistoricRequest.cs deleted file mode 100644 index 8c63b7e..0000000 --- a/SHARED/DTO/HistoricRequest.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Shared.DTO -{ - public class HistoricRequest - { - public string DataSource { get; set; } - public string Resolution { get; set; } - public List Uids { get; set; } - public long StartTs { get; set; } - public long EndTs { get; set; } - } -} diff --git a/SHARED/DTO/HistoricResponse.cs b/SHARED/DTO/HistoricResponse.cs deleted file mode 100644 index e99c753..0000000 --- a/SHARED/DTO/HistoricResponse.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Shared.DTO -{ - public class HistoricResponse - { - public string Uid { get; set; } - public double? Value { get; set; } - public long TimeStamp { get; set; } - } -} diff --git a/SHARED/DTO/Integracion_DGA/BitacoraPiloto.cs b/SHARED/DTO/Integracion_DGA/BitacoraPiloto.cs deleted file mode 100644 index 6a1eff6..0000000 --- a/SHARED/DTO/Integracion_DGA/BitacoraPiloto.cs +++ /dev/null @@ -1,47 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class BitacoraPiloto -{ - public string IdProceso { get; set; } = null!; - - public DateTime? FechaInicial { get; set; } - - public DateTime? FechaFinal { get; set; } - - public string? AnoMes { get; set; } - - public int? Ano { get; set; } - - public int? Mes { get; set; } - - public int? Sector { get; set; } - - public string? Frecuencia { get; set; } - - public string? Procesado { get; set; } - - public DateTime? FechaMedicion { get; set; } - - public string? Estructura { get; set; } - - public string? Variante { get; set; } - - public string? Campo { get; set; } - - public float? ValorOra { get; set; } - - public float? ValorSql { get; set; } - - public string? Naturaleza { get; set; } - - public string? CampoCondicion1 { get; set; } - - public string? CampoCondicion2 { get; set; } - - public int Cor { get; set; } - - public int? Diferencia { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabApoyoProceso.cs b/SHARED/DTO/Integracion_DGA/CabApoyoProceso.cs deleted file mode 100644 index d2c1f14..0000000 --- a/SHARED/DTO/Integracion_DGA/CabApoyoProceso.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabApoyoProceso -{ - public string IdSensor { get; set; } = null!; -} diff --git a/SHARED/DTO/Integracion_DGA/CabBaseMonitoreoConsumo.cs b/SHARED/DTO/Integracion_DGA/CabBaseMonitoreoConsumo.cs deleted file mode 100644 index 67f44c8..0000000 --- a/SHARED/DTO/Integracion_DGA/CabBaseMonitoreoConsumo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabBaseMonitoreoConsumo -{ - public string? EmpresaPiloto { get; set; } - - public double? IdCliente { get; set; } - - public string? IdDma { get; set; } - - public string? FechaLectura { get; set; } - - public double? ConsumoAcumulado { get; set; } - - public string? CodigoLectura { get; set; } - - public DateTime? FechaFacturacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabClientesDma.cs b/SHARED/DTO/Integracion_DGA/CabClientesDma.cs deleted file mode 100644 index 28e0394..0000000 --- a/SHARED/DTO/Integracion_DGA/CabClientesDma.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabClientesDma -{ - public int? IdCliente { get; set; } - - public string? IdDma { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenale.cs b/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenale.cs deleted file mode 100644 index 00d706d..0000000 --- a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenale.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabIncrementoValoresSenale -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesBaseform.cs b/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesBaseform.cs deleted file mode 100644 index 2a58bd2..0000000 --- a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesBaseform.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabIncrementoValoresSenalesBaseform -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesNe.cs b/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesNe.cs deleted file mode 100644 index c050e77..0000000 --- a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesNe.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabIncrementoValoresSenalesNe -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesWt.cs b/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesWt.cs deleted file mode 100644 index 3f0b78d..0000000 --- a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesWt.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabIncrementoValoresSenalesWt -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesWtPrueba.cs b/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesWtPrueba.cs deleted file mode 100644 index 8c030c8..0000000 --- a/SHARED/DTO/Integracion_DGA/CabIncrementoValoresSenalesWtPrueba.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabIncrementoValoresSenalesWtPrueba -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabMaxFecha.cs b/SHARED/DTO/Integracion_DGA/CabMaxFecha.cs deleted file mode 100644 index 76a32e8..0000000 --- a/SHARED/DTO/Integracion_DGA/CabMaxFecha.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabMaxFecha -{ - public string IdSensor { get; set; } = null!; - - public string? FrecuenciaRegistro { get; set; } - - public DateTime? MaxFecha { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabMonitoreoConsumo.cs b/SHARED/DTO/Integracion_DGA/CabMonitoreoConsumo.cs deleted file mode 100644 index ae7cd62..0000000 --- a/SHARED/DTO/Integracion_DGA/CabMonitoreoConsumo.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabMonitoreoConsumo -{ - public string? EmpresaPiloto { get; set; } - - public double? IdCliente { get; set; } - - public string? IdDma { get; set; } - - public string? FechaLectura { get; set; } - - public double? ConsumoAcumulado { get; set; } - - public string? CodigoLectura { get; set; } - - public DateTime? FechaFacturacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabResultadoCargaHistorico.cs b/SHARED/DTO/Integracion_DGA/CabResultadoCargaHistorico.cs deleted file mode 100644 index c91f25d..0000000 --- a/SHARED/DTO/Integracion_DGA/CabResultadoCargaHistorico.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabResultadoCargaHistorico -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabResultadoCargaHistoricoPwbi.cs b/SHARED/DTO/Integracion_DGA/CabResultadoCargaHistoricoPwbi.cs deleted file mode 100644 index 9222413..0000000 --- a/SHARED/DTO/Integracion_DGA/CabResultadoCargaHistoricoPwbi.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabResultadoCargaHistoricoPwbi -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenale.cs b/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenale.cs deleted file mode 100644 index c1b47df..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenale.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSalidaValoresSenale -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesBaseform.cs b/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesBaseform.cs deleted file mode 100644 index a9456c1..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesBaseform.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSalidaValoresSenalesBaseform -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesNe.cs b/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesNe.cs deleted file mode 100644 index eda0326..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesNe.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSalidaValoresSenalesNe -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesWt.cs b/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesWt.cs deleted file mode 100644 index 6790091..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSalidaValoresSenalesWt.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSalidaValoresSenalesWt -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSenalesSensoresBorrada.cs b/SHARED/DTO/Integracion_DGA/CabSenalesSensoresBorrada.cs deleted file mode 100644 index d15207c..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSenalesSensoresBorrada.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSenalesSensoresBorrada -{ - public string TagName { get; set; } = null!; - - public DateTime? FechaDesde { get; set; } - - public string? FechaHasta { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensore.cs b/SHARED/DTO/Integracion_DGA/CabSensore.cs deleted file mode 100644 index 92b77e6..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensore.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensore -{ - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresAgregar.cs b/SHARED/DTO/Integracion_DGA/CabSensoresAgregar.cs deleted file mode 100644 index 573ef78..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresAgregar.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresAgregar -{ - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresBaseform.cs b/SHARED/DTO/Integracion_DGA/CabSensoresBaseform.cs deleted file mode 100644 index d8cfedb..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresBaseform.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresBaseform -{ - public int Id { get; set; } - - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } - - public short EstadoSensor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresEliminado.cs b/SHARED/DTO/Integracion_DGA/CabSensoresEliminado.cs deleted file mode 100644 index 846e1c1..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresEliminado.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresEliminado -{ - public DateTime? FechaEliminacion { get; set; } - - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresEliminar.cs b/SHARED/DTO/Integracion_DGA/CabSensoresEliminar.cs deleted file mode 100644 index 98d55c5..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresEliminar.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresEliminar -{ - public string? IdSensor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresHistorico.cs b/SHARED/DTO/Integracion_DGA/CabSensoresHistorico.cs deleted file mode 100644 index 812b872..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresHistorico.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresHistorico -{ - public int Id { get; set; } - - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } - - public short EstadoSensor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresNe.cs b/SHARED/DTO/Integracion_DGA/CabSensoresNe.cs deleted file mode 100644 index 42491e2..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresNe.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresNe -{ - public int Id { get; set; } - - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } - - public short EstadoSensor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresRevisar.cs b/SHARED/DTO/Integracion_DGA/CabSensoresRevisar.cs deleted file mode 100644 index 01cd355..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresRevisar.cs +++ /dev/null @@ -1,29 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresRevisar -{ - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresValidar.cs b/SHARED/DTO/Integracion_DGA/CabSensoresValidar.cs deleted file mode 100644 index 696ab34..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresValidar.cs +++ /dev/null @@ -1,35 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresValidar -{ - public int Id { get; set; } - - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } - - public short EstadoSensor { get; set; } - - public int CodEmpresa { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresWt.cs b/SHARED/DTO/Integracion_DGA/CabSensoresWt.cs deleted file mode 100644 index d5f9f87..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresWt.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresWt -{ - public int Id { get; set; } - - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } - - public short EstadoSensor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabSensoresWtPrueba.cs b/SHARED/DTO/Integracion_DGA/CabSensoresWtPrueba.cs deleted file mode 100644 index 2725331..0000000 --- a/SHARED/DTO/Integracion_DGA/CabSensoresWtPrueba.cs +++ /dev/null @@ -1,33 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabSensoresWtPrueba -{ - public int Id { get; set; } - - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? Descripcion { get; set; } - - public string? Tipo { get; set; } - - public string? Unidad { get; set; } - - public string? FrecuenciaRegistro { get; set; } - - public string? IdMedicion { get; set; } - - public string? OrigenSenal { get; set; } - - public int? CodMedicion { get; set; } - - public byte? FrecuenciaEnvio { get; set; } - - public int? CantidadData { get; set; } - - public short EstadoSensor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabUltimoEnvio.cs b/SHARED/DTO/Integracion_DGA/CabUltimoEnvio.cs deleted file mode 100644 index f056612..0000000 --- a/SHARED/DTO/Integracion_DGA/CabUltimoEnvio.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabUltimoEnvio -{ - public string? EmpresaPiloto { get; set; } - - public string IdSensor { get; set; } = null!; - - public string? OrigenSenal { get; set; } - - public string? MaxFecha { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabValoresSenale.cs b/SHARED/DTO/Integracion_DGA/CabValoresSenale.cs deleted file mode 100644 index 05da0c8..0000000 --- a/SHARED/DTO/Integracion_DGA/CabValoresSenale.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabValoresSenale -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabValoresSenalesAgregar.cs b/SHARED/DTO/Integracion_DGA/CabValoresSenalesAgregar.cs deleted file mode 100644 index 2d371ee..0000000 --- a/SHARED/DTO/Integracion_DGA/CabValoresSenalesAgregar.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabValoresSenalesAgregar -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabValoresSenalesBaseform.cs b/SHARED/DTO/Integracion_DGA/CabValoresSenalesBaseform.cs deleted file mode 100644 index bee7270..0000000 --- a/SHARED/DTO/Integracion_DGA/CabValoresSenalesBaseform.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabValoresSenalesBaseform -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabValoresSenalesHistorico.cs b/SHARED/DTO/Integracion_DGA/CabValoresSenalesHistorico.cs deleted file mode 100644 index 5375a0e..0000000 --- a/SHARED/DTO/Integracion_DGA/CabValoresSenalesHistorico.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabValoresSenalesHistorico -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabValoresSenalesNe.cs b/SHARED/DTO/Integracion_DGA/CabValoresSenalesNe.cs deleted file mode 100644 index bcd5dfc..0000000 --- a/SHARED/DTO/Integracion_DGA/CabValoresSenalesNe.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabValoresSenalesNe -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/CabValoresSenalesWt.cs b/SHARED/DTO/Integracion_DGA/CabValoresSenalesWt.cs deleted file mode 100644 index f781b7e..0000000 --- a/SHARED/DTO/Integracion_DGA/CabValoresSenalesWt.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class CabValoresSenalesWt -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public string? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaBorrado.cs b/SHARED/DTO/Integracion_DGA/DgaBorrado.cs deleted file mode 100644 index b2f72aa..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaBorrado.cs +++ /dev/null @@ -1,43 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaBorrado -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public long? Totalizador { get; set; } - - public string? MarcaUbicacion { get; set; } - - public DateTime? FechaBorrado { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacro.cs b/SHARED/DTO/Integracion_DGA/DgaMacro.cs deleted file mode 100644 index deecec0..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacro.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacro -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public long? Totalizador { get; set; } - - public string? MarcaUbicacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroA.cs b/SHARED/DTO/Integracion_DGA/DgaMacroA.cs deleted file mode 100644 index 1a2a225..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroA.cs +++ /dev/null @@ -1,45 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroA -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public int? IdLocalidad { get; set; } - - public string Localidad { get; set; } = null!; - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public long? Totalizador { get; set; } - - public string? MarcaUbicacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroQa.cs b/SHARED/DTO/Integracion_DGA/DgaMacroQa.cs deleted file mode 100644 index c6023c8..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroQa.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroQa -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public long? Totalizador { get; set; } - - public string? MarcaUbicacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroResultado.cs b/SHARED/DTO/Integracion_DGA/DgaMacroResultado.cs deleted file mode 100644 index 82c07ed..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroResultado.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroResultado -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoQa.cs b/SHARED/DTO/Integracion_DGA/DgaMacroResultadoQa.cs deleted file mode 100644 index cf74223..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoQa.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroResultadoQa -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSup.cs b/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSup.cs deleted file mode 100644 index 8d2c2b3..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSup.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroResultadoSup -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSupFluj.cs b/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSupFluj.cs deleted file mode 100644 index 38dfa95..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSupFluj.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroResultadoSupFluj -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSupFlujSuma.cs b/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSupFlujSuma.cs deleted file mode 100644 index 8e8fe2c..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoSupFlujSuma.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroResultadoSupFlujSuma -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoVilos.cs b/SHARED/DTO/Integracion_DGA/DgaMacroResultadoVilos.cs deleted file mode 100644 index f4ed351..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroResultadoVilos.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroResultadoVilos -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroSup.cs b/SHARED/DTO/Integracion_DGA/DgaMacroSup.cs deleted file mode 100644 index 22672d9..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroSup.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroSup -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public long? Totalizador { get; set; } - - public string? MarcaUbicacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroSupFluj.cs b/SHARED/DTO/Integracion_DGA/DgaMacroSupFluj.cs deleted file mode 100644 index 0082996..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroSupFluj.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroSupFluj -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public decimal? Totalizador { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroSupFlujSuma.cs b/SHARED/DTO/Integracion_DGA/DgaMacroSupFlujSuma.cs deleted file mode 100644 index 1df2adf..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroSupFlujSuma.cs +++ /dev/null @@ -1,39 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroSupFlujSuma -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public decimal? Totalizador { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroSuperficial.cs b/SHARED/DTO/Integracion_DGA/DgaMacroSuperficial.cs deleted file mode 100644 index 99d4d91..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroSuperficial.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroSuperficial -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public long? Totalizador { get; set; } - - public string? MarcaUbicacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaMacroVilo.cs b/SHARED/DTO/Integracion_DGA/DgaMacroVilo.cs deleted file mode 100644 index 0c73611..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaMacroVilo.cs +++ /dev/null @@ -1,41 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaMacroVilo -{ - public int Id { get; set; } - - public string? Zonal { get; set; } - - public string? Comuna { get; set; } - - public string? NombreCaptacion { get; set; } - - public string? Fuente { get; set; } - - public string? CodigoNbi { get; set; } - - public string? CodigoDga { get; set; } - - public string? InfraEstandarDga { get; set; } - - public string? Macro { get; set; } - - public string? Sensor { get; set; } - - public decimal? UbicacionSensor { get; set; } - - public string? MacroTag { get; set; } - - public string? SensorTag { get; set; } - - public int? TipoObra { get; set; } - - public int? IdSensor { get; set; } - - public long? Totalizador { get; set; } - - public string? MarcaUbicacion { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaSensorResultado.cs b/SHARED/DTO/Integracion_DGA/DgaSensorResultado.cs deleted file mode 100644 index c19b0ba..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaSensorResultado.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaSensorResultado -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaSensorResultadoQa.cs b/SHARED/DTO/Integracion_DGA/DgaSensorResultadoQa.cs deleted file mode 100644 index b5dc5e3..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaSensorResultadoQa.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaSensorResultadoQa -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DgaSensorResultadoVilos.cs b/SHARED/DTO/Integracion_DGA/DgaSensorResultadoVilos.cs deleted file mode 100644 index 19d2b79..0000000 --- a/SHARED/DTO/Integracion_DGA/DgaSensorResultadoVilos.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DgaSensorResultadoVilos -{ - public string TagName { get; set; } = null!; - - public DateTime TimeStamp { get; set; } - - public double? Value { get; set; } - - public string? Quality { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/DiccionarioCalidad.cs b/SHARED/DTO/Integracion_DGA/DiccionarioCalidad.cs deleted file mode 100644 index e480d35..0000000 --- a/SHARED/DTO/Integracion_DGA/DiccionarioCalidad.cs +++ /dev/null @@ -1,61 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class DiccionarioCalidad -{ - public string? Empresa { get; set; } - - public string? SubgerenciaZonal { get; set; } - - public string? ZonaRedes { get; set; } - - public string? Localidad { get; set; } - - public string? Codigo1 { get; set; } - - public string? Descripcion1 { get; set; } - - public string? Relacion { get; set; } - - public string? Codigo2 { get; set; } - - public string? CodigoIdunicoSensor { get; set; } - - public string? Descripcion2 { get; set; } - - public string? TipoVariable { get; set; } - - public string? TipoSensor { get; set; } - - public string? UnidadesIhistorian { get; set; } - - public string? UnidadesTaKaDu { get; set; } - - public string? FuentePresion { get; set; } - - public double? FrecuenciaTransmision { get; set; } - - public string? FuenteDatos { get; set; } - - public string? Manufactura { get; set; } - - public string? Modelo { get; set; } - - public string? TipoActivo { get; set; } - - public string? ActivoAsociado { get; set; } - - public double? CodigoIdgis { get; set; } - - public double? Latitud { get; set; } - - public double? Longitud { get; set; } - - public string? Plcscada { get; set; } - - public string? PantallaScada { get; set; } - - public string? EstadoSensor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/EstructuraRedEsvalScadaNbi.cs b/SHARED/DTO/Integracion_DGA/EstructuraRedEsvalScadaNbi.cs deleted file mode 100644 index 0f2feec..0000000 --- a/SHARED/DTO/Integracion_DGA/EstructuraRedEsvalScadaNbi.cs +++ /dev/null @@ -1,177 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class EstructuraRedEsvalScadaNbi -{ - public string? Empresa { get; set; } - - public string? SubgerenciaZonal { get; set; } - - public string? ZonaRedes { get; set; } - - public string? Localidad { get; set; } - - public string? Código2 { get; set; } - - public string? Descripción2 { get; set; } - - public string? Relación { get; set; } - - public string? Código { get; set; } - - public string? CódigoIdÚnicoSensor { get; set; } - - public string? Descripción { get; set; } - - public string? TipoDeVariable { get; set; } - - public string? TipoDeSensor { get; set; } - - public string? UnidadesIhistorian { get; set; } - - public string? UnidadesEnTaKaDu { get; set; } - - public string? FuenteDePresión { get; set; } - - public string? FrecuenciaDeTransmisión { get; set; } - - public string? FuenteDeDatos { get; set; } - - public string? Manufactura { get; set; } - - public string? Modelo { get; set; } - - public string? TipoDeActivo { get; set; } - - public string? ActivoAsociado { get; set; } - - public string? CódigoIdGis { get; set; } - - public string? Latitud { get; set; } - - public string? Longitud { get; set; } - - public string? PlcScada { get; set; } - - public string? PantallaScada { get; set; } - - public string? Empresa2 { get; set; } - - public string? Column27 { get; set; } - - public string? Column28 { get; set; } - - public string? Column29 { get; set; } - - public string? Column30 { get; set; } - - public string? Column31 { get; set; } - - public string? Column32 { get; set; } - - public string? Column33 { get; set; } - - public string? Column34 { get; set; } - - public string? Column35 { get; set; } - - public string? Column36 { get; set; } - - public string? Column37 { get; set; } - - public string? Column38 { get; set; } - - public string? Column39 { get; set; } - - public string? Column40 { get; set; } - - public string? Column41 { get; set; } - - public string? Column42 { get; set; } - - public string? Column43 { get; set; } - - public string? Column44 { get; set; } - - public string? Column45 { get; set; } - - public string? Column46 { get; set; } - - public string? Column47 { get; set; } - - public string? Column48 { get; set; } - - public string? Column49 { get; set; } - - public string? Column50 { get; set; } - - public string? Column51 { get; set; } - - public string? Column52 { get; set; } - - public string? Column53 { get; set; } - - public string? Column54 { get; set; } - - public string? Column55 { get; set; } - - public string? Column56 { get; set; } - - public string? Column57 { get; set; } - - public string? Column58 { get; set; } - - public string? Column59 { get; set; } - - public string? Column60 { get; set; } - - public string? Column61 { get; set; } - - public string? Column62 { get; set; } - - public string? Column63 { get; set; } - - public string? Column64 { get; set; } - - public string? Column65 { get; set; } - - public string? Column66 { get; set; } - - public string? Column67 { get; set; } - - public string? Column68 { get; set; } - - public string? Column69 { get; set; } - - public string? Column70 { get; set; } - - public string? Column71 { get; set; } - - public string? Column72 { get; set; } - - public string? Column73 { get; set; } - - public string? Column74 { get; set; } - - public string? Column75 { get; set; } - - public string? Column76 { get; set; } - - public string? Column77 { get; set; } - - public string? Column78 { get; set; } - - public string? Column79 { get; set; } - - public string? Column80 { get; set; } - - public string? Column81 { get; set; } - - public string? Column82 { get; set; } - - public string? Column83 { get; set; } - - public string? Column84 { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/IoAsParamMaxcap.cs b/SHARED/DTO/Integracion_DGA/IoAsParamMaxcap.cs deleted file mode 100644 index be6781e..0000000 --- a/SHARED/DTO/Integracion_DGA/IoAsParamMaxcap.cs +++ /dev/null @@ -1,21 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class IoAsParamMaxcap -{ - public string? IdScada { get; set; } - - public string? FiltroWhereN0 { get; set; } - - public string? FiltroWhereFrec { get; set; } - - public int? MaxBomb { get; set; } - - public string? Localidad { get; set; } - - public string? Sgz { get; set; } - - public string? NombrePlanta { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/MedicionDga.cs b/SHARED/DTO/Integracion_DGA/MedicionDga.cs deleted file mode 100644 index 6becb2b..0000000 --- a/SHARED/DTO/Integracion_DGA/MedicionDga.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class MedicionDga -{ - public string? Code { get; set; } - - public DateTime? DateOrigen { get; set; } - - public DateTime? DateMedicionSup { get; set; } - - public decimal? Caudal { get; set; } - - public decimal? Altura { get; set; } - - public DateTime? DateMedicionSub { get; set; } - - public decimal? Totalizador { get; set; } - - public decimal? Caudalsub { get; set; } - - public decimal? Nivel { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/MedicionDgaQa.cs b/SHARED/DTO/Integracion_DGA/MedicionDgaQa.cs deleted file mode 100644 index 03f10d4..0000000 --- a/SHARED/DTO/Integracion_DGA/MedicionDgaQa.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class MedicionDgaQa -{ - public string? Code { get; set; } - - public DateTime? DateOrigen { get; set; } - - public DateTime? DateMedicionSup { get; set; } - - public decimal? Caudal { get; set; } - - public decimal? Altura { get; set; } - - public DateTime? DateMedicionSub { get; set; } - - public decimal? Totalizador { get; set; } - - public decimal? Caudalsub { get; set; } - - public decimal? Nivel { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/MedicionDgaSupFluj.cs b/SHARED/DTO/Integracion_DGA/MedicionDgaSupFluj.cs deleted file mode 100644 index e209a22..0000000 --- a/SHARED/DTO/Integracion_DGA/MedicionDgaSupFluj.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class MedicionDgaSupFluj -{ - public string? Code { get; set; } - - public DateTime? DateOrigen { get; set; } - - public DateTime? DateMedicionSup { get; set; } - - public decimal? Caudal { get; set; } - - public decimal? Altura { get; set; } - - public DateTime? DateMedicionSub { get; set; } - - public decimal? Totalizador { get; set; } - - public decimal? Caudalsub { get; set; } - - public decimal? Nivel { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/MedicionDgaSupFlujSuma.cs b/SHARED/DTO/Integracion_DGA/MedicionDgaSupFlujSuma.cs deleted file mode 100644 index e5da20d..0000000 --- a/SHARED/DTO/Integracion_DGA/MedicionDgaSupFlujSuma.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class MedicionDgaSupFlujSuma -{ - public string? Code { get; set; } - - public DateTime? DateOrigen { get; set; } - - public DateTime? DateMedicionSup { get; set; } - - public decimal? Caudal { get; set; } - - public decimal? Altura { get; set; } - - public DateTime? DateMedicionSub { get; set; } - - public decimal? Totalizador { get; set; } - - public decimal? Caudalsub { get; set; } - - public decimal? Nivel { get; set; } - - public decimal? Suma1 { get; set; } - - public decimal? Suma2 { get; set; } - - public decimal? Total { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/MedicionDgaSupFlujSumaQa.cs b/SHARED/DTO/Integracion_DGA/MedicionDgaSupFlujSumaQa.cs deleted file mode 100644 index d95c9da..0000000 --- a/SHARED/DTO/Integracion_DGA/MedicionDgaSupFlujSumaQa.cs +++ /dev/null @@ -1,31 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class MedicionDgaSupFlujSumaQa -{ - public string? Code { get; set; } - - public DateTime? DateOrigen { get; set; } - - public DateTime? DateMedicionSup { get; set; } - - public decimal? Caudal { get; set; } - - public decimal? Altura { get; set; } - - public DateTime? DateMedicionSub { get; set; } - - public decimal? Totalizador { get; set; } - - public decimal? Caudalsub { get; set; } - - public decimal? Nivel { get; set; } - - public decimal? Suma1 { get; set; } - - public decimal? Suma2 { get; set; } - - public decimal? Total { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/MedicionDgaVilos.cs b/SHARED/DTO/Integracion_DGA/MedicionDgaVilos.cs deleted file mode 100644 index 7bcdb30..0000000 --- a/SHARED/DTO/Integracion_DGA/MedicionDgaVilos.cs +++ /dev/null @@ -1,25 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class MedicionDgaVilos -{ - public string? Code { get; set; } - - public DateTime? DateOrigen { get; set; } - - public DateTime? DateMedicionSup { get; set; } - - public decimal? Caudal { get; set; } - - public decimal? Altura { get; set; } - - public DateTime? DateMedicionSub { get; set; } - - public decimal? Totalizador { get; set; } - - public decimal? Caudalsub { get; set; } - - public decimal? Nivel { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/ResponseDga.cs b/SHARED/DTO/Integracion_DGA/ResponseDga.cs deleted file mode 100644 index f8fa1a8..0000000 --- a/SHARED/DTO/Integracion_DGA/ResponseDga.cs +++ /dev/null @@ -1,11 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class ResponseDga -{ - public string? Code { get; set; } - - public DateTime? Date { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/SenalesNueva.cs b/SHARED/DTO/Integracion_DGA/SenalesNueva.cs deleted file mode 100644 index b6a6067..0000000 --- a/SHARED/DTO/Integracion_DGA/SenalesNueva.cs +++ /dev/null @@ -1,15 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class SenalesNueva -{ - public string TagName { get; set; } = null!; - - public string Data { get; set; } = null!; - - public string? Hora { get; set; } - - public string? Valor { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/SenalesNuevasBunt.cs b/SHARED/DTO/Integracion_DGA/SenalesNuevasBunt.cs deleted file mode 100644 index 4826ac9..0000000 --- a/SHARED/DTO/Integracion_DGA/SenalesNuevasBunt.cs +++ /dev/null @@ -1,17 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class SenalesNuevasBunt -{ - public string TagName { get; set; } = null!; - - public string Data { get; set; } = null!; - - public string? Hora { get; set; } - - public string? Valor { get; set; } - - public DateTime? Fecha { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/Sensore.cs b/SHARED/DTO/Integracion_DGA/Sensore.cs deleted file mode 100644 index a5949ae..0000000 --- a/SHARED/DTO/Integracion_DGA/Sensore.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class Sensore -{ - public string IdSensor { get; set; } = null!; -} diff --git a/SHARED/DTO/Integracion_DGA/SensoresBunt.cs b/SHARED/DTO/Integracion_DGA/SensoresBunt.cs deleted file mode 100644 index 82f3621..0000000 --- a/SHARED/DTO/Integracion_DGA/SensoresBunt.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class SensoresBunt -{ - public string IdSensor { get; set; } = null!; -} diff --git a/SHARED/DTO/Integracion_DGA/SensoresConsolidado.cs b/SHARED/DTO/Integracion_DGA/SensoresConsolidado.cs deleted file mode 100644 index 5b9de59..0000000 --- a/SHARED/DTO/Integracion_DGA/SensoresConsolidado.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class SensoresConsolidado -{ - public string EmpresaPiloto { get; set; } = null!; - - public string IdSensor { get; set; } = null!; - - public string? OrigenSenal { get; set; } -} diff --git a/SHARED/DTO/Integracion_DGA/Sensoresold.cs b/SHARED/DTO/Integracion_DGA/Sensoresold.cs deleted file mode 100644 index 980b3a4..0000000 --- a/SHARED/DTO/Integracion_DGA/Sensoresold.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class Sensoresold -{ - public string IdSensor { get; set; } = null!; -} diff --git a/SHARED/DTO/Integracion_DGA/VwSensoresAgregarExistente.cs b/SHARED/DTO/Integracion_DGA/VwSensoresAgregarExistente.cs deleted file mode 100644 index 7b79b39..0000000 --- a/SHARED/DTO/Integracion_DGA/VwSensoresAgregarExistente.cs +++ /dev/null @@ -1,9 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class VwSensoresAgregarExistente -{ - public string IdSensor { get; set; } = null!; -} diff --git a/SHARED/DTO/Integracion_DGA/VwSensoresAgregarExistentesRango.cs b/SHARED/DTO/Integracion_DGA/VwSensoresAgregarExistentesRango.cs deleted file mode 100644 index 0993d1b..0000000 --- a/SHARED/DTO/Integracion_DGA/VwSensoresAgregarExistentesRango.cs +++ /dev/null @@ -1,13 +0,0 @@ -using System; -using System.Collections.Generic; - -namespace Shared.DTO.Integracion_DGA; - -public partial class VwSensoresAgregarExistentesRango -{ - public string TagName { get; set; } = null!; - - public DateTime? MaxFecRegistro { get; set; } - - public DateTime? MinFecRegistro { get; set; } -} diff --git a/SHARED/DTO/Envios_DGA/MedicionScada.cs b/SHARED/DTO/MedicionScada.cs similarity index 95% rename from SHARED/DTO/Envios_DGA/MedicionScada.cs rename to SHARED/DTO/MedicionScada.cs index 20639da..93af65f 100644 --- a/SHARED/DTO/Envios_DGA/MedicionScada.cs +++ b/SHARED/DTO/MedicionScada.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Shared.DTO.Envios_DGA +namespace Shared.DTO { public class MedicionScada { diff --git a/SHARED/DTO/Envios_DGA/MedicionSubterraneaRequest.cs b/SHARED/DTO/MedicionSubterraneaRequest.cs similarity index 95% rename from SHARED/DTO/Envios_DGA/MedicionSubterraneaRequest.cs rename to SHARED/DTO/MedicionSubterraneaRequest.cs index 05de152..675e630 100644 --- a/SHARED/DTO/Envios_DGA/MedicionSubterraneaRequest.cs +++ b/SHARED/DTO/MedicionSubterraneaRequest.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace Shared.DTO.Envios_DGA +namespace Shared.DTO { public class MedicionSubterraneaRequest { diff --git a/SHARED/DTO/TagviewsResponse.cs b/SHARED/DTO/TagviewsResponse.cs deleted file mode 100644 index 6385c37..0000000 --- a/SHARED/DTO/TagviewsResponse.cs +++ /dev/null @@ -1,30 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace Shared.DTO -{ - public class TagviewsResponse - { - public List Columns { get; set; } - } - - public class Column - { - public string Statistic { get; set; } - public Details Details { get; set; } - public string Name { get; set; } - public string Uid { get; set; } - } - - public class Details - { - public string Type { get; set; } - public string Installation { get; set; } - public string Name { get; set; } - public string Uid { get; set; } - } -} - diff --git a/SHARED/Helper/FileLoggerHelper.cs b/SHARED/Helper/FileLoggerHelper.cs deleted file mode 100644 index 3aaf591..0000000 --- a/SHARED/Helper/FileLoggerHelper.cs +++ /dev/null @@ -1,29 +0,0 @@ -using Microsoft.Extensions.Configuration; -using Serilog; - -namespace Shared.Helper -{ - public class FileLoggerHelper - { - public static void ConfigureLogger(IConfiguration configuration) - { - var logFilePath = configuration.GetSection("Logging:LogFile:Path").Value; - var logFileFullPath = Path.Combine(Directory.GetCurrentDirectory(), logFilePath); - - Log.Logger = new LoggerConfiguration() - .ReadFrom.Configuration(configuration) - .WriteTo.File(logFileFullPath, rollingInterval: RollingInterval.Day) - .CreateLogger(); - } - - public static void LogInformation(string message) - { - Log.Information($"{message}"); - } - - public static void LogError(string message, Exception ex) - { - Log.Error(ex, message); - } - } -} diff --git a/SHARED/Shared.csproj b/SHARED/Shared.csproj index b5542cf..fa71b7a 100644 --- a/SHARED/Shared.csproj +++ b/SHARED/Shared.csproj @@ -6,10 +6,4 @@ enable - - - - - -