diff --git a/MP.Data/Controllers/MpStatsController.cs b/MP.Data/Controllers/MpStatsController.cs index a1ebf01f..4d21334c 100644 --- a/MP.Data/Controllers/MpStatsController.cs +++ b/MP.Data/Controllers/MpStatsController.cs @@ -16,7 +16,7 @@ namespace MP.Data.Controllers #region Private Fields private static IConfiguration _configuration; - private static MoonPro_STATSContext dbCtx; + private static NLog.Logger Log = LogManager.GetCurrentClassLogger(); #endregion Private Fields @@ -26,7 +26,6 @@ namespace MP.Data.Controllers public MpStatsController(IConfiguration configuration) { _configuration = configuration; - dbCtx = new MoonPro_STATSContext(configuration); Log.Info("Avviata classe MpStatsController"); } @@ -41,11 +40,12 @@ namespace MP.Data.Controllers public List ActionsGetAll() { List dbResult = new List(); - - dbResult = dbCtx - .DbSetAzioniUL - .ToList(); - + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + dbResult = dbCtx + .DbSetAzioniUL + .ToList(); + } return dbResult; } @@ -58,14 +58,15 @@ namespace MP.Data.Controllers public List ArticoliGetSearch(int numRecord, string searchVal = "") { List dbResult = new List(); - - dbResult = dbCtx + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + dbResult = dbCtx .DbSetArticoli .Where(x => x.CodArticolo.Contains(searchVal) || x.DescArticolo.Contains(searchVal) || x.Disegno.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) .OrderBy(x => x.CodArticolo) .Take(numRecord) .ToList(); - + } return dbResult; } @@ -78,21 +79,20 @@ namespace MP.Data.Controllers public List CommesseGetSearch(int numRecord, string searchVal = "") { List dbResult = new List(); - - dbResult = dbCtx + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + dbResult = dbCtx .DbSetODL .Where(x => x.KeyRichiesta.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) .OrderBy(x => x.KeyRichiesta) .Take(numRecord) .ToList(); - + } return dbResult; } public void Dispose() { - // Clear database context - dbCtx.Dispose(); } /// @@ -102,21 +102,16 @@ namespace MP.Data.Controllers public List MacchineGetAll() { List dbResult = new List(); - - dbResult = dbCtx + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + dbResult = dbCtx .DbSetMacchine .OrderBy(x => x.IdxMacchina) .ToList(); - + } return dbResult; } - public void ResetController() - { - dbCtx = new MoonPro_STATSContext(_configuration); - Log.Info("Effettuato reset MpStatsController"); - } - /// /// Annulla modifiche su una specifica entity (cancel update) /// @@ -125,16 +120,19 @@ namespace MP.Data.Controllers public bool RollBackEntity(object item) { bool answ = false; - try + using (var dbCtx = new MoonPro_STATSContext(_configuration)) { - if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified) + try { - dbCtx.Entry(item).Reload(); + if (dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Deleted || dbCtx.Entry(item).State == Microsoft.EntityFrameworkCore.EntityState.Modified) + { + dbCtx.Entry(item).Reload(); + } + } + catch (Exception exc) + { + Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}"); } - } - catch (Exception exc) - { - Log.Error($"Eccezione in rollBackEntity{Environment.NewLine}{exc}"); } return answ; } @@ -148,19 +146,20 @@ namespace MP.Data.Controllers public List StatControlliGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - - dbResult = dbCtx - .DbSetControlli - .FromSqlRaw("EXEC stp_UI_RC_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); - + dbResult = dbCtx + .DbSetControlli + .FromSqlRaw("EXEC stp_UI_RC_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + } return dbResult; } @@ -179,21 +178,22 @@ namespace MP.Data.Controllers public List StatDdbGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, int FirstRecord, int NumRecord) { List dbResult = new List(); + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + var firstRecord = new SqlParameter("@FirstRecord", FirstRecord); + var numRecord = new SqlParameter("@NumRecord", NumRecord); - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - var firstRecord = new SqlParameter("@FirstRecord", FirstRecord); - var numRecord = new SqlParameter("@NumRecord", NumRecord); - - dbResult = dbCtx - .DbSetDdbTurni - .FromSqlRaw("EXEC stp_UI_DDBTurni_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo,@FirstRecord,@NumRecord", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo, firstRecord, numRecord) - .ToList(); - + dbResult = dbCtx + .DbSetDdbTurni + .FromSqlRaw("EXEC stp_UI_DDBTurni_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo,@FirstRecord,@NumRecord", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo, firstRecord, numRecord) + .ToList(); + } return dbResult; } @@ -209,12 +209,15 @@ namespace MP.Data.Controllers /// public int StatDdbGetCount(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { - var dbResult = dbCtx + int numResult = 0; + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + numResult = dbCtx .DbSetDdbTurni .Where(x => (x.IdxMacchina == IdxMacchina || IdxMacchina == "*") && (x.IdxOdl == IdxODL || IdxODL == -999) && (x.KeyRichiesta == KeyRichiesta || KeyRichiesta == "*") && (x.CodArticolo == CodArticolo || CodArticolo == "*") && (x.InizioPeriodo >= DataStart && x.InizioPeriodo <= DataEnd)) .Count(); - - return dbResult; + } + return numResult; } /// @@ -226,19 +229,20 @@ namespace MP.Data.Controllers public List StatOdlGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - - dbResult = dbCtx - .DbSetODL - .FromSqlRaw("EXEC stp_UI_Odl_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); - + dbResult = dbCtx + .DbSetODL + .FromSqlRaw("EXEC stp_UI_Odl_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + } return dbResult; } @@ -253,19 +257,20 @@ namespace MP.Data.Controllers public List StatScartiGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - - dbResult = dbCtx - .DbSetScarti - .FromSqlRaw("EXEC stp_UI_RS_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); - + dbResult = dbCtx + .DbSetScarti + .FromSqlRaw("EXEC stp_UI_RS_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + } return dbResult; } @@ -280,19 +285,20 @@ namespace MP.Data.Controllers public List StatTurniOeeGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - - dbResult = dbCtx - .DbSetTurniOee - .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); - + dbResult = dbCtx + .DbSetTurniOee + .FromSqlRaw("EXEC stp_UI_TurniOee_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + } return dbResult; } @@ -305,26 +311,27 @@ namespace MP.Data.Controllers public List StatUserLogGetAll(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo) { List dbResult = new List(); + using (var dbCtx = new MoonPro_STATSContext(_configuration)) + { + //dbResult = dbCtx + // .DbSetUserLog + // .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) + // .OrderByDescending(x => x.DataOraRif) + // .Take(numRecord) + // .ToList(); - //dbResult = dbCtx - // .DbSetUserLog - // .Where(x => x.Valore.Contains(searchVal) || x.Cognome.Contains(searchVal) || x.CodArticolo.Contains(searchVal) || string.IsNullOrEmpty(searchVal)) - // .OrderByDescending(x => x.DataOraRif) - // .Take(numRecord) - // .ToList(); - - var dataFrom = new SqlParameter("@dataFrom", DataStart); - var dataTo = new SqlParameter("@dataTo", DataEnd); - var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); - var idxODL = new SqlParameter("@IdxODL", IdxODL); - var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); - var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); - - dbResult = dbCtx - .DbSetUserLog - .FromSqlRaw("EXEC stp_UI_UL_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) - .ToList(); + var dataFrom = new SqlParameter("@dataFrom", DataStart); + var dataTo = new SqlParameter("@dataTo", DataEnd); + var idxMacchina = new SqlParameter("@idxMacchina", IdxMacchina); + var idxODL = new SqlParameter("@IdxODL", IdxODL); + var keyRichiesta = new SqlParameter("@KeyRichiesta", KeyRichiesta); + var codArticolo = new SqlParameter("@CodArticolo", CodArticolo); + dbResult = dbCtx + .DbSetUserLog + .FromSqlRaw("EXEC stp_UI_UL_GetByFilter @dataFrom,@dataTo,@idxMacchina,@IdxODL,@KeyRichiesta,@CodArticolo", dataFrom, dataTo, idxMacchina, idxODL, keyRichiesta, codArticolo) + .ToList(); + } return dbResult; }