From a5208ef5d279034389d60886b3897081437fd942 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期一, 02 九月 2024 14:12:38 +0800
Subject: [PATCH] `
---
Admin.NET/WCS.Application/Hub/IPlcHub.cs | 7 +++++++
Admin.NET/WCS.Application/PLC/PLCTaskAction.cs | 5 ++---
2 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Hub/IPlcHub.cs b/Admin.NET/WCS.Application/Hub/IPlcHub.cs
index f55c14a..a026a67 100644
--- a/Admin.NET/WCS.Application/Hub/IPlcHub.cs
+++ b/Admin.NET/WCS.Application/Hub/IPlcHub.cs
@@ -21,5 +21,12 @@
/// <param name="context"></param>
/// <returns></returns>
//Task PublicStationStatus(List<WcsDevice> context);
+
+ /// <summary>
+ /// 涓嬪彂鎶ヨ淇℃伅
+ /// </summary>
+ /// <param name="context"></param>
+ /// <returns></returns>
+ Task PublicAlarm(WcsAlarmInfoOutput context);
}
}
diff --git a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
index ffa4e97..78a963c 100644
--- a/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
+++ b/Admin.NET/WCS.Application/PLC/PLCTaskAction.cs
@@ -14,20 +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;//鍙栨秷绾跨▼鏍囪瘑
//瀵瑰鍏竷杩炴帴鐘舵��
public static List<PLCUtil> listPlcConn
{
get { return listPlcUtil; }
}
- private static CancellationTokenSource cts;//鍙栨秷绾跨▼鏍囪瘑
-
public static event EventHandler DeviceValueChangeEvent;
static PLCTaskAction()
{
--
Gitblit v1.8.0