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

Merge branch 'release/FixIis01DeployAndResourcesFolder'

Browse Source
This commit is contained in:
Samuele Locatelli
2022-04-28 17:40:13 +02:00
parent 03f811de57 abceb4e187
commit e67bb0e765
9 changed files with 105 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
MP.MONO.ALL.sln
+10
View File
@@ -17,6 +17,16 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.MONO.ANALYZER", "MP.MONO
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MP.MONO.ADAPTER", "MP.MONO.ADAPTER\MP.MONO.ADAPTER.csproj", "{873736BA-CDB6-4CE5-A340-6D904C11C07C}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Resources", "Resources", "{78533B62-E69F-4A5F-974A-D370FDCB5CF5}"
ProjectSection(SolutionItems) = preProject
Resources\ChangeLog-original.html = Resources\ChangeLog-original.html
Resources\ChangeLog.html = Resources\ChangeLog.html
Resources\logoSteamware.png = Resources\logoSteamware.png
Resources\manifest-original.xml = Resources\manifest-original.xml
Resources\manifest.xml = Resources\manifest.xml
Resources\VersNum.txt = Resources\VersNum.txt
EndProjectSection
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
MP.MONO.DECODER/Program.cs
+26 -10
View File
@@ -83,6 +83,8 @@ AlarmsManager alarmsMan = new AlarmsManager();
// inizializzo gestione messagePipe da Redis x allarmi
MessagePipe alarmsPipe = new MessagePipe(redisConn, Constants.ALARM_M_QUEUE);
MessagePipe alarmsValPipe = new MessagePipe(redisConn, Constants.ALARM_ACT_QUEUE);
// datetime dell'inizio esecuzione task... x usare un semaforo di veto doppia esecuzione entro 30 sec
DateTime lastExecAlarms = DateTime.Now.AddHours(-1);
// registro gestione eventi
alarmsValPipe.EA_NewMessage += AlarmsValPipe_EA_NewMessage;
@@ -93,6 +95,8 @@ ParamsManager paramMan = new ParamsManager();
// inizializzo gestione messagePipe da Redis x allarmi
MessagePipe paramsPipe = new MessagePipe(redisConn, Constants.PARAMS_M_QUEUE);
MessagePipe paramsValPipe = new MessagePipe(redisConn, Constants.PARAMS_ACT_QUEUE);
// datetime dell'inizio esecuzione task... x usare un semaforo di veto doppia esecuzione entro 30 sec
DateTime lastExecParams = DateTime.Now.AddHours(-1);
// registro gestione eventi
paramsValPipe.EA_NewMessage += ParamsValPipe_EA_NewMessage;
@@ -138,6 +142,7 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
// conversione on-the-fly List<string> --> allarmi
if (!string.IsNullOrEmpty(currArgs.newMessage))
{
DateTime adesso = DateTime.Now;
try
{
// verifico codici allarmi ricevuti
@@ -181,7 +186,7 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
AlarmLogModel newAlarm = new AlarmLogModel()
{
MachineId = MachineId,
DtRif = DateTime.Now,
DtRif = adesso,
MemAddress = bankVal.Key,
Index = alarmData != null ? alarmData.index : 0,
Status = alarmData != null ? (uint)bankVal.Value & alarmData.silenceMask[0] & alarmData.disableMask[0] : (uint)bankVal.Value,
@@ -200,10 +205,15 @@ void AlarmsValPipe_EA_NewMessage(object? sender, EventArgs e)
serAlarms = JsonConvert.SerializeObject(activeAlarmList);
// invio sulla message pipeline corretta TUTTI gli allarmi serializzati
alarmsPipe.saveAndSendMessage(Constants.ALARM_CURR_KEY, serAlarms);
if (dbController != null)
// verifico NON ci sia veto di scrittura... 60 sec...
if (adesso.Subtract(lastExecAlarms).TotalSeconds > 60)
{
// salvo sul DB
_ = dbController.AlarmLogInsertMany(alarmLogList).Result;
lastExecAlarms = adesso;
if (dbController != null)
{
// salvo sul DB
_ = dbController.AlarmLogInsertMany(alarmLogList).Result;
}
}
}
}
@@ -222,6 +232,7 @@ void ParamsValPipe_EA_NewMessage(object? sender, EventArgs e)
// conversione on-the-fly Dictionary<string,int> --> parametri valorizzati (tra quelli configurati)
if (!string.IsNullOrEmpty(currArgs.newMessage))
{
DateTime adesso = DateTime.Now;
try
{
// verifico codici ricevuti
@@ -251,14 +262,19 @@ void ParamsValPipe_EA_NewMessage(object? sender, EventArgs e)
updatedParams.Add(currParam);
}
}
if (dbController != null)
// verifico NON ci sia veto di scrittura... 60 sec...
if (adesso.Subtract(lastExecParams).TotalSeconds > 60)
{
// verifico x ogni parametro se sia completato il periodo di campionamento...
var params2save = paramMan.processData(paramsList, redisParamConf);
if (params2save.Count > 0)
lastExecParams = adesso;
if (dbController != null)
{
// salvo sul DB
_ = dbController.DataLogInsertMany(params2save).Result;
// verifico x ogni parametro se sia completato il periodo di campionamento...
var params2save = paramMan.processData(paramsList, redisParamConf);
if (params2save.Count > 0)
{
// salvo sul DB
_ = dbController.DataLogInsertMany(params2save).Result;
}
}
}
}
MP.MONO.UI/Properties/PublishProfiles/IIS01.pubxml.user
+1 -1
View File
@@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt
<PropertyGroup>
<TimeStampOfAssociatedLegacyPublishXmlFile />
<EncryptedPassword>AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAARwa+h3SucUCk0+IZCHMQsgAAAAACAAAAAAADZgAAwAAAABAAAADOPMd3758qI/y/dA1hJlk6AAAAAASAAACgAAAAEAAAALjI1Q4A+Na1SHTbn2iY4kQYAAAA+8wgMcZ+vEOXhrpk/ei4H4gSz/lppCy4FAAAADEgX6TTl06NoYYCkrCN2gRN2gDO</EncryptedPassword>
<History>True|2022-03-18T07:13:40.4364579Z;True|2022-03-10T18:22:15.7066492+01:00;</History>
<History>True|2022-04-28T15:36:51.0633358Z;False|2022-04-28T17:36:18.9884778+02:00;True|2022-03-18T08:13:40.4364579+01:00;True|2022-03-10T18:22:15.7066492+01:00;</History>
</PropertyGroup>
</Project>
Resources/ChangeLog-original.html
+26
View File
@@ -0,0 +1,26 @@
<body>
<i>MAPO-MONO</i>
<h4>Version: {{CURRENT-REL}}</h4>
<br /> Release Note:
<ul>
<li>
<b>Last changes:</b>
<ul>{{LAST-CHANGES}}</ul>
</li>
<li>
<b>v.6.* &rarr;</b>
<ul>
<li>Current CORE version</li>
<li>Release dotnet6</li>
</ul>
</li>
</ul>
<div>
<div style="float: left;">
<img src="logoSteamware.png" />
</div>
<div style="float: right;">
<a href="https://www.steamware.net/MAPO" target="_blank">&copy; Egalware 2006-2022</a>
</div>
</div>
</body>
Resources/ChangeLog.html
+27
View File
@@ -0,0 +1,27 @@
<body>
<i>GPW - Gestione Presenze Web</i>
<h4>Versione: 3.0.2201.2614</h4>
<br /> Note di rilascio:
<ul>
<li>
<b>Ultime modifiche:</b>
<ul>{{LAST-CHANGES}}</ul>
</li>
<li>
<b>v.3.* &rarr;</b>
<ul>
<li>Versione CORE per UI commesse</li>
<li>Release dotnet6</li>
<li>Integrazione EFCore</li>
</ul>
</li>
</ul>
<div>
<div style="float: left;">
<img src="logoSteamware.png" />
</div>
<div style="float: right;">
<a href="https://www.steamware.net/GPW" target="_blank">&copy; Egalware 2006-2022</a>
</div>
</div>
</body>
Resources/VersNum.txt
+1
View File
@@ -0,0 +1 @@
3.0.2201.2614
Resources/logoSteamware.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 3.3 KiB

Resources/manifest-original.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>1.0.0.0</version>
<url>http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>
Resources/manifest.xml
+7
View File
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<item>
<version>3.0.2201.2614</version>
<url>http://nexus.steamware.net/repository/SWS/MAPO-MONO/stable/0/MAPO-MONO.UI.zip</url>
<changelog>http://nexus.steamware.net/repository/SWS/MAPO-MONO/stable/0/ChangeLog.html</changelog>
<mandatory>false</mandatory>
</item>