From 54da8a22c438e1495b9c5fbae75ca9d4b5ca7335 Mon Sep 17 00:00:00 2001
From: wxw <Administrator@DESKTOP-5BIMHQ3>
Date: 星期一, 02 九月 2024 16:04:37 +0800
Subject: [PATCH] Merge branch 'master' into wxw
---
Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs | 14 +++-----------
1 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
index 5860a85..09b5112 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
@@ -1,6 +1,4 @@
-锘縰sing Microsoft.AspNetCore.SignalR;
-
-namespace WCS.Application;
+锘縩amespace WCS.Application;
/// <summary>
/// 鎶ヨ淇℃伅琛ㄦ湇鍔�
@@ -9,12 +7,9 @@
public class WcsAlarmInfoService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WcsAlarmInfo> _wcsAlarmInfoRep;
- private readonly IHubContext<PlcHub, IPlcHub> _plcHubContext;
-
- public WcsAlarmInfoService(SqlSugarRepository<WcsAlarmInfo> wcsAlarmInfoRep, IHubContext<PlcHub, IPlcHub> plcHubContext)
+ public WcsAlarmInfoService(SqlSugarRepository<WcsAlarmInfo> wcsAlarmInfoRep)
{
_wcsAlarmInfoRep = wcsAlarmInfoRep;
- _plcHubContext = plcHubContext;
}
/// <summary>
@@ -123,10 +118,7 @@
[DisplayName("澶嶄綅鎶ヨ")]
public async Task Reset()
{
- //娴嬭瘯鎺ㄦ暟鎹敤鐨�
- await _plcHubContext.Clients.All.PublicAlarm(new WcsAlarmInfoOutput() { Id = new Random().Next(), StationNum = "205", AlarmCode = "MB102", AlarmName = "鏈夌墿鍝侀伄鎸�", AlarmTime = DateTime.Now });
- //throw Oops.Bah("寮�鍙戜腑");
-
+ throw Oops.Bah("寮�鍙戜腑");
}
--
Gitblit v1.8.0