Egalware/mapo-core
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Completata priam versione editing pag taskList

Browse Source
This commit is contained in:
Samuele Locatelli
2024-03-28 19:11:24 +01:00
parent 05176244b3
commit b9393e8ea1
10 changed files with 374 additions and 195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.Stats/Data/MpStatsService.cs
+49 -32
View File
@@ -2,9 +2,11 @@
using Microsoft.Extensions.Caching.Memory;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.Logging;
using MP.Data.DatabaseModels;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Data;
using System.Diagnostics;
using System.Linq;
using System.Text;
@@ -21,7 +23,7 @@ namespace MP.Stats.Data
private static ILogger<MpStatsService> _logger;
private static List<MP.Data.DatabaseModels.AzioniUL> ActionsList = new List<MP.Data.DatabaseModels.AzioniUL>();
private static List<AzioniUL> ActionsList = new List<AzioniUL>();
private readonly IDistributedCache distributedCache;
@@ -118,17 +120,17 @@ namespace MP.Stats.Data
#region Public Methods
public async Task<List<MP.Data.DatabaseModels.AzioniUL>> ActionsGetAll()
public async Task<List<AzioniUL>> ActionsGetAll()
{
//return Task.FromResult(dbController.ActionsGetAll());
List<MP.Data.DatabaseModels.AzioniUL> dbResult = new List<MP.Data.DatabaseModels.AzioniUL>();
List<AzioniUL> dbResult = new List<AzioniUL>();
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<List<MP.Data.DatabaseModels.AzioniUL>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<AzioniUL>>(rawData);
}
else
{
@@ -190,7 +192,7 @@ namespace MP.Stats.Data
dbController.Dispose();
}
public Task<List<MP.Data.DatabaseModels.Macchine>> MacchineGetAll()
public Task<List<Macchine>> MacchineGetAll()
{
return Task.FromResult(dbController.MacchineGetAll().ToList());
}
@@ -215,17 +217,17 @@ namespace MP.Stats.Data
dbController.RollBackEntity(item);
}
public async Task<List<MP.Data.DatabaseModels.ResControlli>> StatControlliGetAll(SelectData CurrFilter, string searchVal = "")
public async Task<List<ResControlli>> StatControlliGetAll(SelectData CurrFilter, string searchVal = "")
{
//return Task.FromResult(dbController.StatControlliGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
List<MP.Data.DatabaseModels.ResControlli> dbResult = new List<MP.Data.DatabaseModels.ResControlli>();
List<ResControlli> dbResult = new List<ResControlli>();
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<List<MP.Data.DatabaseModels.ResControlli>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<ResControlli>>(rawData);
}
else
{
@@ -242,17 +244,17 @@ namespace MP.Stats.Data
return await Task.FromResult(dbResult);
}
public async Task<List<MP.Data.DatabaseModels.DdbTurni>> StatDdbGetAll(SelectData CurrFilter, string searchVal = "")
public async Task<List<DdbTurni>> StatDdbGetAll(SelectData CurrFilter, string searchVal = "")
{
//return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray());
List<MP.Data.DatabaseModels.DdbTurni> dbResult = new List<MP.Data.DatabaseModels.DdbTurni>();
List<DdbTurni> dbResult = new List<DdbTurni>();
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<List<MP.Data.DatabaseModels.DdbTurni>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<DdbTurni>>(rawData);
}
else
{
@@ -275,10 +277,10 @@ namespace MP.Stats.Data
/// <param name="CurrFilter"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public async Task<List<MP.Data.DatabaseModels.DdbTurni>> StatDdbGetAllExport(SelectData CurrFilter, string searchVal = "")
public async Task<List<DdbTurni>> StatDdbGetAllExport(SelectData CurrFilter, string searchVal = "")
{
//return Task.FromResult(dbController.StatDdbGetAll(numRecord, searchVal).ToArray());
List<MP.Data.DatabaseModels.DdbTurni> dbResult = new List<MP.Data.DatabaseModels.DdbTurni>();
List<DdbTurni> dbResult = new List<DdbTurni>();
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
dbResult = dbController.StatDdbGetAll(CurrFilter.DateStart, CurrFilter.DateEnd, CurrFilter.IdxMacchina, CurrFilter.IdxOdl, CurrFilter.KeyRichiesta, CurrFilter.CodArticolo, 1, 0);
@@ -319,16 +321,16 @@ namespace MP.Stats.Data
/// <param name="CurrFilter"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public async Task<List<MP.Data.DatabaseModels.OdlEnergyModel>> StatOdlEnergyGetAll(SelectData CurrFilter, string searchVal = "")
public async Task<List<OdlEnergyModel>> StatOdlEnergyGetAll(SelectData CurrFilter, string searchVal = "")
{
List<MP.Data.DatabaseModels.OdlEnergyModel> dbResult = new List<MP.Data.DatabaseModels.OdlEnergyModel>();
List<OdlEnergyModel> dbResult = new List<OdlEnergyModel>();
string cacheKey = getCacheKey("MP:STATS:ODL_ENERGY", CurrFilter);
string rawData;
var redisDataList = await distributedCache.GetAsync(cacheKey);
if (redisDataList != null)
{
rawData = Encoding.UTF8.GetString(redisDataList);
dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.OdlEnergyModel>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<OdlEnergyModel>>(rawData);
}
else
{
@@ -351,16 +353,16 @@ namespace MP.Stats.Data
/// <param name="CurrFilter"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public async Task<List<MP.Data.DatabaseModels.StatsODL>> StatOdlGetAll(SelectData CurrFilter, string searchVal = "")
public async Task<List<StatsODL>> StatOdlGetAll(SelectData CurrFilter, string searchVal = "")
{
List<MP.Data.DatabaseModels.StatsODL> dbResult = new List<MP.Data.DatabaseModels.StatsODL>();
List<StatsODL> dbResult = new List<StatsODL>();
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<List<MP.Data.DatabaseModels.StatsODL>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<StatsODL>>(rawData);
}
else
{
@@ -384,16 +386,16 @@ namespace MP.Stats.Data
/// <param name="CurrFilter"></param>
/// <param name="searchVal"></param>
/// <returns></returns>
public async Task<List<MP.Data.DatabaseModels.TaskListModel>> TaskListAll(Task2ExeType TType, string searchVal = "")
public async Task<List<TaskListModel>> TaskListAll(Task2ExeType TType, string searchVal = "")
{
List<MP.Data.DatabaseModels.TaskListModel> dbResult = new List<MP.Data.DatabaseModels.TaskListModel>();
List<TaskListModel> dbResult = new List<TaskListModel>();
string cacheKey = $"MP:STATS:TaskList:{TType}";
string rawData;
var redisDataList = await distributedCache.GetAsync(cacheKey);
if (redisDataList != null)
{
rawData = Encoding.UTF8.GetString(redisDataList);
dbResult = JsonConvert.DeserializeObject<List<MP.Data.DatabaseModels.TaskListModel>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<TaskListModel>>(rawData);
}
else
{
@@ -417,18 +419,33 @@ namespace MP.Stats.Data
}
return await Task.FromResult(dbResult);
}
/// <summary>
/// Update/Insert record TaskList
/// </summary>
/// <param name="rec2upd"></param>
/// <returns></returns>
public async Task<bool> TaskListUpsert(TaskListModel rec2upd)
{
bool dbResult = dbController.TaskListUpsert(rec2upd);
// svuoto cache!
string cacheKey = $"MP:STATS:TaskList:{rec2upd.TType}";
await distributedCache.RemoveAsync(cacheKey);
cacheKey = $"MP:STATS:TaskList:ND";
await distributedCache.RemoveAsync(cacheKey);
return await Task.FromResult(dbResult);
}
public async Task<List<MP.Data.DatabaseModels.ResScarti>> StatScartiGetAll(SelectData CurrFilter, string searchVal = "")
public async Task<List<ResScarti>> StatScartiGetAll(SelectData CurrFilter, string searchVal = "")
{
//return Task.FromResult(dbController.StatScartiGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
List<MP.Data.DatabaseModels.ResScarti> dbResult = new List<MP.Data.DatabaseModels.ResScarti>();
List<ResScarti> dbResult = new List<ResScarti>();
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<List<MP.Data.DatabaseModels.ResScarti>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<ResScarti>>(rawData);
}
else
{
@@ -445,21 +462,21 @@ namespace MP.Stats.Data
return await Task.FromResult(dbResult);
}
public async Task<List<MP.Data.DatabaseModels.TurniOee>> StatTurniOeeGetAllAsync(DateTime DataStart, DateTime DataEnd, string IdxMacchina, int IdxODL, string KeyRichiesta, string CodArticolo, string searchVal = "")
public async Task<List<TurniOee>> 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<List<MP.Data.DatabaseModels.TurniOee>> StatTurniOeeGetAllCached(SelectData CurrFilter, string searchVal = "")
public async Task<List<TurniOee>> StatTurniOeeGetAllCached(SelectData CurrFilter, string searchVal = "")
{
List<MP.Data.DatabaseModels.TurniOee> dbResult = new List<MP.Data.DatabaseModels.TurniOee>();
List<TurniOee> dbResult = new List<TurniOee>();
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<List<MP.Data.DatabaseModels.TurniOee>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<TurniOee>>(rawData);
}
else
{
@@ -476,17 +493,17 @@ namespace MP.Stats.Data
return await Task.FromResult(dbResult);
}
public async Task<List<MP.Data.DatabaseModels.UserActionLog>> StatUserLogGetAll(SelectData CurrFilter, string searchVal = "")
public async Task<List<UserActionLog>> StatUserLogGetAll(SelectData CurrFilter, string searchVal = "")
{
//return Task.FromResult(dbController.StatUserLogGetAll(DataStart, DataEnd, IdxMacchina, IdxODL, KeyRichiesta, CodArticolo).ToArray());
List<MP.Data.DatabaseModels.UserActionLog> dbResult = new List<MP.Data.DatabaseModels.UserActionLog>();
List<UserActionLog> dbResult = new List<UserActionLog>();
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<List<MP.Data.DatabaseModels.UserActionLog>>(rawData);
dbResult = JsonConvert.DeserializeObject<List<UserActionLog>>(rawData);
}
else
{