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

Prima versione con messagepipe ok!

Browse Source
This commit is contained in:
Samuele Locatelli
2022-12-09 16:10:31 +01:00
parent 083f719834
commit 25f01bbef0
9 changed files with 127 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.SPEC/Components/AskCloseOdl.razor.cs
+47 -17
View File
@@ -1,6 +1,7 @@
using Microsoft.AspNetCore.Components;
using MP.Data;
using MP.SPEC.Data;
using Newtonsoft.Json;
namespace MP.SPEC.Components
{
@@ -10,12 +11,42 @@ namespace MP.SPEC.Components
public void Dispose()
{
#if false
aTimer.Elapsed -= ElapsedTimer;
aTimer.Stop();
aTimer.Dispose();
aTimer.Dispose();
#endif
MMDataService.BroadastMsgPipe.EA_NewMessage -= BroadastMsgPipe_EA_NewMessage;
GC.Collect();
}
protected DateTime lastRec = DateTime.Now.AddMinutes(-1);
private void BroadastMsgPipe_EA_NewMessage(object? sender, EventArgs e)
{
DateTime adesso = DateTime.Now;
PubSubEventArgs currArgs = (PubSubEventArgs)e;
if (!string.IsNullOrEmpty(currArgs.newMessage))
{
lastRec = adesso;
try
{
var result = JsonConvert.DeserializeObject<DisplayAction>(currArgs.newMessage);
if (result != null)
{
CurrAction = result;
}
}
catch
{ }
InvokeAsync(() =>
{
StateHasChanged();
});
}
}
#if false
public void ElapsedTimer(object? source, System.Timers.ElapsedEventArgs e)
{
aTimer.Stop();
@@ -36,7 +67,8 @@ namespace MP.SPEC.Components
aTimer.Elapsed += ElapsedTimer;
aTimer.Enabled = true;
aTimer.Start();
}
}
#endif
#endregion Public Methods
@@ -53,16 +85,6 @@ namespace MP.SPEC.Components
[Inject]
protected MpDataService MMDataService { get; set; } = null!;
#if false
protected bool showRequest
{
get
{
return CurrAction != null && CurrAction.IsActive;
//return DateTime.Now.Second % 10 < 7;
}
}
#endif
#endregion Protected Properties
@@ -71,14 +93,19 @@ namespace MP.SPEC.Components
protected override async Task OnInitializedAsync()
{
await reloadData();
StartTimer();
MMDataService.BroadastMsgPipe.EA_NewMessage += BroadastMsgPipe_EA_NewMessage;
#if false
StartTimer();
#endif
}
#endregion Protected Methods
#region Private Fields
private static System.Timers.Timer aTimer = null!;
#if false
private static System.Timers.Timer aTimer = null!;
#endif
#endregion Private Fields
@@ -87,7 +114,10 @@ namespace MP.SPEC.Components
private async Task reloadData()
{
CurrAction = await MMDataService.ActionGetReq();
//await InvokeAsync(() => StateHasChanged());
if (CurrAction != null)
{
await InvokeAsync(() => StateHasChanged());
}
}
protected async Task doConfirm()
@@ -98,7 +128,7 @@ namespace MP.SPEC.Components
// elimino richiesta
CurrAction = null;
await MMDataService.ActionSetReq(CurrAction);
MMDataService.ActionSetReq(CurrAction);
}
protected async Task doCancel()
{
@@ -106,7 +136,7 @@ namespace MP.SPEC.Components
// eseguo
CurrAction.IsActive = false;
await MMDataService.ActionSetReq(CurrAction);
MMDataService.ActionSetReq(CurrAction);
}
#endregion Private Methods
MP.SPEC/Data/MpDataService.cs
+67 -68
View File
@@ -48,6 +48,8 @@ namespace MP.SPEC.Data
public static MP.Data.Controllers.MpSpecController dbController { get; set; } = null!;
public MessagePipe BroadastMsgPipe { get; set; } = null!;
/// <summary>
/// Dizionario dei tag configurati per IOB
/// </summary>
@@ -57,6 +59,48 @@ namespace MP.SPEC.Data
#region Public Methods
/// <summary>
/// Recupera eventuali azioni richieste
/// </summary>
/// <returns></returns>
public async Task<DisplayAction?> ActionGetReq()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
DisplayAction? result = null;
// cerco in redis...
RedisValue rawData = await redisDb.StringGetAsync(redisActionReq);
if (!string.IsNullOrEmpty($"{rawData}"))
{
result = JsonConvert.DeserializeObject<DisplayAction>($"{rawData}");
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ActionGetReq Read from REDIS: {ts.TotalMilliseconds}ms");
}
return result;
}
/// <summary>
/// Salva richiesta azione
/// </summary>
/// <param name="act2save"></param>
/// <returns></returns>
public bool ActionSetReq(DisplayAction? act2save)
{
bool fatto = false;
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
// cerco in redis...
string rawData = JsonConvert.SerializeObject(act2save);
// invio broadcast + salvo in redis
BroadastMsgPipe.saveAndSendMessage(redisActionReq, rawData);
//await redisDb.StringSetAsync(redisActionReq, rawData);
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ActionSetReq REDIS send to broadcast + Write cache: {ts.TotalMilliseconds}ms");
return fatto;
}
public async Task<List<ListValues>> AnagStatiComm()
{
Stopwatch stopWatch = new Stopwatch();
@@ -88,45 +132,6 @@ namespace MP.SPEC.Data
return result;
}
/// <summary>
/// Recupera eventuali azioni richieste
/// </summary>
/// <returns></returns>
public async Task<DisplayAction?> ActionGetReq()
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
DisplayAction? result = null;
// cerco in redis...
RedisValue rawData = await redisDb.StringGetAsync(redisActionReq);
if (!string.IsNullOrEmpty($"{rawData}"))
{
result = JsonConvert.DeserializeObject<DisplayAction>($"{rawData}");
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ActionGetReq Read from REDIS: {ts.TotalMilliseconds}ms");
}
return result;
}
/// <summary>
/// Salva richiesta azione
/// </summary>
/// <param name="act2save"></param>
/// <returns></returns>
public async Task<bool> ActionSetReq(DisplayAction? act2save)
{
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
bool fatto = false;
// cerco in redis...
RedisValue rawData = JsonConvert.SerializeObject(act2save);
await redisDb.StringSetAsync(redisActionReq, rawData);
stopWatch.Stop();
TimeSpan ts = stopWatch.Elapsed;
Log.Debug($"ActionSetReq Write to REDIS: {ts.TotalMilliseconds}ms");
return fatto;
}
public async Task<List<ListValues>> AnagTipoArtLV()
{
Stopwatch stopWatch = new Stopwatch();
@@ -518,9 +523,6 @@ namespace MP.SPEC.Data
/// <returns></returns>
public Task<List<AnagGruppi>> ElencoGruppiFase()
{
#if false
return Task.FromResult(dbController.AnagGruppiFase());
#endif
List<AnagGruppi> result = new List<AnagGruppi>();
Stopwatch stopWatch = new Stopwatch();
stopWatch.Start();
@@ -572,7 +574,7 @@ namespace MP.SPEC.Data
public async Task<bool> FlushRedisCache()
{
await Task.Delay(1);
RedisValue pattern = new RedisValue($"{redisBaseAddr}*");
RedisValue pattern = new RedisValue($"{redisBaseAddrSpec}*");
bool answ = await ExecFlushRedisPattern(pattern);
// rileggo vocabolario.,..
ObjVocabolario = VocabolarioGetAll();
@@ -1384,43 +1386,40 @@ namespace MP.SPEC.Data
#region Private Fields
private const string redisAnagGruppi = redisBaseAddr + "SPEC:Cache:AnagGruppi";
private const string redisActionReq = redisBaseAddr + "IO:Action:Req";
private const string redisAnagGruppi = redisBaseAddrSpec + "Cache:AnagGruppi";
private const string redisArtByDossier = redisBaseAddr + "SPEC:Cache:ArtByDossier";
private const string redisArtByDossier = redisBaseAddrSpec + "Cache:ArtByDossier";
private const string redisArtList = redisBaseAddr + "SPEC:Cache:ArtList";
private const string redisArtList = redisBaseAddrSpec + "Cache:ArtList";
private const string redisBaseAddr = "MP:";
private const string redisBaseAddrSpec = redisBaseAddr + "SPEC:";
private const string redisConfKey = redisBaseAddr + "SPEC:Cache:Config";
private const string redisConfKey = redisBaseAddrSpec + "Cache:Config";
private const string redisDossByMac = redisBaseAddr + "SPEC:Cache:DossByMac";
private const string redisDossByMac = redisBaseAddrSpec + "Cache:DossByMac";
private const string redisFluxByMac = redisBaseAddr + "SPEC:Cache:FluxByMac";
private const string redisFluxByMac = redisBaseAddrSpec + "Cache:FluxByMac";
private const string redisFluxLogFilt = redisBaseAddr + "SPEC:Cache:FluxLogFilt";
private const string redisFluxLogFilt = redisBaseAddrSpec + "Cache:FluxLogFilt";
private const string redisGiacenzaList = redisBaseAddr + ":GiacenzaList";
private const string redisMacByFlux = redisBaseAddr + "SPEC:Cache:MacByFlux";
private const string redisGiacenzaList = redisBaseAddrSpec + "Cache:GiacenzaList";
private const string redisMacByFlux = redisBaseAddrSpec + "Cache:MacByFlux";
private const string redisMacList = redisBaseAddr + "SPEC:Cache:MacList";
private const string redisOdlByBatch = redisXdlData + ":OdlByBatch";
private const string redisOdlCurrByMac = redisXdlData + ":OdlByMac";
private const string redisOdlList = redisXdlData + ":OdlList";
private const string redisPOdlByOdl = redisXdlData + ":POdlByOdl";
private const string redisPOdlByPOdl = redisXdlData + ":POdlByPOdl";
private const string redisPOdlList = redisXdlData + ":POdlList";
private const string redisStatoCom = redisBaseAddr + "SPEC:Cache:StatoCom";
private const string redisTipoArt = redisBaseAddr + "SPEC:Cache:TipoArt";
private const string redisVocabolario = redisBaseAddr + "SPEC:Cache:Vocabolario";
private const string redisXdlData = redisBaseAddr + "SPEC:Cache:XDL";
private const string redisActionReq = redisBaseAddr + "SPEC:Action:Req";
private const string redisMacList = redisBaseAddrSpec + "Cache:MacList";
private const string redisOdlByBatch = redisXdlData + "OdlByBatch";
private const string redisOdlCurrByMac = redisXdlData + "OdlByMac";
private const string redisOdlList = redisXdlData + "OdlList";
private const string redisPOdlByOdl = redisXdlData + "POdlByOdl";
private const string redisPOdlByPOdl = redisXdlData + "POdlByPOdl";
private const string redisPOdlList = redisXdlData + "POdlList";
private const string redisStatoCom = redisBaseAddrSpec + "Cache:StatoCom";
private const string redisTipoArt = redisBaseAddrSpec + "Cache:TipoArt";
private const string redisVocabolario = redisBaseAddrSpec + "Cache:Vocabolario";
private const string redisXdlData = redisBaseAddrSpec + "Cache:XDL:";
private static IConfiguration _configuration = null!;
public MessagePipe BroadastMsgPipe { get; set; } = null!;
private static ILogger<MpDataService> _logger = null!;
private static Logger Log = LogManager.GetCurrentClassLogger();
MP.SPEC/MP.SPEC.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<RootNamespace>MP.SPEC</RootNamespace>
<Version>6.16.2212.913</Version>
<Version>6.16.2212.916</Version>
</PropertyGroup>
<ItemGroup>
MP.SPEC/Pages/Test.razor.cs
+5 -3
View File
@@ -41,7 +41,7 @@ namespace MP.SPEC.Pages
{
//CurrAction.IsActive = false;
//await MMDataService.ActionSetReq(CurrAction);
await MMDataService.ActionSetReq(null);
MMDataService.ActionSetReq(null);
}
protected override async Task OnInitializedAsync()
@@ -72,9 +72,11 @@ namespace MP.SPEC.Pages
#endif
}
protected async void sendMessage()
protected void sendMessage()
{
await MMDataService.ActionSetReq(CurrAction);
CurrAction.DtReq = DateTime.Now;
CurrAction.IsActive= true;
MMDataService.ActionSetReq(CurrAction);
}
#endregion Protected Methods
MP.SPEC/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>Modulo MAPOSPEC </i>
<h4>Versione: 6.16.2212.913</h4>
<h4>Versione: 6.16.2212.916</h4>
<br /> Note di rilascio:
<ul>
<li>
MP.SPEC/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
6.16.2212.913
6.16.2212.916
MP.SPEC/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>6.16.2212.913</version>
<version>6.16.2212.916</version>
<url>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/MP.SPEC.zip</url>
<changelog>https://nexus.steamware.net/repository/SWS/MP-SPEC/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>