From 0ddd5ff84c686fbf92e654482109ab8e7cd6496b Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Mon, 9 Oct 2023 14:50:32 +0200 Subject: [PATCH] Fix duplicato FNQ --- MP-TAB-SERV/Components/NotesMan.razor.cs | 4 +- MP-TAB-SERV/MP-TAB-SERV.csproj | 2 +- MP-TAB-SERV/Resources/ChangeLog.html | 2 +- MP-TAB-SERV/Resources/VersNum.txt | 2 +- MP-TAB-SERV/Resources/manifest.xml | 2 +- MP.Data/Controllers/MpTabController.cs | 49 --------------------- MP.Data/DTO/FnqDTO.cs | 19 -------- MP.Data/DatabaseModels/FermiNonQualModel.cs | 1 + MP.Data/MoonProContext.cs | 3 +- MP.Data/Services/TabDataService.cs | 39 ---------------- 10 files changed, 8 insertions(+), 115 deletions(-) delete mode 100644 MP.Data/DTO/FnqDTO.cs diff --git a/MP-TAB-SERV/Components/NotesMan.razor.cs b/MP-TAB-SERV/Components/NotesMan.razor.cs index abd38e81..bb4b3ee4 100644 --- a/MP-TAB-SERV/Components/NotesMan.razor.cs +++ b/MP-TAB-SERV/Components/NotesMan.razor.cs @@ -57,7 +57,7 @@ namespace MP_TAB_SERV.Components private int _durataMin { get; set; } = 30; protected List RecordListComments { get; set; } = new List(); - protected List RecordListFnq { get; set; } = new List(); + protected List RecordListFnq { get; set; } = new List(); [Inject] protected TabDataService TabServ { get; set; } = null!; @@ -82,7 +82,7 @@ namespace MP_TAB_SERV.Components } private async Task ReloadFnq() { - RecordListFnq = await TabServ.FnqGetByFilt(RecMSE?.IdxMacchina, NumGiorni, DurataMin); + RecordListFnq = await TabServ.FermiNonQualificatiFilt(RecMSE?.IdxMacchina, NumGiorni, DurataMin); } private async Task DoUpdate(bool forceReload) diff --git a/MP-TAB-SERV/MP-TAB-SERV.csproj b/MP-TAB-SERV/MP-TAB-SERV.csproj index ce48d6aa..942f31fc 100644 --- a/MP-TAB-SERV/MP-TAB-SERV.csproj +++ b/MP-TAB-SERV/MP-TAB-SERV.csproj @@ -3,7 +3,7 @@ net6.0 enable - 6.16.2310.912 + 6.16.2310.914 enable MP_TAB_SERV diff --git a/MP-TAB-SERV/Resources/ChangeLog.html b/MP-TAB-SERV/Resources/ChangeLog.html index 48114fc2..82a01a36 100644 --- a/MP-TAB-SERV/Resources/ChangeLog.html +++ b/MP-TAB-SERV/Resources/ChangeLog.html @@ -1,6 +1,6 @@ Modulo MAPOSPEC -

Versione: 6.16.2310.912

+

Versione: 6.16.2310.914


Note di rilascio:
  • diff --git a/MP-TAB-SERV/Resources/VersNum.txt b/MP-TAB-SERV/Resources/VersNum.txt index c29d1dfa..b829241e 100644 --- a/MP-TAB-SERV/Resources/VersNum.txt +++ b/MP-TAB-SERV/Resources/VersNum.txt @@ -1 +1 @@ -6.16.2310.912 +6.16.2310.914 diff --git a/MP-TAB-SERV/Resources/manifest.xml b/MP-TAB-SERV/Resources/manifest.xml index 6b36f353..b0e6d77f 100644 --- a/MP-TAB-SERV/Resources/manifest.xml +++ b/MP-TAB-SERV/Resources/manifest.xml @@ -1,6 +1,6 @@ - 6.16.2310.912 + 6.16.2310.914 https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/MP-TAB-SERV.zip https://nexus.steamware.net/repository/SWS/MP-TAB-SERV/stable/LAST/ChangeLog.html false diff --git a/MP.Data/Controllers/MpTabController.cs b/MP.Data/Controllers/MpTabController.cs index 7b6fb7a1..e77675d0 100644 --- a/MP.Data/Controllers/MpTabController.cs +++ b/MP.Data/Controllers/MpTabController.cs @@ -357,55 +357,6 @@ namespace MP.Data.Controllers await Task.Delay(1); return fatto; } - /// - /// Recupera elenco ultimi commenti x macchina - /// - /// Idx macchina, "*" = tutte - /// Num massimo di record da recuperare - /// - public List CommentiGetLastByMacc(string idxMacchina, int maxRec) - { - List dbResult = new List(); - using (var dbCtx = new MoonProContext(_configuration)) - { - var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina); - var MaxRec = new SqlParameter("@MaxRec", maxRec); - - dbResult = dbCtx - .DbSetCommenti - .FromSqlRaw("exec dbo.stp_Comm_getLastByMacchina @IdxMacchina, @MaxRec", IdxMacchina, MaxRec) - .AsNoTracking() - .AsEnumerable() - .ToList(); - } - return dbResult; - } - /// - /// Recupera elenco ultime fermate non frequenti - /// - /// - /// - /// - /// - public List FnqGetByFilt(string idxMacchina, int numGg, int durataMin) - { - List dbResult = new List(); - using (var dbCtx = new MoonProContext(_configuration)) - { - var IdxMacchina = new SqlParameter("@IdxMacchina", idxMacchina); - var NumGg = new SqlParameter("@gg", numGg); - var DurataMin = new SqlParameter("@durataMin", durataMin); - - dbResult = dbCtx - .DbSetFnq - .FromSqlRaw("exec dbo.stp_FNQ_getFilt @IdxMacchina, @gg, @durataMin", IdxMacchina, NumGg, DurataMin) - .AsNoTracking() - .AsEnumerable() - .ToList(); - } - return dbResult; - } - /// /// Recupera record EventList date condizioni filtro diff --git a/MP.Data/DTO/FnqDTO.cs b/MP.Data/DTO/FnqDTO.cs deleted file mode 100644 index cb4676f0..00000000 --- a/MP.Data/DTO/FnqDTO.cs +++ /dev/null @@ -1,19 +0,0 @@ -using System; -using System.ComponentModel.DataAnnotations; - -namespace MP.Data.DTO -{ - public class FnqDTO - { - [Key] - public string IdxMacchina { get; set; } = ""; - public DateTime InizioStato { get; set; } = DateTime.Now; - public string Macchina { get; set; } = ""; - public int IdxStato { get; set; } = 0; - public string Stato { get; set; } = ""; - public string Semaforo { get; set; } = ""; - public double DurataMinuti { get; set; } = 0; - public string Value { get; set; } = ""; - public string CodArticolo { get; set; } = ""; - } -} \ No newline at end of file diff --git a/MP.Data/DatabaseModels/FermiNonQualModel.cs b/MP.Data/DatabaseModels/FermiNonQualModel.cs index 68aa34c8..59e7a4ab 100644 --- a/MP.Data/DatabaseModels/FermiNonQualModel.cs +++ b/MP.Data/DatabaseModels/FermiNonQualModel.cs @@ -18,6 +18,7 @@ namespace MP.Data.DatabaseModels public DateTime InizioStato { get; set; } = DateTime.Now; public string Macchina { get; set; } = ""; public int IdxStato { get; set; } = 0; + public string Stato { get; set; } = ""; public string Semaforo { get; set; } = ""; public double DurataMinuti { get; set; } = 0; public string Value { get; set; } = ""; diff --git a/MP.Data/MoonProContext.cs b/MP.Data/MoonProContext.cs index 343b2675..7a0453ee 100644 --- a/MP.Data/MoonProContext.cs +++ b/MP.Data/MoonProContext.cs @@ -56,8 +56,7 @@ namespace MP.Data public virtual DbSet DbSetStatOdl { get; set; } public virtual DbSet DbSetPzProd { get; set; } public virtual DbSet DbSetEvList { get; set; } - public virtual DbSet DbSetDDB { get; set; } - public virtual DbSet DbSetFnq { get; set; } + public virtual DbSet DbSetDDB { get; set; } public virtual DbSet DbSetVocabolario { get; set; } public virtual DbSet DbOperatori { get; set; } public virtual DbSet DbSetGrp2Oper { get; set; } diff --git a/MP.Data/Services/TabDataService.cs b/MP.Data/Services/TabDataService.cs index 338fea0b..a0a5eacc 100644 --- a/MP.Data/Services/TabDataService.cs +++ b/MP.Data/Services/TabDataService.cs @@ -218,45 +218,6 @@ namespace MP.Data.Services return result; } - /// - /// Recupera elenco ultime fermate non frequenti - /// - /// - /// - /// - /// - public async Task> FnqGetByFilt(string idxMacchina, int numGg, int durataMin) - { - // setup parametri costanti - string source = "DB"; - Stopwatch sw = new Stopwatch(); - sw.Start(); - List result = new List(); - // cerco in redis... - string currKey = $"{redisBaseKey}:FNQ:{idxMacchina}:{numGg}:{durataMin}"; - RedisValue rawData = await redisDb.StringGetAsync(currKey); - //if (!string.IsNullOrEmpty($"{rawData}")) - if (rawData.HasValue) - { - result = JsonConvert.DeserializeObject>($"{rawData}"); - source = "REDIS"; - } - else - { - result = dbTabController.FnqGetByFilt(idxMacchina, numGg, durataMin); - // serializzp e salvo... - rawData = JsonConvert.SerializeObject(result); - await redisDb.StringSetAsync(currKey, rawData, FastCache); - } - if (result == null) - { - result = new List(); - } - sw.Stop(); - Log.Debug($"FnqGetByFilt | {source} | {sw.Elapsed.TotalMilliseconds}ms"); - return result; - } - /// /// Effettua conferma prod macchina dell'intero periodo da confermare (ultima conferma /// --> dtEvent)