From c56d28d684cee010f291295dbe851bab64c1b6a6 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期二, 03 九月 2024 09:52:22 +0800
Subject: [PATCH] 设备监控绑定plc数据
---
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 23 +++++++++++++++--------
1 files changed, 15 insertions(+), 8 deletions(-)
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index 47c28e2..2d1116b 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -14,15 +14,19 @@
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 readonly IHubContext<PlcHub, IPlcHub> _plcHubContext = App.GetService<IHubContext<PlcHub, IPlcHub>>();
private static List<WcsPlc> listPlc;
private static List<WcsDevice> listPlcDevice;
private static List<WcsPosition> listPlcStation;
private static List<PLCUtil> listPlcUtil = new List<PLCUtil>();
- private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
-
+ private static CancellationTokenSource cts = new CancellationTokenSource();//鍙栨秷绾跨▼鏍囪瘑
+ //瀵瑰鍏竷杩炴帴鐘舵��
+ public static List<PLCUtil> listPlcConn
+ {
+ get { return listPlcUtil; }
+ }
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
@@ -60,6 +64,7 @@
cts = new CancellationTokenSource();
boRunningState = true;
StartRead();
+ ConnectionStatus();
}
/// <summary>
/// 寮�鍚鍙杙lc绾跨▼
@@ -78,19 +83,21 @@
{
foreach (var modPlcUtil in listPlcUtil)
{
- modPlcUtil.Close();
+ if (modPlcUtil != null && modPlcUtil.Connected)
+ modPlcUtil.Close();
}
+ break;
throw new OperationCanceledException();
}
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);
listPlcUtil.Add(modPlcUtil);
}
- var listDevice = listPlcDevice.Where(s => s.PlcId == _modplc.Id).ToList();
+ var listDevice = listPlcDevice.Where(s => s.PlcId == _modplc.Id && s.DeviceType == DeviceTypeEnum.Business).ToList();
//寰幆璇昏澶�
foreach (var modDevice in listDevice.Where(s => s.Level == DeviceLevelEnum.DB))
{
@@ -105,9 +112,9 @@
dto.Type = _modplc.Type;
dto.PLCUtil = modPlcUtil;
dto.listStation = listPlcStation.Where(s => s.DeviceId == modDevice.Id).ToList();
- dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum).ToList();
+ dto.listDevice = listDevice.Where(s => s.StationNum == modDevice.StationNum && s.Level == DeviceLevelEnum.Station).ToList();
//杩欓噷瑙﹀彂鍊煎彉鏇翠簨浠�
- DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
+ //DeviceValueChangeEvent?.Invoke(dto, EventArgs.Empty);
}
else
{
--
Gitblit v1.8.0