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

Update x conflitto allarmi SIM/ADAPTER

Browse Source 
- fix alalrmi vuoti
- fix abilitazione SIM se no allarmi da simulare
- fix conf redis allarmi
This commit is contained in:
Samuele Locatelli
2022-06-21 14:15:01 +02:00
parent 4dc2eb96ba
commit fc36b427c4
22 changed files with 69 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ADAPTER.OPC/IobOpcUa.cs
+2 -17
View File
@@ -439,22 +439,6 @@ namespace MP.MONO.ADAPTER.OPC
{
// prendo il valore bonificato dei caratteri che vogliamo ignorare
currVal = stringCleanup($"{e.CurrNotify.Value}");
#if false
// se è abilitato filt/split...
if (!string.IsNullOrEmpty(FiltSplitChar))
{
var dataArray = rawVar.Split(FiltSplitChar);
if (dataArray.Length > 0)
{
currVal = dataArray[0];
}
}
if (string.IsNullOrEmpty(currVal))
{
currVal = rawVar;
//currVal = $"{e.CurrNotify.Value}";
}
#endif
checkAndSend(e.CurrMonitoredItem, currVal, false);
}
// aggiorno ultima lettura
@@ -816,7 +800,8 @@ namespace MP.MONO.ADAPTER.OPC
// salvo in redis!
redisDb.StringSet(Constants.ALARMS_ADAP_CONF_KEY, JsonConvert.SerializeObject(AlarmsStatus));
// genero elenco allarmi attivi
List<string> adpActiveAlarm = AlarmsStatus.Select(x => x.Value).OrderBy(x => x).ToList();
List<string> adpActiveAlarm = AlarmsStatus.Select(x => x.Value).Where(x => !string.IsNullOrEmpty(x)).OrderBy(x => x).ToList();
var payloadAlarms = JsonConvert.SerializeObject(adpActiveAlarm);
// invio
saveAndSendMessage(Constants.ALARM_ACT_KEY, Constants.ALARM_ACT_QUEUE, payloadAlarms);
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.2111</Version>
<Version>1.12206.2114</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.2111</h4>
<h4>Version: 1.12206.2114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.ANALYZER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2111
1.12206.2114
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.2111</version>
<version>1.12206.2114</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.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.2111</Version>
<Version>1.12206.2114</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.DECODER/Program.cs
+2 -6
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_CONF_RLIST_KEY);
rawData = redisDb.StringGet(Constants.ALARMS_SETT_RLIST_KEY);
if (!string.IsNullOrEmpty(rawData))
{
alarmsRecorded = JsonConvert.DeserializeObject<List<AlarmListModel>>(rawData);
@@ -177,17 +177,13 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
List<AlarmListModel>? mutedAlarmsList = new List<AlarmListModel>();
string rawData = redisDb.StringGet(Constants.ALARMS_SETT_RLIST_KEY);
if (string.IsNullOrEmpty(rawData))
{
rawData = redisDb.StringGet(Constants.ALARMS_CONF_RLIST_KEY);
}
if (!string.IsNullOrEmpty(rawData))
{
mutedAlarmsList = JsonConvert.DeserializeObject<List<AlarmListModel>>(rawData);
}
if (mutedAlarmsList == null)
{
mutedAlarmsList = new List<AlarmListModel>();
mutedAlarmsList = dbController.AlarmListGetAll();
}
// rileggo da REDIS la conf attuale allarmi già attivi da area ALARM_CURR_KEY
MP.MONO.DECODER/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.12206.2111</h4>
<h4>Version: 1.12206.2114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.DECODER/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2111
1.12206.2114
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.2111</version>
<version>1.12206.2114</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
+4 -1
View File
@@ -6,7 +6,7 @@
<ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable>
<Platforms>AnyCPU;x86;x64</Platforms>
<Version>1.12206.2111</Version>
<Version>1.12206.2114</Version>
</PropertyGroup>
<ItemGroup>
@@ -45,6 +45,9 @@
</ItemGroup>
<ItemGroup>
<None Update="conf\SimAlarmRawList.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Update="conf\AlarmRawList.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
MP.MONO.SIM/Program.cs
+1 -8
View File
@@ -233,7 +233,7 @@ void simAlarms()
if (alarmMode == AlarmReportingMode.RawList)
{
// controllo se devo fare (se ho valori da simulare...)
if (alarmsRawConf.Count > 0)
if (alarmsRawConf.Count > 0 && alarmsRawConf[0].messages.Count > 0)
{
DateTime lastOk = DateTime.Now;
// Dict allarmi attivi (e da quando)
@@ -332,13 +332,6 @@ void simParameters()
{
do
{
#if false
// da eliminare quando gestita da decoder
var newParams = currSimGen.getParameters();
string rawData = JsonConvert.SerializeObject(newParams);
saveAndSendMessage(Constants.PARAMS_CURR_KEY, Constants.PARAMS_M_QUEUE, rawData);
#endif
// gestione SIM dictionary
var paramDict = currSimGen.getParamsVal();
string rawData = JsonConvert.SerializeObject(paramDict);
MP.MONO.SIM/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.12206.2111</h4>
<h4>Version: 1.12206.2114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.SIM/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2111
1.12206.2114
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.2111</version>
<version>1.12206.2114</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.SIM/conf/AlarmRawList.json
-42
View File
@@ -1,44 +1,2 @@
[
{
"source": "NC Alarm",
"messages": [
"NC Alarm 001",
"NC Alarm 002",
"NC Alarm 003",
"NC Alarm 004",
"NC Alarm 005",
"NC Alarm 006",
"NC Alarm 007",
"NC Alarm 008",
"NC Alarm 009",
"NC Alarm 010",
"NC Alarm 011",
"NC Alarm 012",
"NC Alarm 013",
"NC Alarm 014",
"NC Alarm 015",
"NC Alarm 016"
]
},
{
"source": "PLC Alarm",
"messages": [
"PLC Warning 001",
"PLC Warning 002",
"PLC Warning 003",
"PLC Warning 004",
"PLC Warning 005",
"PLC Warning 006",
"PLC Warning 007",
"PLC Warning 008",
"PLC Warning 009",
"PLC Warning 010",
"PLC Warning 011",
"PLC Warning 012",
"PLC Warning 013",
"PLC Warning 014",
"PLC Warning 015",
"PLC Warning 016"
]
}
]
MP.MONO.SIM/conf/SimAlarmRawList.json
+44
View File
@@ -0,0 +1,44 @@
[
{
"source": "NC Alarm",
"messages": [
"NC Alarm 001",
"NC Alarm 002",
"NC Alarm 003",
"NC Alarm 004",
"NC Alarm 005",
"NC Alarm 006",
"NC Alarm 007",
"NC Alarm 008",
"NC Alarm 009",
"NC Alarm 010",
"NC Alarm 011",
"NC Alarm 012",
"NC Alarm 013",
"NC Alarm 014",
"NC Alarm 015",
"NC Alarm 016"
]
},
{
"source": "PLC Alarm",
"messages": [
"PLC Warning 001",
"PLC Warning 002",
"PLC Warning 003",
"PLC Warning 004",
"PLC Warning 005",
"PLC Warning 006",
"PLC Warning 007",
"PLC Warning 008",
"PLC Warning 009",
"PLC Warning 010",
"PLC Warning 011",
"PLC Warning 012",
"PLC Warning 013",
"PLC Warning 014",
"PLC Warning 015",
"PLC Warning 016"
]
}
]
MP.MONO.UI/Data/CurrentDataService.cs
+1 -25
View File
@@ -241,25 +241,6 @@ namespace MP.MONO.UI.Data
return await Task.FromResult(redResult);
}
/// <summary>
/// Conf allarmi corrente (area settings)
/// </summary>
/// <returns></returns>
public async Task<List<AlarmListModel>> getAlarmRLSettings()
{
List<AlarmListModel>? redResult = new List<AlarmListModel>();
string rawData = await redisDb.StringGetAsync(Constants.ALARMS_SETT_RLIST_KEY);
if (!string.IsNullOrEmpty(rawData))
{
redResult = JsonConvert.DeserializeObject<List<AlarmListModel>>(rawData);
}
if (redResult == null)
{
redResult = await getAlarmRLConfig();
}
return await Task.FromResult(redResult);
}
public async Task<List<string>> getAlarms()
{
List<string>? dbResult = new List<string>();
@@ -343,11 +324,6 @@ namespace MP.MONO.UI.Data
{
List<AlarmListModel> mutedList = new List<AlarmListModel>();
string rawData = await redisDb.StringGetAsync(Constants.ALARMS_SETT_RLIST_KEY);
//se non avessi trovato valori cerco quelli di setup...
if (string.IsNullOrEmpty(rawData))
{
rawData = await redisDb.StringGetAsync(Constants.ALARMS_CONF_RLIST_KEY);
}
// ora provo a deserializzare
if (!string.IsNullOrEmpty(rawData))
{
@@ -356,7 +332,7 @@ namespace MP.MONO.UI.Data
// altrimenti imposto vuoto
if (mutedList == null)
{
mutedList = new List<AlarmListModel>();
mutedList = dbController.AlarmListGetAll();
}
return await Task.FromResult(mutedList);
}
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.2111</Version>
<Version>1.12206.2114</Version>
</PropertyGroup>
<ItemGroup>
MP.MONO.UI/Resources/ChangeLog.html
+1 -1
View File
@@ -1,6 +1,6 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: 1.12206.2111</h4>
<h4>Version: 1.12206.2114</h4>
<br /> Release Note:
<ul>
<li>
MP.MONO.UI/Resources/VersNum.txt
+1 -1
View File
@@ -1 +1 @@
1.12206.2111
1.12206.2114
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.2111</version>
<version>1.12206.2114</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>