From 66da0f6808fa8496a3216c94973a552389ab96ba Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 13:27:25 +0800
Subject: [PATCH] 解决冲突

---
 Admin.NET/WCS.Application/PLC/PLCTaskAction.cs |   76 ++++++++++++++++++++++++++++++++++++-
 1 files changed, 73 insertions(+), 3 deletions(-)

diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 63086d6..ffa4e97 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -1,16 +1,31 @@
-锘縰sing Furion.Logging;
+锘縰sing Admin.NET.Core.Service;
+using Furion.Logging;
 using Microsoft.AspNetCore.SignalR;
 
 namespace WCS.Application;
 public static class PLCTaskAction
 {
+    //鏈嶅姟杩愯鐘舵��
+    public static bool boRunningState = false;
+    //鑴辨満妯″紡
+    public static bool boOffline = false;
+    //鑷埛鏂�
+    public static bool boRefresh = false;
+
     private static readonly ISqlSugarClient _db = SqlSugarSetup.ITenant.GetConnectionScope(SqlSugarConst.MainConfigId);
+    private static readonly SysCacheService sysCacheService = App.GetRequiredService<SysCacheService>();
+    private static readonly IHubContext<PlcHub, IPlcHub> _plcHubContext;
 
     private static List<WcsPlc> listPlc;
     private static List<WcsDevice> listPlcDevice;
     private static List<WcsPosition> listPlcStation;
 
     private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
+    //瀵瑰鍏竷杩炴帴鐘舵��
+    public static List<PLCUtil> listPlcConn
+    {
+        get { return listPlcUtil; }
+    }
     private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
 
     public static event EventHandler DeviceValueChangeEvent;
@@ -31,7 +46,7 @@
         if (listPlcUtil.Count != 0)
         {
             cts.Cancel();
-            listPlc = _db.Queryable<WcsPlc>().ToList();
+            listPlc = _db.Queryable<WcsPlc>().Where(s => s.Type == PLCTypeEnum.StackingMachine || s.Type == PLCTypeEnum.ConveyorLine || s.Type == PLCTypeEnum.BoxConveyorLine).ToList();
             listPlcDevice = _db.Queryable<WcsDevice>().ToList();
             listPlcStation = _db.Queryable<WcsPosition>().ToList();
             //绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
@@ -48,6 +63,7 @@
             listPlcUtil.Add(plc);
         }
         cts = new CancellationTokenSource();
+        boRunningState = true;
         StartRead();
     }
     /// <summary>
@@ -73,7 +89,7 @@
                     }
                     try
                     {
-                        var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
+                        var modPlcUtil = listPlcUtil.FirstOrDefault(s => s != null && s.PlcId == modPlc.Id);
                         if (modPlcUtil == null)
                         {
                             modPlcUtil = new PLCUtil(modPlc);
@@ -121,11 +137,65 @@
             }, cts.Token);
         }
     }
+
+    /// <summary>
+    /// 杩炴帴鐘舵�佺嚎绋�
+    /// </summary>
+    public static void ConnectionStatus()
+    {
+        Task.Run(() =>
+        {
+            try
+            {
+                //鍙栨秷绾跨▼ 鍏抽棴PLC杩炴帴
+                if (cts.Token.IsCancellationRequested)
+                {
+                    foreach (var modPlcUtil in listPlcUtil)
+                    {
+                        modPlcUtil.Close();
+                    }
+                    throw new OperationCanceledException();
+                }
+                //鑾峰彇姣忎釜PLC杩炴帴鐘舵��
+                foreach (var modPlc in listPlc)
+                {
+                    var modPlcUtil = listPlcUtil.FirstOrDefault(s => s.PlcId == modPlc.Id);
+                    if (modPlcUtil == null)
+                        modPlc.IsConn = false;
+                    else
+                        modPlc.IsConn = modPlcUtil.Connected;
+                    if (sysCacheService.ExistKey("PLCCONN" + modPlc.Id))
+                    {
+                        var cachePlc = sysCacheService.Get<WcsPlc>("PLCCONN" + modPlc.Id);
+                        if (cachePlc.IsConn != modPlc.IsConn)
+                        {
+                            //杩炴帴鐘舵�佸彉鏇� 閫氱煡鍓嶇
+                            _plcHubContext.Clients.All.PublicPlcConn(modPlc);
+                        }
+                    }
+                    sysCacheService.Set("PLCCONN" + modPlc.Id, modPlc);
+                }
+                Thread.Sleep(3000);
+            }
+            catch (OperationCanceledException)
+            {
+                sysCacheService.RemoveByPrefixKey("PLCCONN");
+                Console.WriteLine("涓绾跨▼");
+            }
+            catch (Exception ex)
+            {
+                Log.Error(ex.Message, ex);
+            }
+
+        });
+
+    }
     /// <summary>
     /// 鍋滄鏈嶅姟
     /// </summary>
     public static void Stop()
     {
         cts.Cancel();
+        boRunningState = false;
     }
 }
\ No newline at end of file

--
Gitblit v1.8.0