From d9e59ed2e947aff29b7c21a9b0e8b6e12d741692 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期五, 30 八月 2024 14:54:18 +0800
Subject: [PATCH] 解决冲突
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 64 +++++++++++++++++++++++++++++++-
1 files changed, 62 insertions(+), 2 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index facc754..5907b0e 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -1,4 +1,5 @@
-锘縰sing Furion.Logging;
+锘縰sing Admin.NET.Core.Service;
+using Furion.Logging;
using Microsoft.AspNetCore.SignalR;
namespace WCS.Application;
@@ -6,8 +7,14 @@
{
//鏈嶅姟杩愯鐘舵��
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 = App.GetService<IHubContext<PlcHub, IPlcHub>>();
private static List<WcsPlc> listPlc;
private static List<WcsDevice> listPlcDevice;
@@ -34,7 +41,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();
//绛夊緟鍑犵閽燂紝鎶婂凡鏈夌嚎绋嬪彇娑堟帀鍐嶈繛鎺�
@@ -125,6 +132,59 @@
}, 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>
--
Gitblit v1.8.0