From dab4b66ee0aaf24277d6913731cd050b3d204c70 Mon Sep 17 00:00:00 2001
From: Diego2098 <2248356998@qq.com>
Date: Sat, 12 Aug 2023 12:09:50 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0nuget=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../ThingsGateway.Admin.Blazor.Core.csproj | 2 +-
.../ThingsGateway.Admin.Core.csproj | 4 +--
.../Workers/Alarm/AlarmWorker.cs | 33 ++++++++++---------
.../Common/TcpClientEx.cs | 3 +-
.../SerialPort/SerialPort/SerialClient.cs | 3 +-
.../ThingsGateway.Foundation.csproj | 2 +-
6 files changed, 25 insertions(+), 22 deletions(-)
diff --git a/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.csproj b/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.csproj
index b7ac7c0e6..e60cfe100 100644
--- a/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.csproj
+++ b/framework/ThingsGateway.Admin.Blazor.Core/ThingsGateway.Admin.Blazor.Core.csproj
@@ -15,7 +15,7 @@
-
+
diff --git a/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj b/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj
index f19a933c2..2be005308 100644
--- a/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj
+++ b/framework/ThingsGateway.Admin.Core/ThingsGateway.Admin.Core.csproj
@@ -12,10 +12,10 @@
-
+
-
+
\ No newline at end of file
diff --git a/framework/ThingsGateway.Application/Workers/Alarm/AlarmWorker.cs b/framework/ThingsGateway.Application/Workers/Alarm/AlarmWorker.cs
index e8123a799..6d72265eb 100644
--- a/framework/ThingsGateway.Application/Workers/Alarm/AlarmWorker.cs
+++ b/framework/ThingsGateway.Application/Workers/Alarm/AlarmWorker.cs
@@ -66,7 +66,7 @@ public class AlarmWorker : BackgroundService
///
public OperResult StatuString { get; set; } = new OperResult("初始化");
private ConcurrentQueue DeviceVariables { get; set; } = new();
- private ConcurrentQueue HisAlarmDeviceVariables { get; set; } = new();
+ private ConcurrentQueue HisAlarmDeviceVariables { get; set; } = new();
///
/// 获取数据库链接
///
@@ -465,7 +465,7 @@ public class AlarmWorker : BackgroundService
OnAlarmChanged?.Invoke(item.Adapt());
if (!IsExited)
{
- HisAlarmDeviceVariables.Enqueue(item);
+ HisAlarmDeviceVariables.Enqueue(item.Adapt());
}
if (eventEnum == EventEnum.Alarm)
@@ -586,18 +586,20 @@ public class AlarmWorker : BackgroundService
//缓存值
var cacheData = await CacheDb.GetCacheData();
- var data = cacheData.SelectMany(a => a.CacheStr.FromJson>()).ToList();
- try
+ if (cacheData.Count > 0)
{
- var count = await sqlSugarClient.Insertable(data).ExecuteCommandAsync(stoppingToken.Token);
- await CacheDb.DeleteCacheData(cacheData.Select(a => a.Id).ToArray());
+ var data = cacheData.SelectMany(a => a.CacheStr.FromJson>()).ToList();
+ try
+ {
+ var count = await sqlSugarClient.Insertable(data).ExecuteCommandAsync(stoppingToken.Token);
+ await CacheDb.DeleteCacheData(cacheData.Select(a => a.Id).ToArray());
+ }
+ catch (Exception ex)
+ {
+ if (isSuccess)
+ _logger.LogWarning(ex, "写入历史报警失败");
+ }
}
- catch (Exception ex)
- {
- if (isSuccess)
- _logger.LogWarning(ex, "写入历史报警失败");
- }
-
if (stoppingToken.Token.IsCancellationRequested)
break;
@@ -605,16 +607,15 @@ public class AlarmWorker : BackgroundService
var list = HisAlarmDeviceVariables.ToListWithDequeue();
if (list.Count != 0)
{
- var hisalarm = list.Adapt>();
////Sql保存
- hisalarm.ForEach(it =>
+ list.ForEach(it =>
{
it.Id = YitIdHelper.NextId();
});
//插入
try
{
- await sqlSugarClient.Insertable(hisalarm).ExecuteCommandAsync(stoppingToken.Token);
+ await sqlSugarClient.Insertable(list).ExecuteCommandAsync(stoppingToken.Token);
isSuccess = true;
}
catch (Exception ex)
@@ -622,7 +623,7 @@ public class AlarmWorker : BackgroundService
if (isSuccess)
_logger.LogWarning(ex, "写入历史报警失败");
- var cacheDatas = hisalarm.ChunkTrivialBetter(500);
+ var cacheDatas = list.ChunkTrivialBetter(500);
foreach (var a in cacheDatas)
{
await CacheDb.AddCacheData("", a.ToJson(), 50000);
diff --git a/framework/ThingsGateway.Foundation/Common/TcpClientEx.cs b/framework/ThingsGateway.Foundation/Common/TcpClientEx.cs
index fa49284c4..5fed50335 100644
--- a/framework/ThingsGateway.Foundation/Common/TcpClientEx.cs
+++ b/framework/ThingsGateway.Foundation/Common/TcpClientEx.cs
@@ -29,6 +29,7 @@ using System.Runtime.InteropServices;
using ThingsGateway.Foundation;
using TouchSocket.Resources;
+using TouchSocket.Sockets;
namespace ThingsGateway.Foundation;
@@ -159,7 +160,7 @@ public class TcpClientBaseEx : BaseSocket, ITcpClient
{
return;
}
- this.PluginsManager.Raise(nameof(ITcpDisconnectedPlguin.OnTcpDisconnected), this, e);
+ this.PluginsManager.Raise(nameof(ITcpDisconnectedPlugin.OnTcpDisconnected), this, e);
}
///
diff --git a/framework/ThingsGateway.Foundation/SerialPort/SerialPort/SerialClient.cs b/framework/ThingsGateway.Foundation/SerialPort/SerialPort/SerialClient.cs
index fdcd6ea30..1ffdeb1b0 100644
--- a/framework/ThingsGateway.Foundation/SerialPort/SerialPort/SerialClient.cs
+++ b/framework/ThingsGateway.Foundation/SerialPort/SerialPort/SerialClient.cs
@@ -13,6 +13,7 @@
using System.IO.Ports;
using TouchSocket.Resources;
+using TouchSocket.Sockets;
namespace ThingsGateway.Foundation.Serial;
@@ -172,7 +173,7 @@ public class SerialClientBase : BaseSerial, ISerialClient
{
return;
}
- this.PluginsManager.Raise(nameof(ITcpDisconnectedPlguin.OnTcpDisconnected), this, e);
+ this.PluginsManager.Raise(nameof(ITcpDisconnectedPlugin.OnTcpDisconnected), this, e);
}
private void PrivateOnDisconnecting(DisconnectEventArgs e)
{
diff --git a/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj b/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
index 2489a12f6..2d4c9c421 100644
--- a/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
+++ b/framework/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
@@ -13,7 +13,7 @@
-
+