From 79a7ab6069d2894f8b8c9f99f00dc83ae42f9e74 Mon Sep 17 00:00:00 2001
From: hanqiangqiang <1364346467@qq.com>
Date: Thu, 29 Feb 2024 15:30:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=9C=A8=E7=BA=BF=E7=9B=91?=
 =?UTF-8?q?=E6=8E=A7=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Common/MultiProcess/MultiProcessManager.cs    |  8 ++++----
 .../MultiProcess/ProcessData/PMProcessData.cs     | 15 +--------------
 .../ProcessData/PMProcessStateManager.cs          |  3 +--
 3 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/MultiProcessManager.cs b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/MultiProcessManager.cs
index 52dae2d..15a7002 100644
--- a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/MultiProcessManager.cs
+++ b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/MultiProcessManager.cs
@@ -70,22 +70,22 @@ namespace MECF.Framework.Common.MultiProcess
             {
                 if (IsClientTimeOut(item.HeartBeatTime))
                 {
-                    if (item.OffLineNum > Min_OffLine_Num + 1)
+                    if (item.OffLineNum >= Min_OffLine_Num + 1)
                     {
                         return true;
                     }
                     if (item.OffLineNum > Min_OffLine_Num)
                     {
                         item.IsOnline = false;
-                        LOG.Write($"{item.SicMachineID} is offline over {Min_OffLine_Num} number of times ");
+                        LOG.Write($"{item.SicMachineID} is offline over {item.OffLineNum} number of times ");
                     }
                     item.OffLineNum++;
+                    LOG.Write($"{item.SicMachineID} is offline over {item.OffLineNum} number of times ");
                 }
                 else
                 {
+                    item.IsOnline = true;
                     item.OffLineNum = 0;
-                    if (item.TrTrigOnline.Q)
-                        LOG.Write($"{item.SicMachineID} is online");
                 }
             }
             return true;
diff --git a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessData.cs b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessData.cs
index 2888990..9272feb 100644
--- a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessData.cs
+++ b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessData.cs
@@ -11,21 +11,8 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter
         /// </summary>
         public string SicMachineName { get; set; }
 
-        private bool _isOnline = true;
+        public bool IsOnline { get; set; }
 
-        public bool IsOnline
-        {
-            get => _isOnline;
-            set
-            {
-                _isOnline = value;
-                TrTrigOnline.CLK = value;
-                if (!value)
-                    TrTrigOnline.RST = true;
-            }
-        }
-
-        public R_TRIG TrTrigOnline = new();
 
         public int OffLineNum { get; set; }
 
diff --git a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessStateManager.cs b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessStateManager.cs
index 47a65c1..46de950 100644
--- a/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessStateManager.cs
+++ b/MECF.Framework.Common/MECF/Framework/Common/MultiProcess/ProcessData/PMProcessStateManager.cs
@@ -77,8 +77,7 @@ namespace MECF.Framework.Common.MultiProcess.ProcessCenter
                 {
                     if (pmProcessDataList[i].PmState == pmProcessDataNew.PmState) //状态无变化时，刷新心跳数据然后退出
                     {
-                        pmProcessDataList[i].IsOnline = true;
-                        pmProcessDataList[i].OffLineNum = 0;
+                        pmProcessDataList[i].StateChangeTime = pmProcessDataNew.StateChangeTime;
                         pmProcessDataList[i].HeartBeatTime = pmProcessDataNew.HeartBeatTime;
                         return true;
                     }