From 236c1f5be1596d5fce6310b453e1b342eab59fef Mon Sep 17 00:00:00 2001 From: Emmanuele Sassi Date: Thu, 29 Jan 2026 10:25:23 +0100 Subject: [PATCH] - aggiunto parametro FreeOrWaitingAnswerProcesses - cambiato formato tempo di esecuzione in statistiche - gestita risposta SubMode 4 in Rest --- EgwMultiEngineManager.Core/ExecProcessManager.vb | 6 ++++++ EgwMultiEngineManager.Core/My Project/AssemblyInfo.vb | 4 ++-- .../EgwMultiEngineManager.Data.vbproj | 6 +++--- EgwMultiEngineManager.Tray/Application.xaml.vb | 2 +- .../EgwMultiEngineManager.Tray.vbproj | 8 ++++---- EgwMultiEngineManager.Tray/My Project/AssemblyInfo.vb | 4 ++-- EgwMultiEngineManager.Tray/Utility/EnvironmentManager.vb | 2 ++ EgwMultiEngineManager.Tray/packages.config | 2 +- 8 files changed, 21 insertions(+), 13 deletions(-) diff --git a/EgwMultiEngineManager.Core/ExecProcessManager.vb b/EgwMultiEngineManager.Core/ExecProcessManager.vb index 2ea8846..3a3afa2 100644 --- a/EgwMultiEngineManager.Core/ExecProcessManager.vb +++ b/EgwMultiEngineManager.Core/ExecProcessManager.vb @@ -134,6 +134,12 @@ Public Class ExecProcessManager End Get End Property + Public ReadOnly Property nFreeOrWaitingAnswerProcesses As Integer + Get + Return ThreadDataList.Count(Function(x) x IsNot Nothing AndAlso (x.ProcessStatus = ThreadData.ProcessStatuses.NULL OrElse x.ProcessStatus = ThreadData.ProcessStatuses.ANSWERRECEIVED)) + End Get + End Property + Private PerMinResultQueueLock As New Object Private m_PerMinResultQueue As New Queue(Of Integer) Public ReadOnly Property PerMinResultQueue As Queue(Of Integer) diff --git a/EgwMultiEngineManager.Core/My Project/AssemblyInfo.vb b/EgwMultiEngineManager.Core/My Project/AssemblyInfo.vb index ac9375b..f413368 100644 --- a/EgwMultiEngineManager.Core/My Project/AssemblyInfo.vb +++ b/EgwMultiEngineManager.Core/My Project/AssemblyInfo.vb @@ -28,5 +28,5 @@ Imports System.Runtime.InteropServices ' Revision ' - - + + diff --git a/EgwMultiEngineManager.Data/EgwMultiEngineManager.Data.vbproj b/EgwMultiEngineManager.Data/EgwMultiEngineManager.Data.vbproj index 91a0adf..7dcd48c 100644 --- a/EgwMultiEngineManager.Data/EgwMultiEngineManager.Data.vbproj +++ b/EgwMultiEngineManager.Data/EgwMultiEngineManager.Data.vbproj @@ -5,10 +5,10 @@ netstandard2.0 My Project\app.manifest Copyright © 2020-2025 by Egalware s.r.l. - 3.1.1.1 - 3.1.1.1 + 3.1.1.2 + 3.1.1.2 Egalware s.r.l. - 3.1.1.1 + 3.1.1.2 Emmanuele Sassi Specifiche comunicazione con EgwMultiEngineManager diff --git a/EgwMultiEngineManager.Tray/Application.xaml.vb b/EgwMultiEngineManager.Tray/Application.xaml.vb index 90b54cb..8b9a1b5 100644 --- a/EgwMultiEngineManager.Tray/Application.xaml.vb +++ b/EgwMultiEngineManager.Tray/Application.xaml.vb @@ -125,7 +125,7 @@ Class Application sTooltip &= If(nGroupType = EnvironmentCommunicationTypes.REST, "R", "G") & nGroupIndex.ToString() & CurrStatistics.nEngineRunningQty & CurrStatistics.nEngineProcessingQty & - CurrStatistics.dMidProcessingTime.ToString("N1") & + (CurrStatistics.dMidProcessingTime / 1000).ToString("N1") & CurrStatistics.nQuestionInQueue & CurrStatistics.nLastMinAnswer & CurrStatistics.nLast5MinAnswer & diff --git a/EgwMultiEngineManager.Tray/EgwMultiEngineManager.Tray.vbproj b/EgwMultiEngineManager.Tray/EgwMultiEngineManager.Tray.vbproj index 18ad4c6..cf48107 100644 --- a/EgwMultiEngineManager.Tray/EgwMultiEngineManager.Tray.vbproj +++ b/EgwMultiEngineManager.Tray/EgwMultiEngineManager.Tray.vbproj @@ -66,8 +66,8 @@ true - - ..\packages\EgtDotNETBasis.2.7.11.20\lib\EgtDotNETBasis.dll + + ..\packages\EgtDotNETBasis.3.1.1.3\lib\EgtDotNETBasis.dll ..\..\EgwWPFBaseLib\EgwWPFBaseLib\bin\Debug\EgwWPFBaseLib.dll @@ -247,10 +247,10 @@ This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + powershell.exe -ExecutionPolicy Unrestricted -NoProfile -NonInteractive -File $(ProjectDir)\post-build.ps1 $(ConfigurationName) $(TargetDir) $(TargetPath) - + \ No newline at end of file diff --git a/EgwMultiEngineManager.Tray/My Project/AssemblyInfo.vb b/EgwMultiEngineManager.Tray/My Project/AssemblyInfo.vb index 76383d9..945f16d 100644 --- a/EgwMultiEngineManager.Tray/My Project/AssemblyInfo.vb +++ b/EgwMultiEngineManager.Tray/My Project/AssemblyInfo.vb @@ -52,5 +52,5 @@ Imports System.Windows ' Revision ' - - + + diff --git a/EgwMultiEngineManager.Tray/Utility/EnvironmentManager.vb b/EgwMultiEngineManager.Tray/Utility/EnvironmentManager.vb index 807008f..13c82b6 100644 --- a/EgwMultiEngineManager.Tray/Utility/EnvironmentManager.vb +++ b/EgwMultiEngineManager.Tray/Utility/EnvironmentManager.vb @@ -296,6 +296,8 @@ Public Class ExecEnvironmentManager request = New RestRequest("Prod/jobreturn", Method.Post) Case 3 request = New RestRequest("Prod/jobreturn", Method.Post) + Case 4 + request = New RestRequest("Prod/jobreturn", Method.Post) End Select End Select 'request.AddBody(JsonConvert.SerializeObject(Answer)) diff --git a/EgwMultiEngineManager.Tray/packages.config b/EgwMultiEngineManager.Tray/packages.config index 3cb879f..36e4df7 100644 --- a/EgwMultiEngineManager.Tray/packages.config +++ b/EgwMultiEngineManager.Tray/packages.config @@ -1,6 +1,6 @@  - +