From c27b81f5062648fc86367bc2ca3032393aa6c24e Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 16 Sep 2021 09:08:05 +0200 Subject: [PATCH] Fix vari x logging + refresh --- MP.FileData/Controllers/FileController.cs | 15 +- MP.Prog/Data/FileArchDataService.cs | 266 +--------------------- MP.Prog/MP.Prog.csproj | 2 +- MP.Prog/NLog.config | 2 +- MP.Prog/Pages/Archive.razor.cs | 3 +- MP.Prog/Resources/ChangeLog.html | 2 +- MP.Prog/Resources/VersNum.txt | 2 +- MP.Prog/Resources/manifest.xml | 2 +- MP.Prog/appsettings.Development.json | 2 +- MP.Prog/appsettings.Production.json | 2 +- MP.Prog/appsettings.Staging.json | 2 +- MP.Prog/appsettings.json | 4 +- 12 files changed, 25 insertions(+), 279 deletions(-) diff --git a/MP.FileData/Controllers/FileController.cs b/MP.FileData/Controllers/FileController.cs index 3640c916..3a929a28 100644 --- a/MP.FileData/Controllers/FileController.cs +++ b/MP.FileData/Controllers/FileController.cs @@ -74,7 +74,7 @@ namespace MP.FileData.Controllers { fileList = fileListRaw.ToList(); } - Log.Info($"CheckFileArchived S01 | file trovati: {fileList.Count()}"); + Log.Trace($"CheckFileArchived S01 | file trovati: {fileList.Count()}"); List fileNew = new List(); List fileChecked = new List(); List fileMod = new List(); @@ -89,7 +89,7 @@ namespace MP.FileData.Controllers // escludo i file con desinenza da escludere... if (!string.IsNullOrEmpty(file.Extension) && currRule.ExcludedFileExt.Contains(file.Extension)) { - Log.Info($"CheckFileArchived S02: escluso {file.Name} | estensione {file.Extension}"); + Log.Trace($"CheckFileArchived S02: escluso {file.Name} | estensione {file.Extension}"); } else { @@ -135,23 +135,24 @@ namespace MP.FileData.Controllers { checkDone += fileNew.Count; FileInsert(idxMacchina, path, fileNew, 0, currRule); - Log.Info($"CheckFileArchived S03 | insert {fileNew.Count} files"); + Log.Trace($"CheckFileArchived S03 | insert {fileNew.Count} files"); } // aggiorno i file modificati if (fileMod != null && fileMod.Count > 0) { checkDone += fileMod.Count; FileSetUpdated(fileMod); - Log.Info($"CheckFileArchived S04 | update {fileMod.Count} files"); + Log.Trace($"CheckFileArchived S04 | update {fileMod.Count} files"); } // segno data-ora ultimo controllo x file invariati if (fileChecked != null && fileChecked.Count > 0) { checkDone += fileChecked.Count; FileSetChecked(fileChecked, path, currRule, forceTag); - Log.Info($"CheckFileArchived S05 | refreshed {fileChecked.Count} files"); + Log.Trace($"CheckFileArchived S05 | refreshed {fileChecked.Count} files"); } + Log.Info($"Effettuati {checkDone} controlli"); return checkDone; } @@ -367,14 +368,14 @@ namespace MP.FileData.Controllers .DbSetProgFile .AddRange(newRec); - Log.Info($"FileInsert S02 per macchina {idxMacchina}: {newRec.Count} files da aggiungere EFCore"); + Log.Trace($"FileInsert S02 per macchina {idxMacchina}: {newRec.Count} files da aggiungere EFCore"); // salvo localDbCtx.SaveChanges(); answ = true; } } - Log.Info($"FileInsert S03 per macchina {idxMacchina}"); + Log.Trace($"FileInsert S03 per macchina {idxMacchina}"); return answ; } diff --git a/MP.Prog/Data/FileArchDataService.cs b/MP.Prog/Data/FileArchDataService.cs index 6e8005e2..21f558e2 100644 --- a/MP.Prog/Data/FileArchDataService.cs +++ b/MP.Prog/Data/FileArchDataService.cs @@ -78,9 +78,7 @@ namespace MP.Prog.Data else { dbController = new FileData.Controllers.FileController(configuration); - StringBuilder sb = new StringBuilder(); - sb.AppendLine($"DbController OK"); - _logger.LogInformation(sb.ToString()); + _logger.LogInformation("DbController OK"); } } @@ -151,7 +149,7 @@ namespace MP.Prog.Data numCount = dbController.FileCountFilt(CurrFilter.IdxMacchina, CurrFilter.OnlyActive, CurrFilter.OnlyMod, CurrFilter.OnlyNoTag, CurrFilter.FileName, CurrFilter.Tag); stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per FileCountFilt: {ts.TotalMilliseconds} ms"); + Log.Trace($"Effettuata lettura da DB per FileCountFilt: {ts.TotalMilliseconds} ms"); return await Task.FromResult(numCount); } @@ -169,7 +167,7 @@ namespace MP.Prog.Data //dbResult = dbController.FileGetFilt(CurrFilter.IdxMacchina, CurrFilter.OnlyActive, CurrFilter.OnlyMod, CurrFilter.FirstRecord, CurrFilter.PageSize * 10, CurrFilter.SearchVal).ToList(); stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per FileGetFilt: {ts.TotalMilliseconds} ms"); + Log.Trace($"Effettuata lettura da DB per FileGetFilt: {ts.TotalMilliseconds} ms"); return await Task.FromResult(dbResult); } @@ -181,7 +179,7 @@ namespace MP.Prog.Data dbResult = dbController.GetArchiveStatus(); stopWatch.Stop(); TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per GetArchiveStatus: {ts.TotalMilliseconds} ms"); + Log.Trace($"Effettuata lettura da DB per GetArchiveStatus: {ts.TotalMilliseconds} ms"); return await Task.FromResult(dbResult); } @@ -238,66 +236,6 @@ namespace MP.Prog.Data } #endif -#if false - public async Task> ActionsGetAll() - { - //return Task.FromResult(dbController.ActionsGetAll()); - List dbResult = new List(); - string cacheKey = "MP:STATS:AZIONI_ALL"; - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - dbResult = dbController.ActionsGetAll(); - rawData = JsonConvert.SerializeObject(dbResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per AzioniUL: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(dbResult); - } - - public Task> ArticoliGetSearch(int numRecord, string searchVal = "") - { - List answ = new List(); - answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); - if (numRecord > -1) - { - answ.AddRange(dbController.ArticoliGetSearch(numRecord, searchVal).Select(x => new AutocompleteModel { LabelField = $"{x.CodArticolo} {x.DescArticolo} {x.Disegno}", ValueField = x.CodArticolo }).ToList()); - } - return Task.FromResult(answ); - } - - public async Task> ArticoliList(string searchVal) - { - List answ = new List(); - answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); - var listMacchine = dbController.MacchineGetAll(); - answ.AddRange(listMacchine.Select(x => new AutocompleteModel { LabelField = x.IdxMacchina, ValueField = x.IdxMacchina }).ToList()); - return await Task.FromResult(answ); - } - - public Task> CommesseGetSearch(int numRecord, string searchVal = "") - { - List answ = new List(); - answ.Add(new AutocompleteModel { LabelField = "--- TUTTE ---", ValueField = "*" }); - if (numRecord > -1) - { - answ.AddRange(dbController.CommesseGetSearch(numRecord, searchVal).GroupBy(x => x.KeyRichiesta).Select(x => new AutocompleteModel { LabelField = $"{x.First().CodArticolo} | {x.First().KeyRichiesta}", ValueField = x.First().KeyRichiesta }).ToList()); - } - return Task.FromResult(answ); - } -#endif - /// /// Aggiorna intero archivio scansionando dati x tutte le macchine che hanno un path valido /// @@ -380,7 +318,7 @@ namespace MP.Prog.Data { // serializzo string rawRule = JsonConvert.SerializeObject(currRule, Formatting.Indented); - Log.Info($"Conf rule generato:{Environment.NewLine}{rawRule}"); + Log.Trace($"Conf rule generato:{Environment.NewLine}{rawRule}"); } } checkDone = dbController.CheckFileArchived(macchina.IdxMacchina, macchina.BasePath, numDayPre, "*.*", forceTag, currRule); @@ -399,199 +337,5 @@ namespace MP.Prog.Data } #endregion Public Methods - -#if false - public async Task> StatControlliGetAll(SelectData CurrFilter, string searchVal = "") - { - //return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); - List dbResult = new List(); - string cacheKey = getCacheKey("MP:STATS:CONTROLLI", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - dbResult = dbController.StatControlliGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); - rawData = JsonConvert.SerializeObject(dbResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per ResControlli: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(dbResult); - } - - public async Task> StatDdbGetAll(SelectData CurrFilter, string searchVal = "") - { - //return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray()); - List dbResult = new List(); - string cacheKey = getCacheKeyPaged("MP:STATS:DDBT", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - dbResult = dbController.StatDdbGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo, CurrFilter.FirstRecord, CurrFilter.NumRecord); - rawData = JsonConvert.SerializeObject(dbResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per DdbTurni: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(dbResult); - } - - public async Task StatDdbGetCount(SelectData CurrFilter, string searchVal = "") - { - int numRec = 0; - string cacheKey = getCacheKey("MP:STATS:DDBT-COUNT", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - int.TryParse(rawData, out numRec); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - numRec = dbController.StatDdbGetCount(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); - rawData = $"{numRec}"; - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOptLong); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per DdbTurni: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(numRec); - } - - public async Task> StatOdlGetAll(SelectData CurrFilter, string searchVal = "") - { - //return Task.FromResult(dbController.StatOdlGetAll(numRecord, searchVal)); - List dbResult = new List(); - string cacheKey = getCacheKey("MP:STATS:ODL", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - dbResult = dbController.StatOdlGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); - rawData = JsonConvert.SerializeObject(dbResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per ODL: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(dbResult); - } - - public async Task> StatScartiGetAll(SelectData CurrFilter, string searchVal = "") - { - //return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); - List dbResult = new List(); - string cacheKey = getCacheKey("MP:STATS:SCARTI:RAW", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - dbResult = dbController.StatScartiGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); - rawData = JsonConvert.SerializeObject(dbResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per ResScarti: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(dbResult); - } - - public async Task> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "") - { - return await Task.FromResult(dbController.StatTurniOeeGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo)); - } - - public async Task> StatTurniOeeGetAllCached(SelectData CurrFilter, string searchVal = "") - { - List dbResult = new List(); - string cacheKey = getCacheKey("MP:STATS:OEE", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - dbResult = dbController.StatTurniOeeGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); - rawData = JsonConvert.SerializeObject(dbResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per TurniOee: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(dbResult); - } - - public async Task> StatUserLogGetAll(SelectData CurrFilter, string searchVal = "") - { - //return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray()); - List dbResult = new List(); - string cacheKey = getCacheKey("MP:STATS:USRACTLOG", CurrFilter); - string rawData; - var redisDataList = await distributedCache.GetAsync(cacheKey); - if (redisDataList != null) - { - rawData = Encoding.UTF8.GetString(redisDataList); - dbResult = JsonConvert.DeserializeObject>(rawData); - } - else - { - Stopwatch stopWatch = new Stopwatch(); - stopWatch.Start(); - dbResult = dbController.StatUserLogGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo); - rawData = JsonConvert.SerializeObject(dbResult); - redisDataList = Encoding.UTF8.GetBytes(rawData); - await distributedCache.SetAsync(cacheKey, redisDataList, cacheOpt); - stopWatch.Stop(); - TimeSpan ts = stopWatch.Elapsed; - Log.Info($"Effettuata lettura da DB + caching per UserActionLog: {ts.TotalMilliseconds} ms"); - } - return await Task.FromResult(dbResult); - } -#endif } } \ No newline at end of file diff --git a/MP.Prog/MP.Prog.csproj b/MP.Prog/MP.Prog.csproj index 927e8302..925e64c0 100644 --- a/MP.Prog/MP.Prog.csproj +++ b/MP.Prog/MP.Prog.csproj @@ -3,7 +3,7 @@ net5.0 MP.Prog - 1.1.2109.1519 + 1.1.2109.1609 diff --git a/MP.Prog/NLog.config b/MP.Prog/NLog.config index b98c52ca..bd414080 100644 --- a/MP.Prog/NLog.config +++ b/MP.Prog/NLog.config @@ -41,6 +41,6 @@ --> - + \ No newline at end of file diff --git a/MP.Prog/Pages/Archive.razor.cs b/MP.Prog/Pages/Archive.razor.cs index 4c665142..82e190ee 100644 --- a/MP.Prog/Pages/Archive.razor.cs +++ b/MP.Prog/Pages/Archive.razor.cs @@ -297,8 +297,9 @@ namespace MP.Prog.Pages private async Task OnDialogClose(bool accepted) { DeleteDialogOpen = false; + currPage = 1; await AsyncReload(); - StateHasChanged(); + //StateHasChanged(); } private void OpenDialog() diff --git a/MP.Prog/Resources/ChangeLog.html b/MP.Prog/Resources/ChangeLog.html index 24f0d756..cd52035c 100644 --- a/MP.Prog/Resources/ChangeLog.html +++ b/MP.Prog/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo gestione Programmi MAPO -

Versione: 1.1.2109.1519

+

Versione: 1.1.2109.1609


Note di rilascio:
    diff --git a/MP.Prog/Resources/VersNum.txt b/MP.Prog/Resources/VersNum.txt index 597e0034..91d87534 100644 --- a/MP.Prog/Resources/VersNum.txt +++ b/MP.Prog/Resources/VersNum.txt @@ -1 +1 @@ -1.1.2109.1519 +1.1.2109.1609 diff --git a/MP.Prog/Resources/manifest.xml b/MP.Prog/Resources/manifest.xml index a4a05dc3..b3cf81b3 100644 --- a/MP.Prog/Resources/manifest.xml +++ b/MP.Prog/Resources/manifest.xml @@ -1,6 +1,6 @@ - 1.1.2109.1519 + 1.1.2109.1609 http://nexus.steamware.net/repository/SWS/MP-PROG/stable/0/MP.Prog.zip http://nexus.steamware.net/repository/SWS/MP-PROG/stable/0/ChangeLog.html false diff --git a/MP.Prog/appsettings.Development.json b/MP.Prog/appsettings.Development.json index fb218b9a..9645b0c6 100644 --- a/MP.Prog/appsettings.Development.json +++ b/MP.Prog/appsettings.Development.json @@ -1,5 +1,5 @@ { - "DetailedErrors": true, + //"DetailedErrors": true, "Logging": { "LogLevel": { "Default": "Information", diff --git a/MP.Prog/appsettings.Production.json b/MP.Prog/appsettings.Production.json index cf9c62a4..e2534f8a 100644 --- a/MP.Prog/appsettings.Production.json +++ b/MP.Prog/appsettings.Production.json @@ -2,7 +2,7 @@ "DetailedErrors": true, "Logging": { "LogLevel": { - "Default": "Trace", + "Default": "Information", "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" } diff --git a/MP.Prog/appsettings.Staging.json b/MP.Prog/appsettings.Staging.json index 8fe73650..93673539 100644 --- a/MP.Prog/appsettings.Staging.json +++ b/MP.Prog/appsettings.Staging.json @@ -2,7 +2,7 @@ "DetailedErrors": true, "Logging": { "LogLevel": { - "Default": "Trace", + "Default": "Information", "Microsoft": "Warning", "Microsoft.Hosting.Lifetime": "Information" } diff --git a/MP.Prog/appsettings.json b/MP.Prog/appsettings.json index 6b97b840..1336c695 100644 --- a/MP.Prog/appsettings.json +++ b/MP.Prog/appsettings.json @@ -7,10 +7,10 @@ } //"LogLevel": { // "Default": "Debug", - // "System": "Information", // "Microsoft": "Information", // "Microsoft.AspNetCore.SignalR": "Debug", - // "Microsoft.AspNetCore.Http.Connections": "Debug" + // "Microsoft.AspNetCore.Http.Connections": "Debug", + // "System": "Information" //} }, "AllowedHosts": "*",