From 65888b1fcd458d9fd741031c8c020e3563793f00 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 24 Mar 2022 19:48:07 +0100 Subject: [PATCH 1/4] Modifica DECODER x evitare (si spera) scritture vuote dei parametri... --- MP.MONO.DECODER/Program.cs | 36 ++++++++++++++++++++++++++---------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/MP.MONO.DECODER/Program.cs b/MP.MONO.DECODER/Program.cs index c206540..1227399 100644 --- a/MP.MONO.DECODER/Program.cs +++ b/MP.MONO.DECODER/Program.cs @@ -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 --> 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 --> 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; + } } } } From b9a69a55d27962e2e86b433c8682dd840c29d980 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 28 Apr 2022 17:35:15 +0200 Subject: [PATCH 2/4] Add resource folder --- Resources/ChangeLog-original.html | 27 +++++++++++++++++++++++++++ Resources/ChangeLog.html | 27 +++++++++++++++++++++++++++ Resources/VersNum.txt | 1 + Resources/logoSteamware.png | Bin 0 -> 3402 bytes Resources/manifest-original.xml | 7 +++++++ Resources/manifest.xml | 7 +++++++ 6 files changed, 69 insertions(+) create mode 100644 Resources/ChangeLog-original.html create mode 100644 Resources/ChangeLog.html create mode 100644 Resources/VersNum.txt create mode 100644 Resources/logoSteamware.png create mode 100644 Resources/manifest-original.xml create mode 100644 Resources/manifest.xml diff --git a/Resources/ChangeLog-original.html b/Resources/ChangeLog-original.html new file mode 100644 index 0000000..2929577 --- /dev/null +++ b/Resources/ChangeLog-original.html @@ -0,0 +1,27 @@ + + GPW - Gestione Presenze Web +

Versione: {{CURRENT-REL}}

+
Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
    • +
  • + v.3.* → +
      +
    • Versione CORE per UI commesse
      • +
    • Release dotnet6
      • +
    • Integrazione EFCore
      • +
    +
    • +
+
+
+ +
+ +
+ \ No newline at end of file diff --git a/Resources/ChangeLog.html b/Resources/ChangeLog.html new file mode 100644 index 0000000..e64278e --- /dev/null +++ b/Resources/ChangeLog.html @@ -0,0 +1,27 @@ + + GPW - Gestione Presenze Web +

Versione: 3.0.2201.2614

+
Note di rilascio: +
    +
  • + Ultime modifiche: +
      {{LAST-CHANGES}}
    +
    • +
  • + v.3.* → +
      +
    • Versione CORE per UI commesse
      • +
    • Release dotnet6
      • +
    • Integrazione EFCore
      • +
    +
    • +
+
+
+ +
+ +
+ diff --git a/Resources/VersNum.txt b/Resources/VersNum.txt new file mode 100644 index 0000000..95b5616 --- /dev/null +++ b/Resources/VersNum.txt @@ -0,0 +1 @@ +3.0.2201.2614 diff --git a/Resources/logoSteamware.png b/Resources/logoSteamware.png new file mode 100644 index 0000000000000000000000000000000000000000..0958b50a1ee7f6a934e26cf55e2335d4cea6aa82 GIT binary patch literal 3402 zcmV-Q4Yl%#P)Kpl00004XF*Lt006O% z3;baP00009a7bBm000ia000ia0czHX2><{98FWQhbW?9;ba!ELWdKlNX>N2bPDNB8 zb~7$DE;85dX+r=2497`CK~#8N?VEXYRMi>4lgUh$nd~9N?8#&%lgvKZ7a%JLgb=8< zJ+;y z?+!1~Kq%Ee{3ChaIrqG~eD}UL@B6*)`|g{Wuy0Bd19D`vPgk>EW=B z{upI=m_+%c`RJTNcSmx!oT+rHqRMcI3&>_bIUd#}ol(j`U6)j)3=b3Z<}?0@#w%?H z#_YW32Q(?Y!Ej|*6;;kkq)##e$!CL50nS0aZ)B+OVzHEO83M9f=aaHy{L*~p*BJb= z3YIEgNJ6(98R3HyIED%LNjMf>C*1JAO!fMiKO#~X!rN)hNTWX{LH_1E-X zIXbg97@xsWQBh^AOV-+8RFqe;>b(6{z|ad11Te>h=K`|cc)ygasGgOM{&1aFY5~S= zK)yfDTZW1Jo%2 z6=gF<&*Yd!aZn6GFSSS3qL-2okYmC+B@YnpB7t8GSZM%S8snD}Lks>7AulTh+BaD9 zDD(S)^XmL{vQ`;ZWi$yPuarFNC5+uinH%GiV*%!m)b|3|yd=LIF^;ea6ger~a#Td8 z6iFU7MempFF>sk?yS5Rm+gP-v$9GGl8Zy;3$FXBH&{ z&Y+OHrA7JVP7ziKn{VOeTrocB2G%?|2o?Q-#DJ8fOi^Vt%lIBygSToVq}_}+DgY1z z06YQ+$AId7U@`&AE5Owe>zBqU(}oH9<>^^)K|`P$how5o<%?;;mO_vDm@|3810uX!=sgjb@rQ6#lTPR?EzbO2Q=Ugslnp{IfBf?iASlW##s>=HMm z_nx08jT5gU0+LQ?sxlS@FZCD+_J5MPJl)`hgMRZ-;&(feibi-X1FLr(LCV8}Bi1mtf6&8A47ya>P|MPG8aY{omi9v_fra?E19 zf;sA2a#e;)YL6T@zE>`f^_|_l4GJEr1MhVPkFs~z0VPJVk=?)3GRU>`R0oUC0UU}%9ldiM>yf1^xJ*AP3Vq3Y*Qq*4Ra<42h z7cO+!9Ud_@p{hnx;&i7L8ViR12vC*LDZrF~Hwxubz_m{44oT7aV0cfBRJSE3bY<-UYc_C$0M!9rK;UwO9hJZYm9BJ70 zpB>?J%0^%lzw|6ty3dmp_udy#Y_>daDKH%>GMV#=&4p1Ohcl(r?J*P|lL+nY$!yQtiZu>Wa!lK(^u~Z8eouaYDCcT8qB9p)tFuz9FZv zu0E9e(M}cZDNW63*Up`%nK5m8?4V9lUA^Jb<|(?$vhpk*1iLxk=qPo0jHT|9p=+z3 zRA=BCj24sGQIMPG;B$mLFxMOHb~sI9PGxCX&dk=C7yO!QOv=O;2gIv`%_66woC2)7 zVlMF8^55LIA`+N3b2Iniu@W)((92E?pNrS}Gh-((!27_prOZ>Rt)Dn4#%*^jX6#kQ zb^ymK=*|H|9YBTy<^z@j^ESq|7aC1Ftc8|GSa-ZwlfG*xn<#Gr-9K34MXRM~Dc8_T z-%k48Wd7rByE6}fE2wW|?C(yi?I%;3Cr5D&t3;bMpQx>>NpsrlSD^D6eShPcCUYHk zvZgrqZmxL`^*7MHt*X2tp7Xf5)(+9fdG;{g2Y^jHEUCc!2oK0EF^BeR=-%vcx<>qO z<(QNSFC7to(|TEf>LgGt{qp;&bH!e4UBu1&n42Bo32rGaw1hkhPrspV!o)e;V2QrR zn(7*+;R&=D_&QU*aUb*MRhL&5VW>MW(qRldQOx71p8;U?lWJ~EE}xE?Fe-NpI#(%wROhqX>qj?mwhmzCXyZcx!birzuImX+hvO5cY9Ec8!M zP6Fdq&5h0KHwuHoPOp)j-x`fqS`izN%}V!(!p%$J#{QHWxsUPzPwHcUQzXU+FD{IA z(3F?ANVEwN3Fxi^hSeo*Pa5qc#%t-@NBC-QZJ7}ch+2S10s=Fj%wRo{tF?>y0xHU< zqAmnjS{Oe#p{hCr-Nf37(HQtWpz}_su8C&+Nnvo--_DwCtRtZKoa1p|zmo9{Vw^R4 zN?h(Ft|uS3r&7MhoE7LDQS@*8GE`jKN_0x?Mb>&?;`8Mn1L)iMEOpfTgbtt4Us+b6 zdMhEGjX_PkPfkzoku&TYga21BgCPO(1ozl-i^ z=A2~Rw`dFRCgzGcTPUIYZcK~#u8+`n8#}|@c&R?>*F|+nQOfW|g&f0xVV>b;?kB{h zoeLE={St2aRt&J2oZ~9OTLoUtgi$j%>aB%ERm?jKY)hOrTP`{d#zg+|wV)!5S~0l9 zIgg^ZhvNX(^AN{RX}?Vop=tmRRS#qp)Pt0hoWGOy?bHu*jtfFXJ~oT>LlE)VKHzh0 zq;D0UnmAVth`T7al2WV5Y;mw8qPK@|APxkMD<|&M@ z8LwrnsjSY&Q}qGLRzhhzV=Jf&PqSE@@2f&pT~VQB?Yq%CB@E9wH~&j|;>9CSBvE}{Dwz^d_n(7;c zr?rXe;u^djhg0Nr&vNd?^jWggGpwxLF6LF0S2l$fN6?8vrp9kk&HU@PK gb@ksMRAFKN1+dqwbM3SFTL1t607*qoM6N<$g3&)|djJ3c literal 0 HcmV?d00001 diff --git a/Resources/manifest-original.xml b/Resources/manifest-original.xml new file mode 100644 index 0000000..a9269ca --- /dev/null +++ b/Resources/manifest-original.xml @@ -0,0 +1,7 @@ + + + 1.0.0.0 + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/{{PACKNAME}}.zip + http://nexus.steamware.net/repository/SWS/{{DIRNAME}}/{{BRANCHNAME}}/ChangeLog.html + false + diff --git a/Resources/manifest.xml b/Resources/manifest.xml new file mode 100644 index 0000000..262d619 --- /dev/null +++ b/Resources/manifest.xml @@ -0,0 +1,7 @@ + + + 3.0.2201.2614 + http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip + http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html + false + From 3b410f390874d54f0c0c3b189718f1b240894d39 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 28 Apr 2022 17:37:13 +0200 Subject: [PATCH 3/4] Refresh iis01 pubxml --- MP.MONO.ALL.sln | 10 ++++++++++ .../Properties/PublishProfiles/IIS01.pubxml.user | 2 +- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/MP.MONO.ALL.sln b/MP.MONO.ALL.sln index 3a89628..81549ad 100644 --- a/MP.MONO.ALL.sln +++ b/MP.MONO.ALL.sln @@ -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 diff --git a/MP.MONO.UI/Properties/PublishProfiles/IIS01.pubxml.user b/MP.MONO.UI/Properties/PublishProfiles/IIS01.pubxml.user index 257fe28..96459c2 100644 --- a/MP.MONO.UI/Properties/PublishProfiles/IIS01.pubxml.user +++ b/MP.MONO.UI/Properties/PublishProfiles/IIS01.pubxml.user @@ -7,6 +7,6 @@ by editing this MSBuild file. In order to learn more about this please visit htt AQAAANCMnd8BFdERjHoAwE/Cl+sBAAAARwa+h3SucUCk0+IZCHMQsgAAAAACAAAAAAADZgAAwAAAABAAAADOPMd3758qI/y/dA1hJlk6AAAAAASAAACgAAAAEAAAALjI1Q4A+Na1SHTbn2iY4kQYAAAA+8wgMcZ+vEOXhrpk/ei4H4gSz/lppCy4FAAAADEgX6TTl06NoYYCkrCN2gRN2gDO - True|2022-03-18T07:13:40.4364579Z;True|2022-03-10T18:22:15.7066492+01:00; + 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; \ No newline at end of file From abceb4e187c151bd34334abfbeba12d585083316 Mon Sep 17 00:00:00 2001 From: Samuele Locatelli Date: Thu, 28 Apr 2022 17:40:01 +0200 Subject: [PATCH 4/4] Refresh changelog and manifest --- Resources/ChangeLog-original.html | 15 +++++++-------- Resources/manifest.xml | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/Resources/ChangeLog-original.html b/Resources/ChangeLog-original.html index 2929577..a523da2 100644 --- a/Resources/ChangeLog-original.html +++ b/Resources/ChangeLog-original.html @@ -1,18 +1,17 @@ - GPW - Gestione Presenze Web -

Versione: {{CURRENT-REL}}

-
Note di rilascio: + MAPO-MONO +

Version: {{CURRENT-REL}}

+
Release Note:
  • - Ultime modifiche: + Last changes:
      {{LAST-CHANGES}}
  • - v.3.* → + v.6.* →
      -
    • Versione CORE per UI commesse
      • +
    • Current CORE version
    • Release dotnet6
      • -
    • Integrazione EFCore
@@ -21,7 +20,7 @@ \ No newline at end of file diff --git a/Resources/manifest.xml b/Resources/manifest.xml index 262d619..81edf87 100644 --- a/Resources/manifest.xml +++ b/Resources/manifest.xml @@ -1,7 +1,7 @@ 3.0.2201.2614 - http://nexus.steamware.net/repository/SWS/GWMS/stable/0/GWMS.UI.zip - http://nexus.steamware.net/repository/SWS/GWMS/stable/0/ChangeLog.html + http://nexus.steamware.net/repository/SWS/MAPO-MONO/stable/0/MAPO-MONO.UI.zip + http://nexus.steamware.net/repository/SWS/MAPO-MONO/stable/0/ChangeLog.html false