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

Refresh generale

Browse Source
This commit is contained in:
Samuele Locatelli
2022-06-20 20:50:25 +02:00
parent 8927378fdf
commit f84fca1bc9
24 changed files with 70 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ANALYZER/MP.MONO.ANALYZER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.12206.2016</Version>
<Version>1.12206.2020</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.ANALYZER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.12206.2016</h4>
<h4>Version: 1.12206.2020</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2016
1.12206.2020
MP.MONO.ANALYZER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.12206.2016</version>
<version>1.12206.2020</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.ANALYZER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.Core/ConfigManager.cs
+2 -2
View File
@@ -62,7 +62,7 @@ namespace MP.MONO.Core
}
}
// salvo in redis!
redisDb.StringSetAsync(Constants.ALARMS_CONF_KEY, JsonConvert.SerializeObject(currConf));
redisDb.StringSetAsync(Constants.ALARMS_CONF_BBIT_KEY, JsonConvert.SerializeObject(currConf));
}
}
if (currConf == null)
@@ -92,7 +92,7 @@ namespace MP.MONO.Core
}
}
// salvo in redis!
redisDb.StringSetAsync(Constants.ALARMS_CONF_KEY, JsonConvert.SerializeObject(currConf));
redisDb.StringSetAsync(Constants.ALARMS_CONF_RLIST_KEY, JsonConvert.SerializeObject(currConf));
}
}
if (currConf == null)
MP.MONO.Core/Constants.cs
+5 -2
View File
@@ -22,7 +22,9 @@ namespace MP.MONO.Core
// Configurazioni
public static readonly string ACTLOG_CONF_KEY = $"{BASE_HASH}:Conf:ActLog";
public static readonly string ALARMS_CONF_KEY = $"{BASE_HASH}:Conf:Alarms";
public static readonly string ALARMS_RLIST_KEY = $"{BASE_HASH}:Conf:AlarmsRawList";
public static readonly string ALARMS_ADAP_CONF_KEY = $"{BASE_HASH}:Conf:AdapterAlarms";
public static readonly string ALARMS_CONF_BBIT_KEY = $"{BASE_HASH}:Conf:AlarmsBankBit";
public static readonly string ALARMS_CONF_RLIST_KEY = $"{BASE_HASH}:Conf:AlarmsRawList";
public static readonly string ALARMS_MODE_KEY = $"{BASE_HASH}:Conf:AlarmMode";
public static readonly string MODE_CONF_KEY = $"{BASE_HASH}:Conf:Mode";
public static readonly string PARAMS_CONF_KEY = $"{BASE_HASH}:Conf:Params";
@@ -30,11 +32,12 @@ namespace MP.MONO.Core
public static readonly string TOOLS_CONF_KEY = $"{BASE_HASH}:Conf:Tools";
// settings utente
public static readonly string ALARMS_SETT_BBIT_KEY = $"{BASE_HASH}:Settings:Alarms";
public static readonly string ALARMS_SETT_BBIT_KEY = $"{BASE_HASH}:Settings:AlarmsBankBit";
public static readonly string ALARMS_SETT_RLIST_KEY = $"{BASE_HASH}:Settings:AlarmsRawList";
// REDIS KEY Dati correnti
public static readonly string ACT_LOG_CURR_KEY = $"{BASE_HASH}:Current:ActivityLog";
public static readonly string ALARM_ADAPTER_ACT_KEY = $"{BASE_HASH}:Current:AdapterAlarm";
public static readonly string ALARM_ACT_KEY = $"{BASE_HASH}:Current:AlarmsVal";
public static readonly string ALARM_CURR_KEY = $"{BASE_HASH}:Current:Alarms";
public static readonly string EVENT_LOG_CURR_KEY = $"{BASE_HASH}:Current:EventsLog";
MP.MONO.DECODER/MP.MONO.DECODER.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.12206.2016</Version>
<Version>1.12206.2020</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.DECODER/Program.cs
+3 -3
View File
@@ -135,7 +135,7 @@ void setupConf()
rawData = redisDb.StringGet(Constants.ALARMS_MODE_KEY);
alarmMode = JsonConvert.DeserializeObject<AlarmReportingMode>(rawData);
// elenco allarmi già registrati (cache DB)
rawData = redisDb.StringGet(Constants.ALARMS_RLIST_KEY);
rawData = redisDb.StringGet(Constants.ALARMS_CONF_RLIST_KEY);
if (!string.IsNullOrEmpty(rawData))
{
alarmsRecorded = JsonConvert.DeserializeObject<List<AlarmListModel>>(rawData);
@@ -179,7 +179,7 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
string rawData = redisDb.StringGet(Constants.ALARMS_SETT_RLIST_KEY);
if (string.IsNullOrEmpty(rawData))
{
rawData = redisDb.StringGet(Constants.ALARMS_RLIST_KEY);
rawData = redisDb.StringGet(Constants.ALARMS_CONF_RLIST_KEY);
}
if (!string.IsNullOrEmpty(rawData))
{
@@ -227,7 +227,7 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
foundAlarm = dbController.AlarmListInsert(newAlarm);
// ora rileggo ed aggiorno redis e cerco di nuovo record...
alarmsRecorded = dbController.AlarmListGetAll();
redisDb.StringSet(Constants.ALARMS_RLIST_KEY, JsonConvert.SerializeObject(alarmsRecorded));
redisDb.StringSet(Constants.ALARMS_SETT_RLIST_KEY, JsonConvert.SerializeObject(alarmsRecorded));
}
if (!isMuted && lastAlarms != null)
{
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.12206.2016</h4>
<h4>Version: 1.12206.2020</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2016
1.12206.2020
MP.MONO.DECODER/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.12206.2016</version>
<version>1.12206.2020</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.DECODER/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.SIM/MP.MONO.SIM.csproj
+1 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.12206.2016</Version>
<Version>1.12206.2020</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.12206.2016</h4>
<h4>Version: 1.12206.2020</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2016
1.12206.2020
MP.MONO.SIM/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.12206.2016</version>
<version>1.12206.2020</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.SIM/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>
MP.MONO.UI/Components/ParetoAlarms.razor
+5
View File
@@ -0,0 +1,5 @@
<h3>ParetoAlarms</h3>
@code {
}
MP.MONO.UI/Data/CurrentDataService.cs
+3 -3
View File
@@ -210,7 +210,7 @@ namespace MP.MONO.UI.Data
public async Task<List<BaseAlarmBankConf>> getAlarmBBConfig()
{
List<BaseAlarmBankConf>? dbResult = new List<BaseAlarmBankConf>();
string rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_KEY);
string rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_BBIT_KEY);
if (!string.IsNullOrEmpty(rawData))
{
dbResult = JsonConvert.DeserializeObject<List<BaseAlarmBankConf>>(rawData);
@@ -229,7 +229,7 @@ namespace MP.MONO.UI.Data
public async Task<List<AlarmListModel>> getAlarmRLConfig()
{
List<AlarmListModel>? redResult = new List<AlarmListModel>();
string rawData = await redisDb.StringGetAsync(Constants.ALARMS_RLIST_KEY);
string rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_RLIST_KEY);
if (!string.IsNullOrEmpty(rawData))
{
redResult = JsonConvert.DeserializeObject<List<AlarmListModel>>(rawData);
@@ -346,7 +346,7 @@ namespace MP.MONO.UI.Data
//se non avessi trovato valori cerco quelli di setup...
if (string.IsNullOrEmpty(rawData))
{
rawData = await redisDb.StringGetAsync(Constants.ALARMS_RLIST_KEY);
rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_RLIST_KEY);
}
// ora provo a deserializzare
if (!string.IsNullOrEmpty(rawData))
MP.MONO.UI/MP.MONO.UI.csproj
+1 -1
View File
@@ -5,7 +5,7 @@
<Nullable>enable</Nullable>
<ImplicitUsings>enable</ImplicitUsings>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.12206.2016</Version>
<Version>1.12206.2020</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.UI/Pages/Alarms.razor
+8 -1
View File
@@ -52,6 +52,13 @@
<div class="card-body">
<AlarmsOverview messageReceived="() => reloadFromMessage()"></AlarmsOverview>
</div>
<div class="card-footer">
<div class="d-grid">
<NavLink class="btn btn-info btn-block" href="AlarmsAnalysis">
<i class="bi bi-bar-chart pe-2" aria-hidden="true"></i> Alarm Analysis
</NavLink>
</div>
</div>
</div>
</div>
<div class="col-9">
@@ -127,7 +134,7 @@
</div>
</div>
@*<div class="card-footer p-1">
</div>*@
</div>*@
</div>
MP.MONO.UI/Pages/AlarmsAnalysis.razor
+5
View File
@@ -0,0 +1,5 @@
@page "/AlarmsAnalysis"
<h3>AlarmsAnalysis</h3>
MP.MONO.UI/Pages/AlarmsAnalysis.razor.cs
+23
View File
@@ -0,0 +1,23 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Components;
using System.Net.Http;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.Components.Forms;
using Microsoft.AspNetCore.Components.Routing;
using Microsoft.AspNetCore.Components.Web;
using Microsoft.AspNetCore.Components.Web.Virtualization;
using Microsoft.JSInterop;
using MP.MONO.UI;
using MP.MONO.UI.Shared;
using MP.MONO.UI.Components;
namespace MP.MONO.UI.Pages
{
public partial class AlarmsAnalysis
{
}
}
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.12206.2016</h4>
<h4>Version: 1.12206.2020</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2016
1.12206.2020
MP.MONO.UI/Resources/manifest.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.12206.2016</version>
<version>1.12206.2020</version>
<url>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/MP.Mon.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MP.MONO.UI/stable/LAST/ChangeLog.html</changelog>
<mandatory>false</mandatory>