From 7bb43fd6a2d62060c2f622e8d9396329ebaf4794 Mon Sep 17 00:00:00 2001
From: hwh <332078369@qq.com>
Date: 星期四, 05 九月 2024 11:17:02 +0800
Subject: [PATCH] Merge branch 'master' of http://47.95.120.53:8083/r/WCSNet6
---
Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs | 28 +++++++++++++++++++++++++---
1 files changed, 25 insertions(+), 3 deletions(-)
diff --git a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
index eb15497..e2eef27 100644
--- a/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
+++ b/Admin.NET/WCS.Application/Service/WcsAlarmInfo/WcsAlarmInfoService.cs
@@ -1,4 +1,6 @@
-锘縩amespace WCS.Application;
+锘縰sing Microsoft.AspNetCore.SignalR;
+
+namespace WCS.Application;
/// <summary>
/// 鎶ヨ淇℃伅琛ㄦ湇鍔�
@@ -7,9 +9,11 @@
public class WcsAlarmInfoService : IDynamicApiController, ITransient
{
private readonly SqlSugarRepository<WcsAlarmInfo> _wcsAlarmInfoRep;
- public WcsAlarmInfoService(SqlSugarRepository<WcsAlarmInfo> wcsAlarmInfoRep)
+ private readonly IHubContext<PlcHub, IPlcHub> _plcHubContext;
+ public WcsAlarmInfoService(SqlSugarRepository<WcsAlarmInfo> wcsAlarmInfoRep, IHubContext<PlcHub, IPlcHub> plcHubContext)
{
_wcsAlarmInfoRep = wcsAlarmInfoRep;
+ _plcHubContext = plcHubContext;
}
/// <summary>
@@ -46,6 +50,7 @@
public async Task<long> Add(AddWcsAlarmInfoInput input)
{
var entity = input.Adapt<WcsAlarmInfo>();
+ entity.Status = YesNoEnum.N;
await _wcsAlarmInfoRep.InsertAsync(entity);
return entity.Id;
}
@@ -102,11 +107,28 @@
[DisplayName("鑾峰彇鎶ヨ淇℃伅琛ㄥ垪琛�")]
public async Task<List<WcsAlarmInfoOutput>> List([FromQuery] PageWcsAlarmInfoInput input)
{
- return await _wcsAlarmInfoRep.AsQueryable().Select<WcsAlarmInfoOutput>().ToListAsync();
+ return await _wcsAlarmInfoRep.AsQueryable()
+ .WhereIF(!input.Status.IsNullOrEmpty(), s => s.Status == input.Status)
+ .Select<WcsAlarmInfoOutput>().ToListAsync();
}
+ /// <summary>
+ /// 澶嶄綅鎶ヨ
+ /// </summary>
+ /// <param name="input"></param>
+ /// <returns></returns>
+ [HttpPost]
+ [ApiDescriptionSettings(Name = "Reset")]
+ [DisplayName("澶嶄綅鎶ヨ")]
+ public async Task Reset()
+ {
+ //娴嬭瘯鎺ㄦ暟鎹敤鐨�
+ await _plcHubContext.Clients.All.PublicAlarm(new List<WcsAlarmInfo>() { new WcsAlarmInfo() { Id = 100, StationNum = "260", AlarmCode = "MB102", AlarmName = "鏈夌墿鍝侀伄鎸�", AlarmTime = DateTime.Now, Status = YesNoEnum.N } });
+ //await _plcHubContext.Clients.All.PublicAlarm(new WcsAlarmInfo() { Id = 100, StationNum = "260", AlarmCode = "MB102", AlarmName = "鏈夌墿鍝侀伄鎸�", AlarmTime = DateTime.Now, Status = YesNoEnum.Y });
+ //throw Oops.Bah("寮�鍙戜腑");
+ }
}
--
Gitblit v1.8.0