g82tt/ThingsGateway
1
0
Fork 0
mirror of https://gitee.com/ThingsGateway/ThingsGateway.git synced 2025-10-22 19:43:07 +08:00
Code Issues Packages Projects Releases Wiki Activity

恢复部分代码:tcpclientbase;IDBHistoryAlarm;sqlhisalarm

Browse Source
This commit is contained in:
Diego2098
2024-04-15 23:31:43 +08:00
parent e655f719e6
commit 40d85e8926
4 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/ThingsGateway.Gateway.Application/Plugin/Business/DB/IDBHistoryAlarm.cs
View File

@@ -43,5 +43,6 @@ namespace ThingsGateway.Gateway.Application
public string Remark3 { get; set; }
public string Remark4 { get; set; }
public string Remark5 { get; set; }
}
}

7
src/foundation/ThingsGateway.Foundation/src/Channel/TcpClient/TgTcpClientBase.cs
View File

@@ -301,15 +301,8 @@ namespace ThingsGateway.Foundation
this.PrivateOnConnecting(new ConnectingEventArgs(socket)).GetFalseAwaitResult();
var task = Task.Run(() =>
{
try
{
socket.Connect(iPHost.Host, iPHost.Port);
}
catch (SocketException ex)
{
return;
}
}, token);
task.ConfigureFalseAwait();
try

2
src/plugin/ThingsGateway.Plugin.SqlHisAlarm/SQLHisAlarm/HisAlarmDayStatisticsOutput.cs
View File

@@ -8,7 +8,7 @@
// QQ群：605534569
//------------------------------------------------------------------------------
namespace ThingsGateway.Gateway.Application;
namespace ThingsGateway.Plugin.SqlHisAlarm;
public class HisAlarmDayStatisticsOutput
{

3
src/plugin/ThingsGateway.Plugin.SqlHisAlarm/SQLHisAlarm/HistoryAlarmPageInput.cs
View File

@@ -11,8 +11,9 @@
using System.ComponentModel;
using ThingsGateway.Core;
using ThingsGateway.Gateway.Application;
namespace ThingsGateway.Gateway.Application;
namespace ThingsGateway.Plugin.SqlHisAlarm;
/// <summary>
/// HistoryAlarmPageInput