mirror of
https://gitee.com/ThingsGateway/ThingsGateway.git
synced 2025-10-20 18:51:28 +08:00
Compare commits
19 Commits
Author | SHA1 | Date | |
---|---|---|---|
![]() |
cec43e2ce8 | ||
![]() |
7553b258bb | ||
![]() |
8bdbdc117e | ||
![]() |
0e206be296 | ||
![]() |
00b7353433 | ||
![]() |
44e7a83593 | ||
![]() |
dd68d555d4 | ||
![]() |
0456296103 | ||
![]() |
a1b66277ff | ||
![]() |
50758b79bc | ||
![]() |
06a1f902ad | ||
![]() |
58f8b23b7c | ||
![]() |
9e7c348b15 | ||
![]() |
5f5ff8b43b | ||
![]() |
f626b4e5fc | ||
![]() |
bc23200e66 | ||
![]() |
95ab59fd5a | ||
![]() |
0bbee003b0 | ||
![]() |
d20cb7a928 |
@@ -20,11 +20,14 @@ A cross-platform, high-performance edge data collection gateway based on net9.
|
||||
## Demo
|
||||
|
||||
|
||||
[Demo](http://47.119.161.158:5000/)
|
||||
[Demo](https://demo.thingsgateway.cn/)
|
||||
|
||||
|
||||
Account: **SuperAdmin**
|
||||
|
||||
|
||||
Password: **111111**
|
||||
|
||||
|
||||
**In the upper-right corner, switch to the IoT Gateway module in the personal popup box**
|
||||
|
||||
|
@@ -13,7 +13,7 @@
|
||||
|
||||
## 演示
|
||||
|
||||
[ThingsGateway演示地址](http://47.119.161.158:5000/)
|
||||
[ThingsGateway演示地址](https://demo.thingsgateway.cn/)
|
||||
|
||||
账户 : **SuperAdmin**
|
||||
|
||||
|
@@ -137,7 +137,7 @@ public sealed class OperDescAttribute : MoAttribute
|
||||
Name = (localizerType == null ? App.CreateLocalizerByType(typeof(OperDescAttribute)) : App.CreateLocalizerByType(localizerType))![Description],
|
||||
Category = LogCateGoryEnum.Operate,
|
||||
ExeStatus = true,
|
||||
OpIp = AppService?.RemoteIpAddress?.MapToIPv4()?.ToString() ?? string.Empty,
|
||||
OpIp = AppService?.RemoteIpAddress ?? string.Empty,
|
||||
OpBrowser = clientInfo?.UA?.Family + clientInfo?.UA?.Major,
|
||||
OpOs = clientInfo?.OS?.Family + clientInfo?.OS?.Major,
|
||||
OpTime = DateTime.Now,
|
||||
|
@@ -23,7 +23,7 @@ public class SysDict : BaseEntity
|
||||
/// <summary>
|
||||
/// 类型
|
||||
///</summary>
|
||||
[SugarColumn(ColumnDescription = "类型", Length = 200)]
|
||||
[SugarColumn(ColumnDescription = "类型")]
|
||||
[AutoGenerateColumn(Ignore = true, Filterable = true, Sortable = true)]
|
||||
public virtual DictTypeEnum DictType { get; set; }
|
||||
|
||||
|
@@ -24,7 +24,7 @@ public class SysOperateLog
|
||||
/// <summary>
|
||||
/// 日志分类
|
||||
///</summary>
|
||||
[SugarColumn(ColumnDescription = "日志分类", Length = 200)]
|
||||
[SugarColumn(ColumnDescription = "日志分类")]
|
||||
[AutoGenerateColumn(Order = 1, Filterable = true, Sortable = true)]
|
||||
public LogCateGoryEnum Category { get; set; }
|
||||
|
||||
|
@@ -54,7 +54,7 @@ public class SysPosition : BaseEntity
|
||||
/// <summary>
|
||||
/// 分类
|
||||
///</summary>
|
||||
[SugarColumn(ColumnName = "Category", ColumnDescription = "分类", Length = 200)]
|
||||
[SugarColumn(ColumnName = "Category", ColumnDescription = "分类")]
|
||||
[AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
|
||||
public virtual PositionCategoryEnum Category { get; set; }
|
||||
|
||||
|
@@ -22,7 +22,7 @@ public class SysRelation : PrimaryKeyEntity
|
||||
/// <summary>
|
||||
/// 分类
|
||||
///</summary>
|
||||
[SugarColumn(ColumnDescription = "分类", Length = 200)]
|
||||
[SugarColumn(ColumnDescription = "分类")]
|
||||
public RelationCategoryEnum Category { get; set; }
|
||||
|
||||
/// <summary>
|
||||
|
@@ -41,7 +41,7 @@ public class SysRole : BaseEntity
|
||||
/// <summary>
|
||||
/// 分类
|
||||
///</summary>
|
||||
[SugarColumn(ColumnDescription = "分类", Length = 200, IsNullable = false)]
|
||||
[SugarColumn(ColumnDescription = "分类", IsNullable = false)]
|
||||
[AutoGenerateColumn(Visible = true, Sortable = true, Filterable = true)]
|
||||
public virtual RoleCategoryEnum Category { get; set; }
|
||||
|
||||
|
@@ -13,7 +13,6 @@ using Microsoft.AspNetCore.Authentication.Cookies;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.WebUtilities;
|
||||
|
||||
using System.Net;
|
||||
using System.Security.Claims;
|
||||
|
||||
using UAParser;
|
||||
@@ -72,7 +71,7 @@ public class AppService : IAppService
|
||||
}
|
||||
public ClaimsPrincipal? User => App.User;
|
||||
|
||||
public IPAddress? RemoteIpAddress => App.HttpContext?.Connection?.RemoteIpAddress;
|
||||
public string? RemoteIpAddress => App.HttpContext?.GetRemoteIpAddressToIPv4();
|
||||
|
||||
public int LocalPort => App.HttpContext.Connection.LocalPort;
|
||||
}
|
||||
|
@@ -11,7 +11,6 @@
|
||||
using Microsoft.AspNetCore.Components.Authorization;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
using System.Net;
|
||||
using System.Security.Claims;
|
||||
|
||||
using UAParser;
|
||||
@@ -24,7 +23,7 @@ public class HybridAppService : IAppService
|
||||
{
|
||||
var str = "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/127.0.0.0 Safari/537.36 Edg/127.0.0.0";
|
||||
ClientInfo = Parser.GetDefault().Parse(str);
|
||||
RemoteIpAddress = IPAddress.Parse("127.0.0.1");
|
||||
RemoteIpAddress = "127.0.0.1";
|
||||
}
|
||||
public ClientInfo? ClientInfo { get; }
|
||||
|
||||
@@ -56,7 +55,7 @@ public class HybridAppService : IAppService
|
||||
}
|
||||
}
|
||||
|
||||
public IPAddress? RemoteIpAddress { get; }
|
||||
public string? RemoteIpAddress { get; }
|
||||
|
||||
public string GetReturnUrl(string returnUrl)
|
||||
{
|
||||
|
@@ -9,7 +9,6 @@
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
|
||||
using System.Net;
|
||||
using System.Security.Claims;
|
||||
|
||||
using UAParser;
|
||||
@@ -31,7 +30,7 @@ public interface IAppService
|
||||
/// <summary>
|
||||
/// RemoteIpAddress
|
||||
/// </summary>
|
||||
public IPAddress? RemoteIpAddress { get; }
|
||||
public string? RemoteIpAddress { get; }
|
||||
|
||||
/// <summary>
|
||||
/// GetReturnUrl
|
||||
|
@@ -105,7 +105,7 @@ public class AuthService : IAuthService
|
||||
{
|
||||
var loginEvent = new LoginEvent
|
||||
{
|
||||
Ip = _appService.RemoteIpAddress?.MapToIPv4()?.ToString(),
|
||||
Ip = _appService.RemoteIpAddress,
|
||||
SysUser = userinfo,
|
||||
VerificatId = verificatId
|
||||
};
|
||||
@@ -236,7 +236,7 @@ public class AuthService : IAuthService
|
||||
//登录事件参数
|
||||
var logingEvent = new LoginEvent
|
||||
{
|
||||
Ip = _appService.RemoteIpAddress?.MapToIPv4()?.ToString(),
|
||||
Ip = _appService.RemoteIpAddress,
|
||||
Device = App.GetService<IAppService>().ClientInfo?.OS?.ToString(),
|
||||
Expire = expire,
|
||||
SysUser = sysUser,
|
||||
|
@@ -47,12 +47,10 @@ public class BaseService<T> : IDataService<T>, IDisposable where T : class, new(
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public Task<bool> DeleteAsync(IEnumerable<T> models)
|
||||
public async Task<bool> DeleteAsync(IEnumerable<T> models)
|
||||
{
|
||||
if (models.FirstOrDefault() is IPrimaryIdEntity)
|
||||
return DeleteAsync(models.Select(a => ((IPrimaryIdEntity)a).Id));
|
||||
else
|
||||
return Task.FromResult(false);
|
||||
using var db = GetDB();
|
||||
return await db.Deleteable<T>().In(models.ToList()).ExecuteCommandHasChangeAsync().ConfigureAwait(false);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
@@ -165,4 +163,6 @@ public class BaseService<T> : IDataService<T>, IDisposable where T : class, new(
|
||||
{
|
||||
return DbContext.Db.GetConnectionScopeWithAttr<T>().CopyNew();
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
|
@@ -103,4 +103,46 @@ public static class DbContext
|
||||
Console.WriteLine("【Sql执行时间】:" + DateTime.Now.ToDefaultDateTimeFormat());
|
||||
Console.WriteLine("【Sql语句】:" + msg + Environment.NewLine);
|
||||
}
|
||||
|
||||
|
||||
|
||||
public static async Task BulkCopyAsync<TITEM>(this SqlSugarClient db, List<TITEM> datas, int size) where TITEM : class, new()
|
||||
{
|
||||
switch (db.CurrentConnectionConfig.DbType)
|
||||
{
|
||||
case DbType.MySql:
|
||||
case DbType.SqlServer:
|
||||
case DbType.Sqlite:
|
||||
case DbType.Oracle:
|
||||
case DbType.PostgreSQL:
|
||||
case DbType.Dm:
|
||||
case DbType.MySqlConnector:
|
||||
case DbType.Kdbndp:
|
||||
await db.Fastest<TITEM>().PageSize(size).BulkCopyAsync(datas).ConfigureAwait(false);
|
||||
break;
|
||||
default:
|
||||
await db.Insertable(datas).PageSize(size).ExecuteCommandAsync().ConfigureAwait(false);
|
||||
break;
|
||||
}
|
||||
|
||||
}
|
||||
public static async Task BulkUpdateAsync<TITEM>(this SqlSugarClient db, List<TITEM> datas, int size) where TITEM : class, new()
|
||||
{
|
||||
switch (db.CurrentConnectionConfig.DbType)
|
||||
{
|
||||
case DbType.MySql:
|
||||
case DbType.SqlServer:
|
||||
case DbType.Sqlite:
|
||||
case DbType.Oracle:
|
||||
case DbType.PostgreSQL:
|
||||
case DbType.Dm:
|
||||
case DbType.MySqlConnector:
|
||||
case DbType.Kdbndp:
|
||||
await db.Fastest<TITEM>().PageSize(size).BulkUpdateAsync(datas).ConfigureAwait(false);
|
||||
break;
|
||||
default:
|
||||
await db.Updateable(datas).PageSize(size).ExecuteCommandAsync().ConfigureAwait(false);
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@@ -10,6 +10,7 @@
|
||||
|
||||
using BootstrapBlazor.Components;
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
using SqlSugar;
|
||||
@@ -23,7 +24,7 @@ namespace ThingsGateway.Admin.Application;
|
||||
[AppStartup(1000000000)]
|
||||
public class Startup : AppStartup
|
||||
{
|
||||
public void ConfigureAdminApp(IServiceCollection services)
|
||||
public void Configure(IServiceCollection services)
|
||||
{
|
||||
Directory.CreateDirectory("DB");
|
||||
|
||||
@@ -75,7 +76,7 @@ public class Startup : AppStartup
|
||||
|
||||
}
|
||||
|
||||
public void UseAdminCore(IServiceProvider serviceProvider)
|
||||
public void Use(IApplicationBuilder applicationBuilder)
|
||||
{
|
||||
//检查ConfigId
|
||||
var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);
|
||||
|
@@ -18,11 +18,10 @@
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.2" />
|
||||
<!--<PackageReference Include="MiniExcel" Version="1.39.0" />-->
|
||||
<PackageReference Include="BootstrapBlazor.TableExport" Version="9.2.4" />
|
||||
<PackageReference Include="UAParser" Version="3.1.47" />
|
||||
<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
|
||||
<PackageReference Include="SqlSugarCore" Version="5.1.4.188" />
|
||||
<PackageReference Include="SqlSugarCore" Version="5.1.4.189" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
|
||||
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
|
||||
|
@@ -15,7 +15,7 @@ namespace ThingsGateway.Admin.Razor;
|
||||
[AppStartup(-1)]
|
||||
public class Startup : AppStartup
|
||||
{
|
||||
public void ConfigureAdminApp(IServiceCollection services)
|
||||
public void Configure(IServiceCollection services)
|
||||
{
|
||||
services.AddScoped<IMenuService, MenuService>();
|
||||
services.AddBootstrapBlazorTableExportService();
|
||||
|
@@ -298,9 +298,9 @@ public class Startup : AppStartup
|
||||
public void Use(IApplicationBuilder applicationBuilder, IWebHostEnvironment env)
|
||||
{
|
||||
var app = (WebApplication)applicationBuilder;
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All, KnownNetworks = { }, KnownProxies = { } });
|
||||
app.UseBootstrapBlazor();
|
||||
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All });
|
||||
|
||||
// 启用本地化
|
||||
var option = app.Services.GetService<IOptions<RequestLocalizationOptions>>();
|
||||
|
@@ -106,7 +106,7 @@ public static class HttpContextExtensions
|
||||
/// <param name="context"></param>
|
||||
/// <param name="xff">是否优先取 X-Forwarded-For</param>
|
||||
/// <returns></returns>
|
||||
public static string GetRemoteIpAddressToIPv4(this HttpContext context, bool xff = false)
|
||||
public static string GetRemoteIpAddressToIPv4(this HttpContext context, bool xff = true)
|
||||
{
|
||||
var ipv4 = context.Connection.RemoteIpAddress?.MapToIPv4()?.ToString();
|
||||
|
||||
|
@@ -147,7 +147,7 @@ internal sealed class ScheduleHostedService : BackgroundService
|
||||
await BackgroundProcessing(stoppingToken).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
_logger.LogCritical($"Schedule hosted service is stopped.");
|
||||
_logger.LogInformation($"Schedule hosted service is stopped.");
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
@@ -8,6 +8,7 @@
|
||||
// QQ群:605534569
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
using ThingsGateway.NewLife;
|
||||
@@ -48,7 +49,7 @@ public class Startup : AppStartup
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public void UseService(IServiceProvider serviceProvider)
|
||||
public void Use(IApplicationBuilder applicationBuilder)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
@@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="BootstrapBlazor.FontAwesome" Version="9.0.2" />
|
||||
<PackageReference Include="BootstrapBlazor" Version="9.5.5" />
|
||||
<PackageReference Include="BootstrapBlazor" Version="9.5.10" />
|
||||
<PackageReference Include="Yitter.IdGenerator" Version="1.0.14" />
|
||||
</ItemGroup>
|
||||
|
||||
|
@@ -1,8 +1,8 @@
|
||||
<Project>
|
||||
|
||||
<PropertyGroup>
|
||||
<PluginVersion>10.4.19</PluginVersion>
|
||||
<ProPluginVersion>10.4.19</ProPluginVersion>
|
||||
<PluginVersion>10.5.6</PluginVersion>
|
||||
<ProPluginVersion>10.5.6</ProPluginVersion>
|
||||
<AuthenticationVersion>2.1.7</AuthenticationVersion>
|
||||
</PropertyGroup>
|
||||
|
||||
|
@@ -7,7 +7,7 @@
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="CS-Script" Version="4.8.27" />
|
||||
<PackageReference Include="CS-Script" Version="4.9.6" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@@ -15,7 +15,7 @@ namespace ThingsGateway.Debug;
|
||||
[AppStartup(100000000)]
|
||||
public class Startup : AppStartup
|
||||
{
|
||||
public void ConfigureAdminApp(IServiceCollection services)
|
||||
public void Configure(IServiceCollection services)
|
||||
{
|
||||
services.AddScoped<IPlatformService, PlatformService>();
|
||||
}
|
||||
|
@@ -94,11 +94,11 @@ public class DDPUdpSessionChannel : UdpSessionChannel, IClientChannel, IDtuUdpSe
|
||||
return WaitLocks.GetOrAdd(key, (a) => new WaitLock(WaitLock.MaxCount));
|
||||
}
|
||||
|
||||
public override Task StopAsync()
|
||||
public override Task<Result> StopAsync(CancellationToken token)
|
||||
{
|
||||
WaitLocks.ForEach(a => a.Value.SafeDispose());
|
||||
WaitLocks.Clear();
|
||||
return base.StopAsync();
|
||||
return base.StopAsync(token);
|
||||
}
|
||||
|
||||
private ConcurrentDictionary<EndPoint, WaitLock> _waitLocks = new();
|
||||
|
@@ -128,17 +128,17 @@ public class OtherChannel : SetupConfigObject, IClientChannel
|
||||
|
||||
public Protocol Protocol => new Protocol("Other");
|
||||
|
||||
public DateTime LastReceivedTime { get; private set; }
|
||||
public DateTimeOffset LastReceivedTime { get; private set; }
|
||||
|
||||
public DateTime LastSentTime { get; private set; }
|
||||
public DateTimeOffset LastSentTime { get; private set; }
|
||||
|
||||
public bool IsClient => true;
|
||||
|
||||
public bool Online => true;
|
||||
|
||||
public Task CloseAsync(string msg)
|
||||
public Task<Result> CloseAsync(string msg, CancellationToken token)
|
||||
{
|
||||
return Task.CompletedTask;
|
||||
return Task.FromResult(Result.Success);
|
||||
}
|
||||
|
||||
public Task ConnectAsync(int millisecondsTimeout, CancellationToken token)
|
||||
|
@@ -80,7 +80,7 @@ public class DtuPlugin : PluginBase, ITcpReceivingPlugin
|
||||
{
|
||||
if (HeartbeatByte.SequenceEqual(e.ByteBlock.AsSegment(0, len)))
|
||||
{
|
||||
if (DateTime.UtcNow - socket.LastSentTime.ToUniversalTime() < TimeSpan.FromMilliseconds(200))
|
||||
if (DateTimeOffset.Now - socket.LastSentTime < TimeSpan.FromMilliseconds(200))
|
||||
{
|
||||
await Task.Delay(200).ConfigureAwait(false);
|
||||
}
|
||||
|
@@ -81,7 +81,7 @@ internal sealed class HeartbeatAndReceivePlugin : PluginBase, ITcpConnectedPlugi
|
||||
|
||||
try
|
||||
{
|
||||
if (DateTime.UtcNow - tcpClient.LastSentTime.ToUniversalTime() < TimeSpan.FromMilliseconds(200))
|
||||
if (DateTimeOffset.Now - tcpClient.LastSentTime < TimeSpan.FromMilliseconds(200))
|
||||
{
|
||||
await Task.Delay(200).ConfigureAwait(false);
|
||||
}
|
||||
|
@@ -76,7 +76,7 @@ public static class PluginUtil
|
||||
.SetOnClose(async (c, t) =>
|
||||
{
|
||||
await c.ShutdownAsync(System.Net.Sockets.SocketShutdown.Both).ConfigureAwait(false);
|
||||
c.SafeClose($"{channelOptions.CheckClearTime}ms Timeout");
|
||||
await c.CloseAsync($"{channelOptions.CheckClearTime}ms Timeout").ConfigureAwait(false);
|
||||
});
|
||||
};
|
||||
|
||||
|
@@ -74,8 +74,9 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
|
||||
|
||||
//private readonly WaitLock _connectLock = new WaitLock();
|
||||
/// <inheritdoc/>
|
||||
public override async Task CloseAsync(string msg)
|
||||
public override async Task<Result> CloseAsync(string msg, CancellationToken token)
|
||||
{
|
||||
|
||||
if (Online)
|
||||
{
|
||||
try
|
||||
@@ -83,11 +84,12 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
|
||||
//await _connectLock.WaitAsync().ConfigureAwait(false);
|
||||
if (Online)
|
||||
{
|
||||
await base.CloseAsync(msg).ConfigureAwait(false);
|
||||
var result = await base.CloseAsync(msg, token).ConfigureAwait(false);
|
||||
if (!Online)
|
||||
{
|
||||
await this.OnChannelEvent(Stoped).ConfigureAwait(false);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
finally
|
||||
@@ -95,6 +97,7 @@ public class SerialPortChannel : SerialPortClient, IClientChannel
|
||||
//_connectLock.Release();
|
||||
}
|
||||
}
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
@@ -72,7 +72,7 @@ public class TcpClientChannel : TcpClient, IClientChannel
|
||||
|
||||
//private readonly WaitLock _connectLock = new WaitLock();
|
||||
/// <inheritdoc/>
|
||||
public override async Task CloseAsync(string msg)
|
||||
public override async Task<Result> CloseAsync(string msg, CancellationToken token)
|
||||
{
|
||||
if (Online)
|
||||
{
|
||||
@@ -81,11 +81,12 @@ public class TcpClientChannel : TcpClient, IClientChannel
|
||||
//await _connectLock.WaitAsync().ConfigureAwait(false);
|
||||
if (Online)
|
||||
{
|
||||
await base.CloseAsync(msg).ConfigureAwait(false);
|
||||
var result = await base.CloseAsync(msg, token).ConfigureAwait(false);
|
||||
if (!Online)
|
||||
{
|
||||
await this.OnChannelEvent(Stoped).ConfigureAwait(false);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
}
|
||||
finally
|
||||
@@ -93,6 +94,7 @@ public class TcpClientChannel : TcpClient, IClientChannel
|
||||
//_connectLock.Release();
|
||||
}
|
||||
}
|
||||
return Result.Success;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
@@ -94,22 +94,22 @@ public abstract class TcpServiceChannelBase<TClient> : TcpService<TClient>, ITcp
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override async Task StopAsync()
|
||||
public override async Task<Result> StopAsync(CancellationToken token)
|
||||
{
|
||||
if (Monitors.Any())
|
||||
{
|
||||
try
|
||||
{
|
||||
await _connectLock.WaitAsync().ConfigureAwait(false);
|
||||
await _connectLock.WaitAsync(token).ConfigureAwait(false);
|
||||
if (Monitors.Any())
|
||||
{
|
||||
|
||||
await ClearAsync().ConfigureAwait(false);
|
||||
var iPHost = Monitors.FirstOrDefault()?.Option.IpHost;
|
||||
await base.StopAsync().ConfigureAwait(false);
|
||||
var result = await base.StopAsync(token).ConfigureAwait(false);
|
||||
if (!Monitors.Any())
|
||||
Logger?.Info($"{iPHost}{DefaultResource.Localizer["ServiceStoped"]}");
|
||||
|
||||
return result;
|
||||
}
|
||||
}
|
||||
finally
|
||||
@@ -120,8 +120,10 @@ public abstract class TcpServiceChannelBase<TClient> : TcpService<TClient>, ITcp
|
||||
}
|
||||
else
|
||||
{
|
||||
await base.StopAsync().ConfigureAwait(false);
|
||||
var result = await base.StopAsync(token).ConfigureAwait(false);
|
||||
return result;
|
||||
}
|
||||
return Result.Success; ;
|
||||
}
|
||||
|
||||
|
||||
@@ -192,9 +194,9 @@ public class TcpServiceChannel<TClient> : TcpServiceChannelBase<TClient>, IChann
|
||||
public ChannelEventHandler Stoping { get; set; } = new();
|
||||
|
||||
/// <inheritdoc/>
|
||||
public Task CloseAsync(string msg)
|
||||
public Task<Result> CloseAsync(string msg, CancellationToken token)
|
||||
{
|
||||
return StopAsync();
|
||||
return StopAsync(token);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
@@ -64,10 +64,10 @@ public class TcpSessionClientChannel : TcpSessionClient, IClientChannel
|
||||
public virtual WaitLock GetLock(string key) => WaitLock;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override Task CloseAsync(string msg)
|
||||
public override Task<Result> CloseAsync(string msg, CancellationToken token)
|
||||
{
|
||||
WaitHandlePool.SafeDispose();
|
||||
return base.CloseAsync(msg);
|
||||
return base.CloseAsync(msg, token);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
|
@@ -73,9 +73,9 @@ public class UdpSessionChannel : UdpSession, IClientChannel
|
||||
public ConcurrentDictionary<long, Func<IClientChannel, ReceivedDataEventArgs, bool, Task>> ChannelReceivedWaitDict { get; } = new();
|
||||
|
||||
/// <inheritdoc/>
|
||||
public Task CloseAsync(string msg)
|
||||
public Task<Result> CloseAsync(string msg, CancellationToken token)
|
||||
{
|
||||
return StopAsync();
|
||||
return StopAsync(token);
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
@@ -127,26 +127,28 @@ public class UdpSessionChannel : UdpSession, IClientChannel
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
public override async Task StopAsync()
|
||||
public override async Task<Result> StopAsync(CancellationToken token)
|
||||
{
|
||||
if (Monitor != null)
|
||||
{
|
||||
try
|
||||
{
|
||||
await _connectLock.WaitAsync().ConfigureAwait(false);
|
||||
await _connectLock.WaitAsync(token).ConfigureAwait(false);
|
||||
if (Monitor != null)
|
||||
{
|
||||
await this.OnChannelEvent(Stoping).ConfigureAwait(false);
|
||||
await base.StopAsync().ConfigureAwait(false);
|
||||
var result = await base.StopAsync(token).ConfigureAwait(false);
|
||||
if (Monitor == null)
|
||||
{
|
||||
await this.OnChannelEvent(Stoped).ConfigureAwait(false);
|
||||
Logger?.Info($"{DefaultResource.Localizer["ServiceStoped"]}");
|
||||
}
|
||||
return result;
|
||||
}
|
||||
else
|
||||
{
|
||||
await base.StopAsync().ConfigureAwait(false);
|
||||
var result = await base.StopAsync(token).ConfigureAwait(false);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
finally
|
||||
@@ -156,7 +158,8 @@ public class UdpSessionChannel : UdpSession, IClientChannel
|
||||
}
|
||||
else
|
||||
{
|
||||
await base.StopAsync().ConfigureAwait(false);
|
||||
var result = await base.StopAsync(token).ConfigureAwait(false);
|
||||
return result;
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -46,9 +46,9 @@ public abstract class DeviceBase : DisposableObject, IDevice
|
||||
return;
|
||||
if (channel.Collects.Count > 0)
|
||||
{
|
||||
var device = channel.Collects.First();
|
||||
if (device.GetType() != GetType())
|
||||
throw new InvalidOperationException("The channel already exists in the device of another type");
|
||||
//var device = channel.Collects.First();
|
||||
//if (device.GetType() != GetType())
|
||||
// throw new InvalidOperationException("The channel already exists in the device of another type");
|
||||
|
||||
if (!SupportMultipleDevice())
|
||||
throw new InvalidOperationException("The proactive response device does not support multiple devices");
|
||||
@@ -97,9 +97,17 @@ public abstract class DeviceBase : DisposableObject, IDevice
|
||||
Channel.Stoping.Add(ChannelStoping);
|
||||
Channel.Started.Add(ChannelStarted);
|
||||
Channel.ChannelReceived.Add(ChannelReceived);
|
||||
|
||||
|
||||
SetChannel();
|
||||
}
|
||||
}
|
||||
|
||||
protected virtual void SetChannel()
|
||||
{
|
||||
Channel.ChannelOptions.MaxConcurrentCount = 1;
|
||||
}
|
||||
|
||||
/// <inheritdoc/>
|
||||
~DeviceBase()
|
||||
{
|
||||
@@ -221,6 +229,14 @@ public abstract class DeviceBase : DisposableObject, IDevice
|
||||
}
|
||||
else
|
||||
{
|
||||
if (Channel?.Collects?.Count > 1)
|
||||
{
|
||||
var dataHandlingAdapter = GetDataAdapter();
|
||||
if (adapter.GetType() != dataHandlingAdapter.GetType())
|
||||
{
|
||||
clientChannel.SetDataHandlingAdapter(dataHandlingAdapter);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -944,7 +960,7 @@ public abstract class DeviceBase : DisposableObject, IDevice
|
||||
if (tcpServiceChannel.TryGetClient($"ID={dtu.DtuId}", out var client))
|
||||
{
|
||||
client.WaitHandlePool?.SafeDispose();
|
||||
client.SafeClose();
|
||||
client.Close();
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -10,8 +10,8 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="9.0.4" />
|
||||
<PackageReference Include="TouchSocket" Version="3.0.25" />
|
||||
<PackageReference Include="TouchSocket.SerialPorts" Version="3.0.25" />
|
||||
<PackageReference Include="TouchSocket" Version="3.1.0" />
|
||||
<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.0" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
@@ -13,6 +13,7 @@ using BootstrapBlazor.Components;
|
||||
using Mapster;
|
||||
|
||||
using Microsoft.AspNetCore.Authorization;
|
||||
using Microsoft.AspNetCore.Http;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
|
||||
using SqlSugar;
|
||||
@@ -139,7 +140,7 @@ public class ControlController : ControllerBase
|
||||
}
|
||||
}
|
||||
|
||||
return await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext.Connection.RemoteIpAddress.MapToIPv4()}", deviceDatas).ConfigureAwait(false);
|
||||
return await GlobalData.RpcService.InvokeDeviceMethodAsync($"WebApi-{UserManager.UserAccount}-{App.HttpContext?.GetRemoteIpAddressToIPv4()}", deviceDatas).ConfigureAwait(false);
|
||||
|
||||
}
|
||||
|
||||
|
@@ -9,6 +9,9 @@
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using System.Globalization;
|
||||
using System.Text;
|
||||
using System.Text.Encodings.Web;
|
||||
using System.Text.Json;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
using ThingsGateway.NewLife.Json.Extension;
|
||||
@@ -63,7 +66,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
protected List<TopicJson> GetAlarms(IEnumerable<AlarmModel> item)
|
||||
{
|
||||
IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<AlarmModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptAlarmModel);
|
||||
List<TopicJson> topicJsonList = new List<TopicJson>();
|
||||
var topicJsonList = new List<TopicJson>();
|
||||
var topics = Match(_businessPropertyWithCacheIntervalScript.AlarmTopic);
|
||||
if (topics.Count > 0)
|
||||
{
|
||||
@@ -128,7 +131,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
protected List<TopicJson> GetDeviceData(IEnumerable<DevModel> item)
|
||||
{
|
||||
IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<DevModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptDeviceModel);
|
||||
List<TopicJson> topicJsonList = new List<TopicJson>();
|
||||
var topicJsonList = new List<TopicJson>();
|
||||
var topics = Match(_businessPropertyWithCacheIntervalScript.DeviceTopic);
|
||||
if (topics.Count > 0)
|
||||
{
|
||||
@@ -193,7 +196,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
protected List<TopicJson> GetVariable(IEnumerable<VarModel> item)
|
||||
{
|
||||
IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<VarModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptVariableModel);
|
||||
List<TopicJson> topicJsonList = new List<TopicJson>();
|
||||
var topicJsonList = new List<TopicJson>();
|
||||
var topics = Match(_businessPropertyWithCacheIntervalScript.VariableTopic);
|
||||
if (topics.Count > 0)
|
||||
{
|
||||
@@ -267,7 +270,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
{
|
||||
data = item;
|
||||
}
|
||||
List<TopicJson> topicJsonList = new List<TopicJson>();
|
||||
var topicJsonList = new List<TopicJson>();
|
||||
var topics = Match(_businessPropertyWithCacheIntervalScript.VariableTopic);
|
||||
if (topics.Count > 0)
|
||||
{
|
||||
@@ -329,6 +332,40 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
return topicJsonList;
|
||||
}
|
||||
|
||||
//protected static byte[] Serialize(object value)
|
||||
//{
|
||||
// var block = new ValueByteBlock(1024 * 64);
|
||||
// try
|
||||
// {
|
||||
// //将数据序列化到内存块
|
||||
// FastBinaryFormatter.Serialize(ref block, value);
|
||||
// block.SeekToStart();
|
||||
// return block.Memory.GetArray().Array;
|
||||
// }
|
||||
// finally
|
||||
// {
|
||||
// block.Dispose();
|
||||
// }
|
||||
//}
|
||||
protected static JsonSerializerOptions NoWriteIndentedJsonSerializerOptions = new JsonSerializerOptions
|
||||
{
|
||||
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
|
||||
WriteIndented = false
|
||||
};
|
||||
protected static JsonSerializerOptions WriteIndentedJsonSerializerOptions = new JsonSerializerOptions
|
||||
{
|
||||
Encoder = JavaScriptEncoder.UnsafeRelaxedJsonEscaping,
|
||||
WriteIndented = true
|
||||
};
|
||||
|
||||
protected static byte[] Serialize(object data, bool writeIndented)
|
||||
{
|
||||
if (data == null) return Array.Empty<byte>();
|
||||
byte[] payload = JsonSerializer.SerializeToUtf8Bytes(data, data.GetType(), writeIndented ? WriteIndentedJsonSerializerOptions : NoWriteIndentedJsonSerializerOptions);
|
||||
return payload;
|
||||
}
|
||||
|
||||
|
||||
protected List<TopicArray> GetAlarmTopicArrays(IEnumerable<AlarmModel> item)
|
||||
{
|
||||
IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<AlarmModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptAlarmModel);
|
||||
@@ -355,7 +392,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
// 上传内容
|
||||
if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
|
||||
{
|
||||
var json = Serialize(group.Select(a => a).ToList().ToList());
|
||||
var json = Serialize(group.Select(a => a).ToList().ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -364,7 +401,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
// 如果不是报警列表,则将每个分组元素分别转换为 JSON 字符串
|
||||
foreach (var gro in group)
|
||||
{
|
||||
var json = Serialize(gro);
|
||||
var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -376,14 +413,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
{
|
||||
if (_businessPropertyWithCacheIntervalScript.IsAlarmList)
|
||||
{
|
||||
var json = Serialize(data.Select(a => a).ToList());
|
||||
var json = Serialize(data.Select(a => a).ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json));
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var group in data)
|
||||
{
|
||||
var json = Serialize(group);
|
||||
var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.AlarmTopic, json));
|
||||
}
|
||||
}
|
||||
@@ -392,22 +429,6 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
return topicJsonList;
|
||||
}
|
||||
|
||||
protected static ArraySegment<byte> Serialize(object value)
|
||||
{
|
||||
var block = new ValueByteBlock(1024 * 64);
|
||||
try
|
||||
{
|
||||
//将数据序列化到内存块
|
||||
FastBinaryFormatter.Serialize(ref block, value);
|
||||
block.SeekToStart();
|
||||
return block.Memory.GetArray();
|
||||
}
|
||||
finally
|
||||
{
|
||||
block.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
protected List<TopicArray> GetDeviceTopicArray(IEnumerable<DevModel> item)
|
||||
{
|
||||
IEnumerable<dynamic>? data = Application.DynamicModelExtension.GetDynamicModel<DevModel>(item, _businessPropertyWithCacheIntervalScript.BigTextScriptDeviceModel);
|
||||
@@ -436,7 +457,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
|
||||
{
|
||||
// 如果是设备列表,则将整个分组转换为 JSON 字符串
|
||||
var json = Serialize(group.Select(a => a).ToList());
|
||||
var json = Serialize(group.Select(a => a).ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -445,7 +466,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
// 如果不是设备列表,则将每个分组元素分别转换为 JSON 字符串
|
||||
foreach (var gro in group)
|
||||
{
|
||||
var json = Serialize(gro);
|
||||
var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -458,14 +479,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
{
|
||||
if (_businessPropertyWithCacheIntervalScript.IsDeviceList)
|
||||
{
|
||||
var json = Serialize(data.Select(a => a).ToList());
|
||||
var json = Serialize(data.Select(a => a).ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json));
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var group in data)
|
||||
{
|
||||
var json = Serialize(group);
|
||||
var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.DeviceTopic, json));
|
||||
}
|
||||
}
|
||||
@@ -501,7 +522,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
if (_businessPropertyWithCacheIntervalScript.IsVariableList)
|
||||
{
|
||||
// 如果是变量列表,则将整个分组转换为 JSON 字符串
|
||||
var json = Serialize(group.Select(a => a).ToList());
|
||||
var json = Serialize(group.Select(a => a).ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -510,7 +531,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
// 如果不是变量列表,则将每个分组元素分别转换为 JSON 字符串
|
||||
foreach (var gro in group)
|
||||
{
|
||||
var json = Serialize(gro);
|
||||
var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -523,14 +544,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
{
|
||||
if (_businessPropertyWithCacheIntervalScript.IsVariableList)
|
||||
{
|
||||
var json = Serialize(data.Select(a => a).ToList());
|
||||
var json = Serialize(data.Select(a => a).ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var group in data)
|
||||
{
|
||||
var json = Serialize(group);
|
||||
var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
|
||||
}
|
||||
}
|
||||
@@ -538,7 +559,6 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
return topicJsonList;
|
||||
}
|
||||
|
||||
|
||||
protected List<TopicArray> GetVariableBasicDataTopicArray(IEnumerable<VariableBasicData> item)
|
||||
{
|
||||
IEnumerable<VariableBasicData>? data = null;
|
||||
@@ -576,7 +596,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
if (_businessPropertyWithCacheIntervalScript.IsVariableList)
|
||||
{
|
||||
// 如果是变量列表,则将整个分组转换为 JSON 字符串
|
||||
var json = Serialize(group.Select(a => a).ToList());
|
||||
var json = Serialize(group.Select(a => a).ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -585,7 +605,7 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
// 如果不是变量列表,则将每个分组元素分别转换为 JSON 字符串
|
||||
foreach (var gro in group)
|
||||
{
|
||||
var json = Serialize(gro);
|
||||
var json = Serialize(gro, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
// 将主题和 JSON 内容添加到列表中
|
||||
topicJsonList.Add(new(topic, json));
|
||||
}
|
||||
@@ -598,14 +618,14 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
{
|
||||
if (_businessPropertyWithCacheIntervalScript.IsVariableList)
|
||||
{
|
||||
var json = Serialize(data.Select(a => a).ToList());
|
||||
var json = Serialize(data.Select(a => a).ToList(), _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
|
||||
}
|
||||
else
|
||||
{
|
||||
foreach (var group in data)
|
||||
{
|
||||
var json = Serialize(group);
|
||||
var json = Serialize(group, _businessPropertyWithCacheIntervalScript.JsonFormattingIndented);
|
||||
topicJsonList.Add(new(_businessPropertyWithCacheIntervalScript.VariableTopic, json));
|
||||
}
|
||||
}
|
||||
@@ -614,5 +634,9 @@ public abstract partial class BusinessBaseWithCacheIntervalScript<VarModel, DevM
|
||||
}
|
||||
|
||||
|
||||
protected string GetString(string topic, byte[] json, int count)
|
||||
{
|
||||
return $"Topic:{topic}{Environment.NewLine}PayLoad:{Encoding.UTF8.GetString(json)} {Environment.NewLine} VarModelQueue:{count}";
|
||||
}
|
||||
#endregion 封装方法
|
||||
}
|
||||
|
@@ -12,11 +12,12 @@ namespace ThingsGateway.Gateway.Application;
|
||||
|
||||
public struct TopicArray
|
||||
{
|
||||
public TopicArray(string topic, ArraySegment<byte> json)
|
||||
public TopicArray(string topic, byte[] json)
|
||||
{
|
||||
Topic = topic; Json = json;
|
||||
}
|
||||
|
||||
public ArraySegment<byte> Json { get; set; }
|
||||
public byte[] Json { get; set; }
|
||||
public string Topic { get; set; }
|
||||
|
||||
}
|
@@ -140,7 +140,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
|
||||
/// <summary>
|
||||
/// 缓存超时
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "缓存超时")]
|
||||
[SugarColumn(ColumnDescription = "缓存超时", IsNullable = true, DefaultValue = "500")]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
[MinValue(100)]
|
||||
public override int CacheTimeout { get; set; } = 500;
|
||||
@@ -148,7 +148,7 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
|
||||
/// <summary>
|
||||
/// 连接超时
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "连接超时")]
|
||||
[SugarColumn(ColumnDescription = "连接超时", IsNullable = true, DefaultValue = "3000")]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
[MinValue(100)]
|
||||
public override ushort ConnectTimeout { get; set; } = 3000;
|
||||
@@ -156,33 +156,36 @@ public class Channel : ChannelOptionsBase, IPrimaryIdEntity, IBaseDataEntity, IB
|
||||
/// <summary>
|
||||
/// 最大并发数
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "最大并发数")]
|
||||
[SugarColumn(ColumnDescription = "最大并发数", IsNullable = true, DefaultValue = "1")]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
[MinValue(1)]
|
||||
public override int MaxConcurrentCount { get; set; } = 1;
|
||||
|
||||
[SugarColumn(ColumnDescription = "最大连接数")]
|
||||
[SugarColumn(ColumnDescription = "最大连接数", IsNullable = true, DefaultValue = "10000")]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
public override int MaxClientCount { get; set; } = 10000;
|
||||
[SugarColumn(ColumnDescription = "客户端滑动过期时间")]
|
||||
|
||||
[SugarColumn(ColumnDescription = "客户端滑动过期时间", IsNullable = true, DefaultValue = "120000")]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
public override int CheckClearTime { get; set; } = 120000;
|
||||
|
||||
[SugarColumn(ColumnDescription = "心跳内容", IsNullable = true)]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
public override string Heartbeat { get; set; } = "Heartbeat";
|
||||
|
||||
#region dtu终端
|
||||
|
||||
[SugarColumn(ColumnDescription = "心跳间隔")]
|
||||
[SugarColumn(ColumnDescription = "心跳间隔", IsNullable = true, DefaultValue = "60000")]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
public override int HeartbeatTime { get; set; } = 60000;
|
||||
|
||||
[SugarColumn(ColumnDescription = "DtuId", IsNullable = true)]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
public override string DtuId { get; set; }
|
||||
|
||||
#endregion
|
||||
|
||||
[SugarColumn(ColumnDescription = "Dtu类型")]
|
||||
[SugarColumn(ColumnDescription = "Dtu类型", IsNullable = true, DefaultValue = "0")]
|
||||
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true)]
|
||||
public override DtuSeviceType DtuSeviceType { get; set; }
|
||||
|
||||
|
@@ -56,7 +56,7 @@ public class Device : BaseDataEntity, IValidatableObject
|
||||
/// <summary>
|
||||
/// 通道
|
||||
/// </summary>
|
||||
[SugarColumn(ColumnDescription = "通道", Length = 200)]
|
||||
[SugarColumn(ColumnDescription = "通道")]
|
||||
[AutoGenerateColumn(Ignore = true)]
|
||||
[IgnoreExcel]
|
||||
[MinValue(1)]
|
||||
|
@@ -131,7 +131,7 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
|
||||
|
||||
public void Dispose()
|
||||
{
|
||||
Config?.SafeDispose();
|
||||
//Config?.SafeDispose();
|
||||
|
||||
GlobalData.Channels.TryRemove(Id, out _);
|
||||
DeviceThreadManage = null;
|
||||
@@ -146,4 +146,57 @@ public class ChannelRuntime : Channel, IChannelOptions, IDisposable
|
||||
return $"{Name}[{base.ToString()}]";
|
||||
}
|
||||
|
||||
|
||||
public IChannel GetChannel(TouchSocketConfig config)
|
||||
{
|
||||
lock (GlobalData.Channels)
|
||||
{
|
||||
|
||||
if (DeviceThreadManage?.Channel?.DisposedValue == false)
|
||||
return DeviceThreadManage?.Channel;
|
||||
|
||||
|
||||
if (ChannelType == ChannelTypeEnum.TcpService
|
||||
|| ChannelType == ChannelTypeEnum.SerialPort
|
||||
|| ChannelType == ChannelTypeEnum.UdpSession
|
||||
)
|
||||
{
|
||||
//获取相同配置的Tcp服务或Udp服务或COM
|
||||
var same = GlobalData.Channels.FirstOrDefault(a =>
|
||||
{
|
||||
if (a.Value == this)
|
||||
return false;
|
||||
if (a.Value.DeviceThreadManage?.Channel?.DisposedValue == true || a.Value.DeviceThreadManage?.Channel?.DisposedValue == null)
|
||||
return false;
|
||||
|
||||
if (a.Value.ChannelType == ChannelType)
|
||||
{
|
||||
if (a.Value.ChannelType == ChannelTypeEnum.TcpService)
|
||||
if (a.Value.BindUrl == BindUrl)
|
||||
return true;
|
||||
if (a.Value.ChannelType == ChannelTypeEnum.UdpSession)
|
||||
if ((!BindUrl.IsNullOrWhiteSpace()) && a.Value.BindUrl == BindUrl)
|
||||
return true;
|
||||
if (a.Value.ChannelType == ChannelTypeEnum.SerialPort)
|
||||
if (a.Value.PortName == PortName)
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}).Value;
|
||||
|
||||
if (same != null)
|
||||
{
|
||||
return same.GetChannel(config);
|
||||
}
|
||||
}
|
||||
|
||||
if (DeviceThreadManage?.Channel?.DisposedValue == false)
|
||||
return DeviceThreadManage?.Channel;
|
||||
|
||||
var ichannel = config.GetChannel(this);
|
||||
return ichannel;
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
@@ -216,16 +216,7 @@ public class ChannelRuntimeService : IChannelRuntimeService
|
||||
await RuntimeServiceHelper.InitAsync(newChannelRuntimes, newDeviceRuntimes, _logger).ConfigureAwait(false);
|
||||
|
||||
|
||||
var startCollectChannelEnable = GlobalData.StartCollectChannelEnable;
|
||||
var startBusinessChannelEnable = GlobalData.StartBusinessChannelEnable;
|
||||
|
||||
var collectChannelRuntimes = newChannelRuntimes.Where(x => (x.Enable && x.IsCollect == true && startCollectChannelEnable));
|
||||
|
||||
var businessChannelRuntimes = newChannelRuntimes.Where(x => (x.Enable && x.IsCollect == false && startBusinessChannelEnable));
|
||||
|
||||
//根据初始冗余属性,筛选启动
|
||||
await GlobalData.ChannelThreadManage.RestartChannelAsync(businessChannelRuntimes).ConfigureAwait(false);
|
||||
await GlobalData.ChannelThreadManage.RestartChannelAsync(collectChannelRuntimes).ConfigureAwait(false);
|
||||
await GlobalData.ChannelThreadManage.RestartChannelAsync(newChannelRuntimes).ConfigureAwait(false);
|
||||
|
||||
}
|
||||
catch (Exception ex)
|
||||
|
@@ -329,8 +329,8 @@ internal sealed class ChannelService : BaseService<Channel>, IChannelService
|
||||
ManageHelper.CheckChannelCount(insertData.Count);
|
||||
|
||||
using var db = GetDB();
|
||||
await db.Fastest<Channel>().PageSize(100000).BulkCopyAsync(insertData).ConfigureAwait(false);
|
||||
await db.Fastest<Channel>().PageSize(100000).BulkUpdateAsync(upData).ConfigureAwait(false);
|
||||
await db.BulkCopyAsync(insertData, 100000).ConfigureAwait(false);
|
||||
await db.BulkUpdateAsync(upData, 100000).ConfigureAwait(false);
|
||||
DeleteChannelFromCache();
|
||||
return channels.Select(a => a.Id).ToHashSet();
|
||||
}
|
||||
|
@@ -351,8 +351,8 @@ internal sealed class DeviceService : BaseService<Device>, IDeviceService
|
||||
ManageHelper.CheckDeviceCount(insertData.Count);
|
||||
|
||||
using var db = GetDB();
|
||||
await db.Fastest<Device>().PageSize(100000).BulkCopyAsync(insertData).ConfigureAwait(false);
|
||||
await db.Fastest<Device>().PageSize(100000).BulkUpdateAsync(upData).ConfigureAwait(false);
|
||||
await db.BulkCopyAsync(insertData, 100000).ConfigureAwait(false);
|
||||
await db.BulkUpdateAsync(upData, 100000).ConfigureAwait(false);
|
||||
DeleteDeviceFromCache();
|
||||
return devices.Select(a => a.Id).ToHashSet();
|
||||
}
|
||||
|
@@ -16,8 +16,6 @@ using System.Collections.Concurrent;
|
||||
|
||||
using ThingsGateway.NewLife;
|
||||
|
||||
using TouchSocket.Core;
|
||||
|
||||
namespace ThingsGateway.Gateway.Application;
|
||||
|
||||
internal sealed class ChannelThreadManage : IChannelThreadManage
|
||||
@@ -115,8 +113,6 @@ internal sealed class ChannelThreadManage : IChannelThreadManage
|
||||
{
|
||||
await PrivateRemoveChannelsAsync(channelRuntimes.Select(a => a.Id)).ConfigureAwait(false);
|
||||
|
||||
BytePool.Default.Clear();
|
||||
|
||||
await channelRuntimes.ParallelForEachAsync(async (channelRuntime, token) =>
|
||||
{
|
||||
try
|
||||
|
@@ -117,10 +117,9 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
|
||||
// 添加默认日志记录器
|
||||
LogMessage.AddLogger(new EasyLogger(logger.Log_Out) { LogLevel = TouchSocket.Core.LogLevel.Trace });
|
||||
|
||||
var ichannel = config.GetChannel(channelRuntime);
|
||||
|
||||
// 根据配置获取通道实例
|
||||
Channel = ichannel;
|
||||
Channel = channelRuntime.GetChannel(config);
|
||||
|
||||
|
||||
//初始设置输出文本日志
|
||||
SetLog(CurrentChannel.LogLevel);
|
||||
@@ -901,7 +900,8 @@ internal sealed class DeviceThreadManage : IAsyncDisposable, IDeviceThreadManage
|
||||
await NewDeviceLock.WaitAsync().ConfigureAwait(false);
|
||||
|
||||
await PrivateRemoveDevicesAsync(Drivers.Keys).ConfigureAwait(false);
|
||||
Channel?.SafeDispose();
|
||||
if (Channel?.Collects.Count == 0)
|
||||
Channel?.SafeDispose();
|
||||
|
||||
LogMessage?.LogInformation(Localizer["ChannelDispose", CurrentChannel?.Name ?? string.Empty]);
|
||||
|
||||
|
@@ -71,16 +71,7 @@ internal sealed class GatewayMonitorHostedService : BackgroundService, IGatewayM
|
||||
}
|
||||
}
|
||||
|
||||
var startCollectChannelEnable = GlobalData.StartCollectChannelEnable;
|
||||
var startBusinessChannelEnable = GlobalData.StartBusinessChannelEnable;
|
||||
|
||||
var collectChannelRuntimes = channelRuntimes.Where(x => (x.Enable && x.IsCollect == true && startCollectChannelEnable));
|
||||
|
||||
var businessChannelRuntimes = channelRuntimes.Where(x => (x.Enable && x.IsCollect == false && startBusinessChannelEnable));
|
||||
|
||||
//根据初始冗余属性,筛选启动
|
||||
await ChannelThreadManage.RestartChannelAsync(businessChannelRuntimes).ConfigureAwait(false);
|
||||
await ChannelThreadManage.RestartChannelAsync(collectChannelRuntimes).ConfigureAwait(false);
|
||||
await ChannelThreadManage.RestartChannelAsync(channelRuntimes).ConfigureAwait(false);
|
||||
|
||||
|
||||
}
|
||||
|
@@ -310,7 +310,6 @@ internal static class RuntimeServiceHelper
|
||||
}
|
||||
}
|
||||
|
||||
item.Value.Dispose();
|
||||
}
|
||||
if (group.Key != null)
|
||||
{
|
||||
@@ -321,6 +320,19 @@ internal static class RuntimeServiceHelper
|
||||
}
|
||||
}
|
||||
}
|
||||
public static void VariableRuntimesDispose(IEnumerable<long> variableIds)
|
||||
{
|
||||
|
||||
foreach (var variableId in variableIds)
|
||||
{
|
||||
|
||||
if (GlobalData.IdVariables.TryGetValue(variableId, out var variableRuntime))
|
||||
{
|
||||
variableRuntime.Dispose();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
public static void AddCollectChangedDriver(IEnumerable<VariableRuntime> newVariableRuntimes, ConcurrentHashSet<IDriver> changedDriver)
|
||||
|
@@ -43,10 +43,10 @@ public class VariableRuntimeService : IVariableRuntimeService
|
||||
//获取变量,先找到原插件线程,然后修改插件线程内的字典,再改动全局字典,最后刷新插件
|
||||
|
||||
ConcurrentHashSet<IDriver> changedDriver = new();
|
||||
|
||||
RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
|
||||
RuntimeServiceHelper.AddCollectChangedDriver(newVariableRuntimes, changedDriver);
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
|
||||
RuntimeServiceHelper.AddCollectChangedDriver(newVariableRuntimes, changedDriver);
|
||||
|
||||
if (restart)
|
||||
{
|
||||
@@ -79,9 +79,9 @@ public class VariableRuntimeService : IVariableRuntimeService
|
||||
|
||||
ConcurrentHashSet<IDriver> changedDriver = new();
|
||||
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
|
||||
RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
|
||||
RuntimeServiceHelper.AddCollectChangedDriver(newVariableRuntimes, changedDriver);
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
|
||||
if (restart)
|
||||
{
|
||||
@@ -111,6 +111,7 @@ public class VariableRuntimeService : IVariableRuntimeService
|
||||
ConcurrentHashSet<IDriver> changedDriver = new();
|
||||
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
|
||||
|
||||
if (restart)
|
||||
{
|
||||
@@ -144,10 +145,9 @@ public class VariableRuntimeService : IVariableRuntimeService
|
||||
var variableIds = newVariableRuntimes.Select(a => a.Id).ToHashSet();
|
||||
|
||||
ConcurrentHashSet<IDriver> changedDriver = new();
|
||||
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
|
||||
RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
|
||||
RuntimeServiceHelper.AddCollectChangedDriver(newVariableRuntimes, changedDriver);
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
|
||||
if (restart)
|
||||
{
|
||||
@@ -237,10 +237,9 @@ public class VariableRuntimeService : IVariableRuntimeService
|
||||
|
||||
ConcurrentHashSet<IDriver> changedDriver = new();
|
||||
|
||||
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
|
||||
RuntimeServiceHelper.VariableRuntimesDispose(variableIds);
|
||||
RuntimeServiceHelper.AddCollectChangedDriver(newVariableRuntimes, changedDriver);
|
||||
RuntimeServiceHelper.AddBusinessChangedDriver(variableIds, changedDriver);
|
||||
|
||||
if (restart)
|
||||
{
|
||||
|
@@ -217,9 +217,9 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
|
||||
|
||||
var result = await db.UseTranAsync(async () =>
|
||||
{
|
||||
await db.Fastest<Channel>().PageSize(100000).BulkCopyAsync(newChannels).ConfigureAwait(false);
|
||||
await db.Fastest<Device>().PageSize(100000).BulkCopyAsync(newDevices).ConfigureAwait(false);
|
||||
await db.Fastest<Variable>().PageSize(100000).BulkCopyAsync(newVariables).ConfigureAwait(false);
|
||||
await db.BulkCopyAsync(newChannels, 100000).ConfigureAwait(false);
|
||||
await db.BulkCopyAsync(newDevices, 100000).ConfigureAwait(false);
|
||||
await db.BulkCopyAsync(newVariables, 100000).ConfigureAwait(false);
|
||||
}).ConfigureAwait(false);
|
||||
if (result.IsSuccess)//如果成功了
|
||||
{
|
||||
@@ -486,8 +486,8 @@ internal sealed class VariableService : BaseService<Variable>, IVariableService
|
||||
var insertData = variables.Where(a => !a.IsUp).ToList();
|
||||
ManageHelper.CheckVariableCount(insertData.Count);
|
||||
using var db = GetDB();
|
||||
await db.Fastest<Variable>().PageSize(100000).BulkCopyAsync(insertData).ConfigureAwait(false);
|
||||
await db.Fastest<Variable>().PageSize(100000).BulkUpdateAsync(upData).ConfigureAwait(false);
|
||||
await db.BulkCopyAsync(insertData, 100000).ConfigureAwait(false);
|
||||
await db.BulkUpdateAsync(upData, 100000).ConfigureAwait(false);
|
||||
_dispatchService.Dispatch(new());
|
||||
DeleteVariableCache();
|
||||
return variables.Select(a => a.Id).ToHashSet();
|
||||
|
@@ -10,6 +10,10 @@
|
||||
|
||||
using Mapster;
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.Hosting;
|
||||
using Microsoft.Extensions.Logging;
|
||||
|
||||
using System.Reflection;
|
||||
|
||||
namespace ThingsGateway.Gateway.Application;
|
||||
@@ -17,7 +21,7 @@ namespace ThingsGateway.Gateway.Application;
|
||||
[AppStartup(-100)]
|
||||
public class Startup : AppStartup
|
||||
{
|
||||
public void ConfigureAdminApp(IServiceCollection services)
|
||||
public void Configure(IServiceCollection services)
|
||||
{
|
||||
services.AddConfigurableOptions<ChannelThreadOptions>();
|
||||
services.AddConfigurableOptions<GatewayLogOptions>();
|
||||
@@ -62,8 +66,9 @@ public class Startup : AppStartup
|
||||
services.AddGatewayHostedService<IGatewayMonitorHostedService, GatewayMonitorHostedService>();
|
||||
}
|
||||
|
||||
public void UseAdminCore(IServiceProvider serviceProvider)
|
||||
public void Use(IApplicationBuilder applicationBuilder)
|
||||
{
|
||||
var serviceProvider = applicationBuilder.ApplicationServices;
|
||||
//检查ConfigId
|
||||
var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);
|
||||
foreach (var configId in configIdGroup)
|
||||
@@ -71,6 +76,7 @@ public class Startup : AppStartup
|
||||
if (configId.Count() > 1) throw new($"Sqlsugar connect configId: {configId.Key} Duplicate!");
|
||||
}
|
||||
|
||||
|
||||
//遍历配置
|
||||
DbContext.DbConfigs?.ForEach(it =>
|
||||
{
|
||||
@@ -79,7 +85,55 @@ public class Startup : AppStartup
|
||||
if (it.InitTable == true)
|
||||
connection.DbMaintenance.CreateDatabase();//创建数据库,如果存在则不创建
|
||||
});
|
||||
|
||||
|
||||
//兼容变量名称唯一键处理
|
||||
try
|
||||
{
|
||||
using var db = DbContext.GetDB<Variable>();
|
||||
if (db.DbMaintenance.IsAnyIndex("unique_variable_name"))
|
||||
{
|
||||
var tables = db.DbMaintenance.DropIndex("unique_variable_name");
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
|
||||
var fullName = Assembly.GetExecutingAssembly().FullName;//获取程序集全名
|
||||
CodeFirstUtils.CodeFirst(fullName!);//CodeFirst
|
||||
|
||||
|
||||
|
||||
//10.4.9 删除logenable
|
||||
try
|
||||
{
|
||||
using var db = DbContext.GetDB<Channel>();
|
||||
if (db.DbMaintenance.IsAnyColumn(nameof(Channel), "LogEnable", false))
|
||||
{
|
||||
var tables = db.DbMaintenance.DropColumn(nameof(Channel), "LogEnable");
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
try
|
||||
{
|
||||
using var db = DbContext.GetDB<Device>();
|
||||
if (db.DbMaintenance.IsAnyColumn(nameof(Device), "LogEnable", false))
|
||||
{
|
||||
var tables = db.DbMaintenance.DropColumn(nameof(Device), "LogEnable");
|
||||
}
|
||||
}
|
||||
catch { }
|
||||
|
||||
|
||||
|
||||
|
||||
serviceProvider.GetService<IHostApplicationLifetime>().ApplicationStarted.Register(() =>
|
||||
{
|
||||
serviceProvider.GetService<ILoggerFactory>().CreateLogger(nameof(ThingsGateway)).LogInformation("ThingsGateway is started...");
|
||||
});
|
||||
serviceProvider.GetService<IHostApplicationLifetime>().ApplicationStopping.Register(() =>
|
||||
{
|
||||
serviceProvider.GetService<ILoggerFactory>().CreateLogger(nameof(ThingsGateway)).LogInformation("ThingsGateway is stopping...");
|
||||
});
|
||||
}
|
||||
}
|
||||
|
@@ -7,10 +7,9 @@
|
||||
</PropertyGroup>
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
|
||||
<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.6" />
|
||||
<PackageReference Include="Rougamo.Fody" Version="5.0.0" />
|
||||
<PackageReference Include="TouchSocket.Dmtp" Version="3.0.25" />
|
||||
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.0.25" />
|
||||
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.0" />
|
||||
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.0" />
|
||||
<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />
|
||||
|
||||
</ItemGroup>
|
||||
|
@@ -105,8 +105,8 @@ public class TcpSessionClientDto
|
||||
public string PluginInfos { get; set; }
|
||||
|
||||
[AutoGenerateColumn(Searchable = true, Filterable = true, Sortable = true)]
|
||||
public DateTime LastReceivedTime { get; set; }
|
||||
public DateTimeOffset LastReceivedTime { get; set; }
|
||||
|
||||
[AutoGenerateColumn(Searchable = true, Filterable = true, Sortable = true)]
|
||||
public DateTime LastSentTime { get; set; }
|
||||
public DateTimeOffset LastSentTime { get; set; }
|
||||
}
|
||||
|
@@ -1299,6 +1299,7 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
|
||||
try
|
||||
{
|
||||
if (Disposed) return;
|
||||
await Task.Delay(2000);
|
||||
await OnClickSearch(SearchText);
|
||||
|
||||
Value = GetValue(Value);
|
||||
@@ -1310,7 +1311,6 @@ EventCallback.Factory.Create<MouseEventArgs>(this, async e =>
|
||||
}
|
||||
finally
|
||||
{
|
||||
await Task.Delay(2000);
|
||||
_isExecuting = false;
|
||||
}
|
||||
}
|
||||
|
@@ -15,7 +15,7 @@ namespace ThingsGateway.Gateway.Razor;
|
||||
[AppStartup(-1000)]
|
||||
public class Startup : AppStartup
|
||||
{
|
||||
public void ConfigureAdminApp(IServiceCollection services)
|
||||
public void Configure(IServiceCollection services)
|
||||
{
|
||||
services.AddBootstrapBlazorWinBoxService();
|
||||
}
|
||||
|
@@ -15,7 +15,7 @@ using TouchSocket.Rpc;
|
||||
|
||||
namespace ThingsGateway.Management;
|
||||
|
||||
public partial class ReverseCallbackServer : RpcServer
|
||||
public partial class ReverseCallbackServer : SingletonRpcServer
|
||||
{
|
||||
[DmtpRpc(MethodInvoke = true)]
|
||||
public void UpdateGatewayData(List<DeviceDataWithValue> deviceDatas)
|
||||
|
@@ -4,12 +4,19 @@
|
||||
@if (WebsiteOption.Value.ShowAuthorize)
|
||||
{
|
||||
|
||||
<Card class="mb-2">
|
||||
<Card class="h-100">
|
||||
<BodyTemplate>
|
||||
<div class="ma-1">
|
||||
<span>@Localizer["UUID"]</span>
|
||||
<div class="my-2 ms-4 text-truncate">
|
||||
<Textarea Value="@ProAuthentication.UUID" rows="5" />
|
||||
<div class="row g-3 form-inline">
|
||||
<div class="col-12 col-sm-12">
|
||||
|
||||
<label class="form-label">
|
||||
|
||||
@Localizer["UUID"]
|
||||
</label>
|
||||
|
||||
<Textarea Value="@ProAuthentication.UUID" rows="5" />
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<PopConfirmButton Size="Size.Small" Color="Color.Success" Icon="fa-solid fa-bars" Text="@Localizer["Register"]" IsAsync OnConfirm="Register">
|
||||
@@ -22,7 +29,7 @@
|
||||
|
||||
</div>
|
||||
|
||||
<div class="ma-1">
|
||||
<div class="ma-1 mt-4">
|
||||
|
||||
<div class="row g-3 form-inline">
|
||||
<div class="col-12 col-sm-12">
|
||||
|
@@ -9,21 +9,21 @@
|
||||
@namespace ThingsGateway.Management
|
||||
|
||||
|
||||
<div class=@($"{ClassString} row my-2 mx-2") style="min-height:500px;height: 50%;">
|
||||
<div class=@($"{ClassString} row g-0 h-100 mx-2") style="min-height:500px;">
|
||||
|
||||
<div class="col-12 h-100">
|
||||
<div class="col-12 col-md-6 h-100">
|
||||
|
||||
<EditComponent Model="Model" OnSave="OnSaveRedundancy"/>
|
||||
<EditComponent ItemsPerRow=1 Model="Model" OnSave="OnSaveRedundancy" />
|
||||
|
||||
</div>
|
||||
<div class="col-12 ">
|
||||
<div class="col-12 col-md-6 h-100">
|
||||
|
||||
@if (Logger != null)
|
||||
{
|
||||
<LogConsole HeightString="500px" LogLevel=@(Logger.LogLevel) LogLevelChanged="(a)=>{
|
||||
@if (Logger != null)
|
||||
{
|
||||
<LogConsole LogLevel=@(Logger.LogLevel) LogLevelChanged="(a)=>{
|
||||
Logger.LogLevel=a;
|
||||
}" LogPath=@LogPath HeaderText=@HeaderText></LogConsole>
|
||||
}
|
||||
}
|
||||
</div>
|
||||
</div>
|
||||
|
||||
|
@@ -19,7 +19,7 @@
|
||||
|
||||
<TabItem Text=@RedundancyLocalizer[nameof(RedundancyOptions)]>
|
||||
|
||||
<Card class="mb-2">
|
||||
<Card class="h-100">
|
||||
|
||||
<HeaderTemplate>
|
||||
|
||||
@@ -52,7 +52,7 @@
|
||||
|
||||
<TabItem Text=@ManagementLocalizer["Restart"]>
|
||||
|
||||
<Card class="mb-2">
|
||||
<Card class="h-100">
|
||||
|
||||
<BodyTemplate>
|
||||
|
||||
|
@@ -14,9 +14,7 @@
|
||||
|
||||
<div class="col-12 col-md-8 p-1">
|
||||
|
||||
<div class="p-1">
|
||||
<Button IsAsync Color="Color.Primary" OnClick="OnUpdate">@ManagementLocalizer["Update"]</Button>
|
||||
</div>
|
||||
<Button IsAsync Color="Color.Primary" OnClick="OnUpdate">@ManagementLocalizer["Update"]</Button>
|
||||
|
||||
</div>
|
||||
<div class="col-12 col-md-4 p-1">
|
@@ -8,6 +8,8 @@
|
||||
// QQ群:605534569
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
|
||||
using System.Reflection;
|
||||
|
||||
using ThingsGateway.Gateway.Application;
|
||||
@@ -18,7 +20,7 @@ namespace ThingsGateway.Management;
|
||||
[AppStartup(10000000)]
|
||||
public class Startup : AppStartup
|
||||
{
|
||||
public void ConfigureAdminApp(IServiceCollection services)
|
||||
public void Configure(IServiceCollection services)
|
||||
{
|
||||
services.AddSingleton<IRedundancyService, RedundancyService>();
|
||||
services.AddGatewayHostedService<IRedundancyHostedService, RedundancyHostedService>();
|
||||
@@ -29,8 +31,9 @@ public class Startup : AppStartup
|
||||
}
|
||||
|
||||
|
||||
public void UseAdminCore(IServiceProvider serviceProvider)
|
||||
public void Use(IApplicationBuilder applicationBuilder)
|
||||
{
|
||||
var serviceProvider = applicationBuilder.ApplicationServices;
|
||||
//检查ConfigId
|
||||
var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);
|
||||
foreach (var configId in configIdGroup)
|
||||
|
@@ -13,7 +13,7 @@ using TouchSocket.Rpc;
|
||||
|
||||
namespace ThingsGateway.Management;
|
||||
|
||||
public partial class UpgradeRpcServer : RpcServer
|
||||
public partial class UpgradeRpcServer : SingletonRpcServer
|
||||
{
|
||||
[DmtpRpc(MethodInvoke = true)]
|
||||
public void Restart()
|
||||
|
@@ -8,6 +8,7 @@
|
||||
// QQ群:605534569
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
using System.Reflection;
|
||||
@@ -20,15 +21,16 @@ namespace ThingsGateway.Management;
|
||||
[AppStartup(10000000)]
|
||||
public class Startup : AppStartup
|
||||
{
|
||||
public void ConfigureAdminApp(IServiceCollection services)
|
||||
public void Configure(IServiceCollection services)
|
||||
{
|
||||
services.AddSingleton<IRulesService, RulesService>();
|
||||
services.AddGatewayHostedService<IRulesEngineHostedService, RulesEngineHostedService>();
|
||||
}
|
||||
|
||||
|
||||
public void UseAdminCore(IServiceProvider serviceProvider)
|
||||
public void Use(IApplicationBuilder applicationBuilder)
|
||||
{
|
||||
var serviceProvider = applicationBuilder.ApplicationServices;
|
||||
//检查ConfigId
|
||||
var configIdGroup = DbContext.DbConfigs.GroupBy(it => it.ConfigId);
|
||||
foreach (var configId in configIdGroup)
|
||||
|
@@ -20,7 +20,7 @@
|
||||
<h4>
|
||||
<a id="user-content-演示" class="anchor" href="#%E6%BC%94%E7%A4%BA"></a>演示
|
||||
</h4>
|
||||
<p><a href="http://47.119.161.158:5000/">ThingsGateway演示地址</a></p>
|
||||
<p><a href="https://demo.thingsgateway.cn/">ThingsGateway演示地址</a></p>
|
||||
<p>账户 : <strong>SuperAdmin</strong></p>
|
||||
<p>密码 : <strong>111111</strong></p>
|
||||
<p><strong>右上角个人弹出框中,切换到物联网关模块</strong></p>
|
||||
|
@@ -8,6 +8,7 @@
|
||||
// QQ群:605534569
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using Microsoft.AspNetCore.Builder;
|
||||
using Microsoft.Extensions.DependencyInjection;
|
||||
|
||||
namespace ThingsGateway.Debug;
|
||||
@@ -22,7 +23,7 @@ public class Startup : AppStartup
|
||||
.AddScoped<IMenuService, DefaultMenuService>();
|
||||
}
|
||||
|
||||
public void UseService(IServiceProvider serviceProvider)
|
||||
public void Use(IApplicationBuilder applicationBuilder)
|
||||
{
|
||||
}
|
||||
}
|
||||
|
@@ -12,7 +12,7 @@
|
||||
|
||||
<ItemGroup>
|
||||
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.375.457" />
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.376.213" />
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
|
File diff suppressed because it is too large
Load Diff
@@ -184,7 +184,7 @@ public static class JsonUtils
|
||||
/// CreateEncoder
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
private static OPCUAJsonEncoder CreateEncoder(
|
||||
private static JsonEncoder CreateEncoder(
|
||||
IServiceMessageContext context,
|
||||
Stream stream,
|
||||
bool useReversibleEncoding = false,
|
||||
@@ -193,14 +193,14 @@ public static class JsonUtils
|
||||
bool includeDefaultNumbers = true
|
||||
)
|
||||
{
|
||||
return new OPCUAJsonEncoder(context, useReversibleEncoding, topLevelIsArray, stream)
|
||||
return new JsonEncoder(context, useReversibleEncoding, topLevelIsArray, stream)
|
||||
{
|
||||
IncludeDefaultValues = includeDefaultValues,
|
||||
IncludeDefaultNumberValues = includeDefaultNumbers
|
||||
};
|
||||
}
|
||||
|
||||
private static void Encode(OPCUAJsonEncoder encoder, BuiltInType builtInType, string fieldName, object value)
|
||||
private static void Encode(JsonEncoder encoder, BuiltInType builtInType, string fieldName, object value)
|
||||
{
|
||||
bool isArray = (value?.GetType().IsArray ?? false) && (builtInType != BuiltInType.ByteString);
|
||||
bool isCollection = (value is IList) && (builtInType != BuiltInType.ByteString);
|
||||
|
@@ -1,6 +1,28 @@
|
||||
<Project>
|
||||
|
||||
|
||||
|
||||
|
||||
<Target Name="CopyNugetPackages" AfterTargets="Build">
|
||||
<ItemGroup>
|
||||
<!-- setting up the variable for convenience -->
|
||||
<!--<SqlSugar_QuestDb_RestAPIApplicationPackageFiles Include="$(PkgSqlSugar_QuestDb_RestAPI)\lib\netstandard2.1\*.*" />
|
||||
<CsvHelperApplicationPackageFiles Include="$(PkgCsvHelper)\lib\net8.0\*.*" />-->
|
||||
<SqlSugar_TDengineCoreApplicationPackageFiles Include="$(PkgSqlSugar_TDengineCore)\lib\netstandard2.1\*.*" />
|
||||
<TDengine_Ado_DataApplicationPackageFiles Include="$(PkgTDengine_Ado_Data)\lib\netstandard2.1\*.*" />
|
||||
<TDengine_ConnectorPackageFiles Include="$(PkgTDengine_Connector)\lib\net6.0\*.*" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup>
|
||||
<ApplicationFolder>$(TargetDir)</ApplicationFolder>
|
||||
</PropertyGroup>
|
||||
<Copy SourceFiles="@(SqlSugar_QuestDb_RestAPIApplicationPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
|
||||
<Copy SourceFiles="@(CsvHelperApplicationPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
|
||||
<Copy SourceFiles="@(SqlSugar_TDengineCoreApplicationPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
|
||||
<Copy SourceFiles="@(TDengine_Ado_DataApplicationPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
|
||||
<Copy SourceFiles="@(TDengine_ConnectorPackageFiles)" DestinationFolder="$(ApplicationFolder)%(RecursiveDir)" />
|
||||
</Target>
|
||||
|
||||
|
||||
<!--在构建后触发的。它通过在 Nuget 包的 Content 文件夹中包含目标目录中的所有文件和子文件夹来创建 nuget 包-->
|
||||
<Target Name="IncludeAllFilesInTargetDir" AfterTargets="Build">
|
||||
|
||||
@@ -9,6 +31,18 @@
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>Content</PackagePath>
|
||||
</Content>
|
||||
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*TDengine*.dll">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>Content</PackagePath>
|
||||
</Content>
|
||||
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*QuestDb*.dll">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>Content</PackagePath>
|
||||
</Content>
|
||||
<Content Include="$(ProjectDir)bin\$(Configuration)\$(TargetFramework)\**\*CsvHelper*.dll">
|
||||
<Pack>true</Pack>
|
||||
<PackagePath>Content</PackagePath>
|
||||
</Content>
|
||||
</ItemGroup>
|
||||
</Target>
|
||||
|
||||
|
@@ -35,6 +35,7 @@
|
||||
"BigTextScriptHistoryTable": "DynamicScriptHistoryTable",
|
||||
"BigTextScriptRealTable": "DynamicScriptRealTable",
|
||||
"RealTableBusinessInterval": "RealTableBusinessInterval",
|
||||
"SqlDBSplitType": "SplitType",
|
||||
|
||||
"BusinessUpdateEnum": "BusinessUpdateEnum",
|
||||
"BusinessInterval": "BusinessInterval",
|
||||
|
@@ -35,7 +35,7 @@
|
||||
"BigTextScriptHistoryTable": "历史表动态脚本",
|
||||
"BigTextScriptRealTable": "实时表动态脚本",
|
||||
"RealTableBusinessInterval": "实时表定时上传间隔",
|
||||
|
||||
"SqlDBSplitType": "分表模式",
|
||||
"BusinessUpdateEnum": "上传模式",
|
||||
"BusinessInterval": "定时上传间隔",
|
||||
"IsAllVariable": "选择全部变量",
|
||||
|
@@ -1,12 +0,0 @@
|
||||
|
||||
|
||||
namespace ThingsGateway.Plugin.SqlDB;
|
||||
|
||||
public enum DbType
|
||||
{
|
||||
MySql = 0,
|
||||
SqlServer = 1,
|
||||
Sqlite = 2,
|
||||
Oracle = 3,
|
||||
PostgreSQL = 4,
|
||||
}
|
@@ -14,7 +14,7 @@ using SqlSugar;
|
||||
|
||||
namespace ThingsGateway.Plugin.SqlDB;
|
||||
|
||||
[SplitTable(SplitType.Week)]//按周分表 (自带分表支持 年、季、月、周、日)
|
||||
[SplitTable(SplitType._Custom01)]//按周分表 (自带分表支持 年、季、月、周、日)
|
||||
[SugarTable("{name}_{year}{month}{day}", TableDescription = "设备采集历史表")]//3个变量必须要有
|
||||
[SugarIndex("index_Id", nameof(SQLHistoryValue.Id), OrderByType.Desc)]
|
||||
[SugarIndex("index_Name", nameof(SQLHistoryValue.Name), OrderByType.Desc)]
|
||||
|
@@ -10,18 +10,17 @@
|
||||
|
||||
using SqlSugar;
|
||||
|
||||
using System.Reflection;
|
||||
using System.Text.RegularExpressions;
|
||||
|
||||
namespace ThingsGateway.Plugin.SqlDB;
|
||||
|
||||
public class SqlDBDateSplitTableService : DateSplitTableService
|
||||
{
|
||||
private SqlDBProducerProperty sqlDBProducerProperty;
|
||||
private SqlDBProducerProperty _sqlDBProducerProperty;
|
||||
|
||||
public SqlDBDateSplitTableService(SqlDBProducerProperty sqlDBProducerProperty)
|
||||
{
|
||||
this.sqlDBProducerProperty = sqlDBProducerProperty;
|
||||
_sqlDBProducerProperty = sqlDBProducerProperty;
|
||||
}
|
||||
|
||||
#region Core
|
||||
@@ -29,7 +28,7 @@ public class SqlDBDateSplitTableService : DateSplitTableService
|
||||
public override List<SplitTableInfo> GetAllTables(ISqlSugarClient db, EntityInfo EntityInfo, List<DbTableInfo> tableInfos)
|
||||
{
|
||||
CheckTableName(EntityInfo.DbTableName);
|
||||
string regex = "^" + EntityInfo.DbTableName.Replace("{year}", "([0-9]{2,4})").Replace("{day}", "([0-9]{1,2})").Replace("{month}", "([0-9]{1,2})").Replace("{name}", sqlDBProducerProperty.HistoryDBTableName);
|
||||
string regex = "^" + EntityInfo.DbTableName.Replace("{year}", "([0-9]{2,4})").Replace("{day}", "([0-9]{1,2})").Replace("{month}", "([0-9]{1,2})").Replace("{name}", _sqlDBProducerProperty.HistoryDBTableName);
|
||||
List<string> list = (from it in tableInfos
|
||||
where Regex.IsMatch(it.Name, regex, RegexOptions.IgnoreCase)
|
||||
select it.Name).Reverse().ToList();
|
||||
@@ -51,16 +50,9 @@ public class SqlDBDateSplitTableService : DateSplitTableService
|
||||
|
||||
public override string GetTableName(ISqlSugarClient db, EntityInfo EntityInfo)
|
||||
{
|
||||
var splitTableAttribute = EntityInfo.Type.GetCustomAttribute<SplitTableAttribute>();
|
||||
if (splitTableAttribute != null)
|
||||
{
|
||||
var type = splitTableAttribute.SplitType;
|
||||
return GetTableName(db, EntityInfo, type);
|
||||
}
|
||||
else
|
||||
{
|
||||
return GetTableName(db, EntityInfo, SplitType.Day);
|
||||
}
|
||||
var type = (SplitType)_sqlDBProducerProperty.SqlDBSplitType;
|
||||
return GetTableName(db, EntityInfo, type);
|
||||
|
||||
}
|
||||
|
||||
public override string GetTableName(ISqlSugarClient db, EntityInfo EntityInfo, SplitType splitType)
|
||||
@@ -154,8 +146,9 @@ public class SqlDBDateSplitTableService : DateSplitTableService
|
||||
|
||||
private string GetTableNameByDate(EntityInfo EntityInfo, SplitType splitType, DateTime date)
|
||||
{
|
||||
date = ConvertDateBySplitType(date, splitType);
|
||||
return EntityInfo.DbTableName.Replace("{year}", date.Year + "").Replace("{day}", SqlDBDateSplitTableService.PadLeft2(date.Day + "")).Replace("{month}", SqlDBDateSplitTableService.PadLeft2(date.Month + "")).Replace("{name}", sqlDBProducerProperty.HistoryDBTableName);
|
||||
var type = (SplitType)_sqlDBProducerProperty.SqlDBSplitType;
|
||||
date = ConvertDateBySplitType(date, type);
|
||||
return EntityInfo.DbTableName.Replace("{year}", date.Year + "").Replace("{day}", SqlDBDateSplitTableService.PadLeft2(date.Day + "")).Replace("{month}", SqlDBDateSplitTableService.PadLeft2(date.Month + "")).Replace("{name}", _sqlDBProducerProperty.HistoryDBTableName);
|
||||
}
|
||||
|
||||
private static string PadLeft2(string str)
|
||||
|
@@ -13,7 +13,23 @@ using BootstrapBlazor.Components;
|
||||
using System.ComponentModel.DataAnnotations;
|
||||
|
||||
namespace ThingsGateway.Plugin.SqlDB;
|
||||
|
||||
public enum DbType
|
||||
{
|
||||
MySql = 0,
|
||||
SqlServer = 1,
|
||||
Sqlite = 2,
|
||||
Oracle = 3,
|
||||
PostgreSQL = 4,
|
||||
}
|
||||
public enum SqlDBSplitType
|
||||
{
|
||||
Day = 0,
|
||||
Week = 1,
|
||||
Month = 2,
|
||||
Month_6 = 1000,
|
||||
Season = 3,
|
||||
Year = 4,
|
||||
}
|
||||
/// <summary>
|
||||
/// SqlDBProducerProperty
|
||||
/// </summary>
|
||||
@@ -34,6 +50,9 @@ public class SqlDBProducerProperty : BusinessPropertyWithCacheInterval
|
||||
[DynamicProperty]
|
||||
public DbType DbType { get; set; } = DbType.SqlServer;
|
||||
|
||||
[DynamicProperty]
|
||||
public SqlDBSplitType SqlDBSplitType { get; set; } = SqlDBSplitType.Week;
|
||||
|
||||
[DynamicProperty]
|
||||
[Required]
|
||||
[AutoGenerateColumn(ComponentType = typeof(Textarea), Rows = 1)]
|
||||
|
@@ -166,7 +166,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
|
||||
{
|
||||
if (datas?.Count > 0)
|
||||
{
|
||||
var result = await db.Storageable(datas).As(_driverPropertys.ReadDBTableName).PageSize(5000).ExecuteSqlBulkCopyAsync().ConfigureAwait(false);
|
||||
var result = await db.Storageable(datas).As(_driverPropertys.ReadDBTableName).PageSize(5000).ExecuteSqlBulkCopyAsync(cancellationToken).ConfigureAwait(false);
|
||||
if (result > 0)
|
||||
LogMessage.Trace($"RealTable Data Count:{result}");
|
||||
_initRealData = true;
|
||||
|
@@ -12,8 +12,12 @@ using BootstrapBlazor.Components;
|
||||
|
||||
using Mapster;
|
||||
|
||||
using Newtonsoft.Json.Linq;
|
||||
|
||||
using SqlSugar;
|
||||
|
||||
using System.Reflection;
|
||||
|
||||
using ThingsGateway.Admin.Application;
|
||||
using ThingsGateway.Foundation;
|
||||
using ThingsGateway.NewLife.Extension;
|
||||
@@ -63,9 +67,21 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
|
||||
}
|
||||
protected override async Task InitChannelAsync(IChannel? channel, CancellationToken cancellationToken)
|
||||
{
|
||||
InstanceFactory.RemoveCache();
|
||||
List<Assembly> assemblies = new();
|
||||
foreach (var item in InstanceFactory.CustomAssemblies)
|
||||
{
|
||||
if (item.FullName != typeof(SqlSugar.TDengine.TDengineProvider).Assembly.FullName)
|
||||
{
|
||||
assemblies.Add(item);
|
||||
}
|
||||
}
|
||||
assemblies.Add(typeof(SqlSugar.TDengine.TDengineProvider).Assembly);
|
||||
InstanceFactory.CustomAssemblies = assemblies.ToArray();
|
||||
|
||||
_config = new TypeAdapterConfig();
|
||||
_config.ForType<VariableRuntime, TDengineDBHistoryValue>()
|
||||
.Map(dest => dest.Value, src => src.Value == null ? string.Empty : src.Value.ToString() ?? string.Empty)
|
||||
.Map(dest => dest.Value, src => src.Value != null ? src.Value.GetType() == typeof(string) ? src.Value.ToString() : JToken.FromObject(src.Value).ToString() : string.Empty)
|
||||
//.Map(dest => dest.Id, src => CommonUtils.GetSingleId())
|
||||
.Map(dest => dest.Id, src => src.Id)//Id更改为变量Id
|
||||
;//注意sqlsugar插入时无时区,直接utc时间
|
||||
|
@@ -9,6 +9,27 @@
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj">
|
||||
</ProjectReference>
|
||||
|
||||
<!--<PackageReference Include="SqlSugar.QuestDb.RestAPI" Version="4.1.17" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="CsvHelper" Version="31.0.2" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>-->
|
||||
|
||||
|
||||
|
||||
<PackageReference Include="SqlSugar.TDengineCore" Version="4.18.8" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
<PackageReference Include="TDengine.Ado.Data" Version="3.1.7" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
<PackageReference Include="TDengine.Connector" Version="3.1.6" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
</ItemGroup>
|
||||
|
||||
<ItemGroup>
|
||||
@@ -17,5 +38,5 @@
|
||||
<CopyToOutputDirectory>Never</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
|
||||
|
||||
</Project>
|
@@ -12,8 +12,6 @@ using BootstrapBlazor.Components;
|
||||
|
||||
using Mapster;
|
||||
|
||||
using System.Text;
|
||||
|
||||
using ThingsGateway.Foundation;
|
||||
using ThingsGateway.NewLife.Extension;
|
||||
|
||||
@@ -135,11 +133,13 @@ public partial class Webhook : BusinessBaseWithCacheIntervalScript<VariableBasic
|
||||
|
||||
private readonly HttpClient client = new HttpClient();
|
||||
|
||||
private async Task<OperResult> WebhookUpAsync(string topic, string json, int count, CancellationToken cancellationToken)
|
||||
private async Task<OperResult> WebhookUpAsync(string topic, byte[] payLoad, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
|
||||
// 设置请求内容
|
||||
var content = new StringContent(json, Encoding.UTF8, "application/json");
|
||||
//var content = new StringContent(json, Encoding.UTF8, "application/json");
|
||||
using var content = new ByteArrayContent(payLoad);
|
||||
content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/json");
|
||||
|
||||
try
|
||||
{
|
||||
@@ -152,7 +152,7 @@ public partial class Webhook : BusinessBaseWithCacheIntervalScript<VariableBasic
|
||||
if (_driverPropertys.DetailLog)
|
||||
{
|
||||
if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}PayLoad:{json} {Environment.NewLine} VarModelQueue:{_memoryVarModelQueue.Count}");
|
||||
LogMessage.LogTrace(GetString(topic, payLoad, _memoryVarModelQueue.Count));
|
||||
}
|
||||
else
|
||||
{
|
||||
@@ -175,11 +175,12 @@ public partial class Webhook : BusinessBaseWithCacheIntervalScript<VariableBasic
|
||||
|
||||
#region private
|
||||
|
||||
private async ValueTask<OperResult> Update(List<TopicJson> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
private async ValueTask<OperResult> Update(List<TopicArray> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
var result = await WebhookUpAsync(topicJson.Topic, topicJson.Json, count, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
if (cancellationToken.IsCancellationRequested)
|
||||
return result;
|
||||
if (success != result.IsSuccess)
|
||||
@@ -202,20 +203,20 @@ public partial class Webhook : BusinessBaseWithCacheIntervalScript<VariableBasic
|
||||
|
||||
private ValueTask<OperResult> UpdateAlarmModel(IEnumerable<AlarmVariable> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetAlarms(item);
|
||||
var topicJsonList = GetAlarmTopicArrays(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateDevModel(IEnumerable<DeviceBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
|
||||
List<TopicJson> topicJsonList = GetDeviceData(item);
|
||||
var topicJsonList = GetDeviceTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetVariableBasicData(item);
|
||||
var topicJsonList = GetVariableBasicDataTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
|
@@ -46,7 +46,7 @@ public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<Variabl
|
||||
_producerconfig.SaslPassword = _driverPropertys.SaslPassword;
|
||||
|
||||
//2、创建生产者
|
||||
_producerBuilder = new ProducerBuilder<Null, string>(_producerconfig);
|
||||
_producerBuilder = new ProducerBuilder<Null, byte[]>(_producerconfig);
|
||||
//3、错误日志监视
|
||||
_producerBuilder.SetErrorHandler((p, msg) =>
|
||||
{
|
||||
@@ -75,6 +75,14 @@ public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<Variabl
|
||||
/// <inheritdoc/>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
try
|
||||
{
|
||||
_producer?.Flush(TimeSpan.FromSeconds(10));
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
||||
}
|
||||
_producer?.SafeDispose();
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
@@ -24,8 +24,8 @@ namespace ThingsGateway.Plugin.Kafka;
|
||||
/// </summary>
|
||||
public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<VariableBasicData, DeviceBasicData, AlarmVariable>
|
||||
{
|
||||
private IProducer<Null, string> _producer;
|
||||
private ProducerBuilder<Null, string> _producerBuilder;
|
||||
private IProducer<Null, byte[]> _producer;
|
||||
private ProducerBuilder<Null, byte[]> _producerBuilder;
|
||||
private ProducerConfig _producerconfig;
|
||||
private volatile bool producerSuccess = true;
|
||||
|
||||
@@ -127,7 +127,7 @@ public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<Variabl
|
||||
|
||||
#region private
|
||||
|
||||
private async ValueTask<OperResult> Update(List<TopicJson> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
private async ValueTask<OperResult> Update(List<TopicArray> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
@@ -150,19 +150,19 @@ public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<Variabl
|
||||
|
||||
private async ValueTask<OperResult> UpdateAlarmModel(IEnumerable<AlarmVariable> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetAlarms(item);
|
||||
var topicJsonList = GetAlarmTopicArrays(item);
|
||||
return await Update(topicJsonList, item.Count(), cancellationToken).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private async ValueTask<OperResult> UpdateDevModel(IEnumerable<DeviceBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetDeviceData(item);
|
||||
var topicJsonList = GetDeviceTopicArray(item);
|
||||
return await Update(topicJsonList, item.Count(), cancellationToken).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
private async ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetVariableBasicData(item);
|
||||
var topicJsonList = GetVariableBasicDataTopicArray(item);
|
||||
return await Update(topicJsonList, item.Count(), cancellationToken).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
@@ -203,42 +203,36 @@ public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<Variabl
|
||||
/// <summary>
|
||||
/// kafka上传,返回上传结果
|
||||
/// </summary>
|
||||
public async ValueTask<OperResult> KafKaUpAsync(string topic, string payLoad, int count, CancellationToken cancellationToken)
|
||||
public async ValueTask<OperResult> KafKaUpAsync(string topic, byte[] payLoad, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
using CancellationTokenSource cancellationTokenSource = new();
|
||||
using CancellationTokenSource cancellationTokenSource = new(_driverPropertys.Timeout);
|
||||
using CancellationTokenSource stoppingToken = CancellationTokenSource.CreateLinkedTokenSource(cancellationTokenSource.Token, cancellationToken);
|
||||
Task<DeliveryResult<Null, string>> resultTask = _producer.ProduceAsync(topic, new Message<Null, string> { Value = payLoad }, stoppingToken.Token);
|
||||
var timeOutResult = await Task.WhenAny(resultTask, Task.Delay(_driverPropertys.Timeout, stoppingToken.Token)).ConfigureAwait(false);
|
||||
if (timeOutResult == resultTask)
|
||||
var result = await _producer.ProduceAsync(topic, new Message<Null, byte[]> { Value = payLoad }, stoppingToken.Token).ConfigureAwait(false);
|
||||
if (result.Status != PersistenceStatus.Persisted)
|
||||
{
|
||||
var result = await resultTask.ConfigureAwait(false);
|
||||
if (result.Status != PersistenceStatus.Persisted)
|
||||
{
|
||||
return new OperResult("Upload fail");
|
||||
}
|
||||
else
|
||||
{
|
||||
if (_driverPropertys.DetailLog)
|
||||
{
|
||||
if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}PayLoad:{payLoad} {Environment.NewLine} VarModelQueue:{_memoryVarModelQueue.Count}");
|
||||
}
|
||||
else
|
||||
{
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}Count:{count} {Environment.NewLine} VarModelQueue:{_memoryVarModelQueue.Count}");
|
||||
|
||||
}
|
||||
return OperResult.Success;
|
||||
}
|
||||
return new OperResult("Upload fail");
|
||||
}
|
||||
else
|
||||
{
|
||||
stoppingToken.Cancel();
|
||||
return new OperResult("Upload timeout");
|
||||
if (_driverPropertys.DetailLog)
|
||||
{
|
||||
if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
|
||||
LogMessage.LogTrace(GetString(topic, payLoad, _memoryVarModelQueue.Count));
|
||||
}
|
||||
else
|
||||
{
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}Count:{count} {Environment.NewLine} VarModelQueue:{_memoryVarModelQueue.Count}");
|
||||
|
||||
}
|
||||
return OperResult.Success;
|
||||
}
|
||||
}
|
||||
catch (OperationCanceledException)
|
||||
{
|
||||
return new OperResult("Timeout");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new OperResult(ex);
|
||||
|
@@ -9,7 +9,7 @@
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\..\Gateway\ThingsGateway.Gateway.Razor\ThingsGateway.Gateway.Razor.csproj">
|
||||
</ProjectReference>
|
||||
<PackageReference Include="Confluent.Kafka" Version="2.9.0" GeneratePathProperty="true">
|
||||
<PackageReference Include="Confluent.Kafka" Version="2.10.0" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
</ItemGroup>
|
||||
|
@@ -60,31 +60,35 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
|
||||
private async ValueTask<OperResult> UpdateThingsBoardDeviceConnect(DeviceBasicData deviceData)
|
||||
{
|
||||
List<TopicJson> topicJsonTBList = new();
|
||||
var topicJsonTBList = new List<TopicArray>();
|
||||
|
||||
{
|
||||
if (deviceData.DeviceStatus == DeviceStatusEnum.OnLine)
|
||||
{
|
||||
var topicJson = new TopicJson()
|
||||
var json = new
|
||||
{
|
||||
device = deviceData.Name,
|
||||
};
|
||||
var topicJson = new TopicArray()
|
||||
{
|
||||
Topic = "v1/gateway/connect",
|
||||
Json = new
|
||||
{
|
||||
device = deviceData.Name,
|
||||
}.ToJsonNetString(_driverPropertys.JsonFormattingIndented)
|
||||
Json = Serialize(json, _driverPropertys.JsonFormattingIndented)
|
||||
};
|
||||
|
||||
topicJsonTBList.Add(topicJson);
|
||||
}
|
||||
else
|
||||
{
|
||||
var topicJson = new TopicJson()
|
||||
var json = new
|
||||
{
|
||||
device = deviceData.Name,
|
||||
};
|
||||
var topicJson = new TopicArray()
|
||||
{
|
||||
Topic = "v1/gateway/disconnect",
|
||||
Json = new
|
||||
{
|
||||
device = deviceData.Name,
|
||||
}.ToJsonNetString(_driverPropertys.JsonFormattingIndented)
|
||||
Json = Serialize(json, _driverPropertys.JsonFormattingIndented)
|
||||
};
|
||||
|
||||
topicJsonTBList.Add(topicJson);
|
||||
}
|
||||
|
||||
@@ -202,7 +206,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
|
||||
#region private
|
||||
|
||||
private async ValueTask<OperResult> Update(List<TopicJson> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
private async ValueTask<OperResult> Update(List<TopicArray> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
@@ -227,20 +231,20 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
|
||||
private ValueTask<OperResult> UpdateAlarmModel(IEnumerable<AlarmVariable> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetAlarms(item);
|
||||
var topicJsonList = GetAlarmTopicArrays(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateDevModel(IEnumerable<DeviceBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
|
||||
List<TopicJson> topicJsonList = GetDeviceData(item);
|
||||
var topicJsonList = GetDeviceTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetVariableBasicData(item);
|
||||
var topicJsonList = GetVariableBasicDataTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
@@ -459,7 +463,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
/// <summary>
|
||||
/// 上传mqtt,返回上传结果
|
||||
/// </summary>
|
||||
public async ValueTask<OperResult> MqttUpAsync(string topic, string payLoad, int count, CancellationToken cancellationToken = default)
|
||||
public async ValueTask<OperResult> MqttUpAsync(string topic, byte[] payLoad, int count, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -475,7 +479,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
if (_driverPropertys.DetailLog)
|
||||
{
|
||||
if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}PayLoad:{payLoad} {Environment.NewLine} VarModelQueue:{_memoryVarModelQueue.Count}");
|
||||
LogMessage.LogTrace(GetString(topic, payLoad, _memoryVarModelQueue.Count));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -133,41 +133,6 @@ public partial class MqttCollect : CollectBase
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// 上传mqtt,返回上传结果
|
||||
/// </summary>
|
||||
private async ValueTask<OperResult> MqttUpAsync(string topic, string payLoad, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
var isConnect = await TryMqttClientAsync(cancellationToken).ConfigureAwait(false);
|
||||
if (isConnect.IsSuccess)
|
||||
{
|
||||
var variableMessage = new MqttApplicationMessageBuilder()
|
||||
.WithTopic(topic).WithRetainFlag(true)
|
||||
.WithPayload(payLoad).Build();
|
||||
var result = await _mqttClient.PublishAsync(variableMessage, cancellationToken).ConfigureAwait(false);
|
||||
if (result.IsSuccess)
|
||||
{
|
||||
if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}PayLoad:{payLoad}");
|
||||
return OperResult.Success;
|
||||
}
|
||||
else
|
||||
{
|
||||
return new OperResult($"Upload fail{result.ReasonString}");
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
return isConnect;
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
return new OperResult($"Upload fail", ex);
|
||||
}
|
||||
}
|
||||
|
||||
private async ValueTask<OperResult> TryMqttClientAsync(CancellationToken cancellationToken)
|
||||
{
|
||||
|
@@ -141,7 +141,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
}
|
||||
#region private
|
||||
|
||||
private async ValueTask<OperResult> Update(List<TopicJson> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
private async ValueTask<OperResult> Update(List<TopicArray> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
@@ -164,20 +164,20 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
|
||||
private ValueTask<OperResult> UpdateAlarmModel(IEnumerable<AlarmVariable> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetAlarms(item);
|
||||
var topicJsonList = GetAlarmTopicArrays(item);
|
||||
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateDevModel(IEnumerable<DeviceBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetDeviceData(item);
|
||||
var topicJsonList = GetDeviceTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetVariableBasicData(item);
|
||||
var topicJsonList = GetVariableBasicDataTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
@@ -261,7 +261,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
{
|
||||
foreach (var item in varData)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetVariableBasicData(item);
|
||||
var topicJsonList = GetVariableBasicData(item);
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
Messages.Add(new MqttApplicationMessageBuilder()
|
||||
@@ -276,7 +276,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
{
|
||||
foreach (var item in devData)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetDeviceData(item);
|
||||
var topicJsonList = GetDeviceData(item);
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
Messages.Add(new MqttApplicationMessageBuilder()
|
||||
@@ -290,7 +290,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
{
|
||||
foreach (var item in alramData)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetAlarms(item);
|
||||
var topicJsonList = GetAlarms(item);
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
Messages.Add(new MqttApplicationMessageBuilder()
|
||||
@@ -394,7 +394,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
/// <summary>
|
||||
/// 上传mqtt,返回上传结果
|
||||
/// </summary>
|
||||
public async ValueTask<OperResult> MqttUpAsync(string topic, string payLoad, int count, CancellationToken cancellationToken = default)
|
||||
public async ValueTask<OperResult> MqttUpAsync(string topic, byte[] payLoad, int count, CancellationToken cancellationToken = default)
|
||||
{
|
||||
try
|
||||
{
|
||||
@@ -407,7 +407,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
|
||||
if (_driverPropertys.DetailLog)
|
||||
{
|
||||
if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}PayLoad:{payLoad} {Environment.NewLine} VarModelQueue:{_memoryVarModelQueue.Count} ");
|
||||
LogMessage.LogTrace(GetString(topic, payLoad, _memoryVarModelQueue.Count));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -22,27 +22,27 @@
|
||||
</ProjectReference>
|
||||
<ProjectReference Include="..\ThingsGateway.Foundation.OpcUa\ThingsGateway.Foundation.OpcUa.csproj" />
|
||||
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.375.457" GeneratePathProperty="true">
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Server" Version="1.5.376.213" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.375.457" GeneratePathProperty="true">
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client.ComplexTypes" Version="1.5.376.213" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.375.457" GeneratePathProperty="true">
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Client" Version="1.5.376.213" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.375.457" GeneratePathProperty="true">
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Core" Version="1.5.376.213" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.375.457" GeneratePathProperty="true">
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Configuration" Version="1.5.376.213" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" Version="1.5.375.457" GeneratePathProperty="true">
|
||||
<PackageReference Include="OPCFoundation.NetStandard.Opc.Ua.Security.Certificates" Version="1.5.376.213" GeneratePathProperty="true">
|
||||
<PrivateAssets>contentFiles;compile;build;buildMultitargeting;buildTransitive;analyzers;</PrivateAssets>
|
||||
</PackageReference>
|
||||
|
||||
|
@@ -12,8 +12,6 @@ using Mapster;
|
||||
|
||||
using RabbitMQ.Client;
|
||||
|
||||
using System.Text;
|
||||
|
||||
using ThingsGateway.Foundation;
|
||||
using ThingsGateway.Foundation.Extension.Generic;
|
||||
|
||||
@@ -130,7 +128,7 @@ public partial class RabbitMQProducer : BusinessBaseWithCacheIntervalScript<Vari
|
||||
|
||||
#region private
|
||||
|
||||
private async ValueTask<OperResult> Update(List<TopicJson> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
private async ValueTask<OperResult> Update(List<TopicArray> topicJsonList, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
foreach (var topicJson in topicJsonList)
|
||||
{
|
||||
@@ -154,19 +152,19 @@ public partial class RabbitMQProducer : BusinessBaseWithCacheIntervalScript<Vari
|
||||
|
||||
private ValueTask<OperResult> UpdateAlarmModel(IEnumerable<AlarmVariable> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetAlarms(item);
|
||||
var topicJsonList = GetAlarmTopicArrays(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateDevModel(IEnumerable<DeviceBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetDeviceData(item);
|
||||
var topicJsonList = GetDeviceTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
private ValueTask<OperResult> UpdateVarModel(IEnumerable<VariableBasicData> item, CancellationToken cancellationToken)
|
||||
{
|
||||
List<TopicJson> topicJsonList = GetVariableBasicData(item);
|
||||
var topicJsonList = GetVariableBasicDataTopicArray(item);
|
||||
return Update(topicJsonList, item.Count(), cancellationToken);
|
||||
}
|
||||
|
||||
@@ -208,18 +206,18 @@ public partial class RabbitMQProducer : BusinessBaseWithCacheIntervalScript<Vari
|
||||
/// <summary>
|
||||
/// 上传,返回上传结果
|
||||
/// </summary>
|
||||
public async Task<OperResult> Publish(string topic, string payLoad, int count, CancellationToken cancellationToken)
|
||||
public async Task<OperResult> Publish(string topic, byte[] payLoad, int count, CancellationToken cancellationToken)
|
||||
{
|
||||
try
|
||||
{
|
||||
if (_channel != null)
|
||||
{
|
||||
await _channel.BasicPublishAsync(_driverPropertys.ExchangeName, topic, Encoding.UTF8.GetBytes(payLoad), cancellationToken).ConfigureAwait(false);
|
||||
await _channel.BasicPublishAsync(_driverPropertys.ExchangeName, topic, payLoad, cancellationToken).ConfigureAwait(false);
|
||||
|
||||
if (_driverPropertys.DetailLog)
|
||||
{
|
||||
if (LogMessage.LogLevel <= TouchSocket.Core.LogLevel.Trace)
|
||||
LogMessage.LogTrace($"Topic:{topic}{Environment.NewLine}PayLoad:{payLoad} {Environment.NewLine} VarModelQueue:{_memoryVarModelQueue.Count}");
|
||||
LogMessage.LogTrace(GetString(topic, payLoad, _memoryVarModelQueue.Count));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
@@ -280,9 +280,9 @@ public class Startup : AppStartup
|
||||
public void Use(IApplicationBuilder applicationBuilder, IWebHostEnvironment env)
|
||||
{
|
||||
var app = (WebApplication)applicationBuilder;
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All, KnownNetworks = { }, KnownProxies = { } });
|
||||
app.UseBootstrapBlazor();
|
||||
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All });
|
||||
|
||||
// 启用本地化
|
||||
var option = app.Services.GetService<IOptions<RequestLocalizationOptions>>();
|
||||
|
@@ -6,7 +6,7 @@
|
||||
"Startway": "", // 启动方式:DOTNET: (直接启动) ;WindowsService:(windows服务) PM2, Systemctl等不需要配置。对应文件夹下的命令文件
|
||||
|
||||
"AppSettings": {
|
||||
"InjectSpecificationDocument": false, // 生产环境是否开启Swagger
|
||||
"InjectSpecificationDocument": true, // 生产环境是否开启Swagger
|
||||
"ExternalAssemblies": [ "Plugins" ], // 插件目录
|
||||
|
||||
// nuget动态加载的程序集
|
||||
|
@@ -3,8 +3,8 @@
|
||||
"MinCycleInterval": 10, //最小循环间隔
|
||||
"MaxCycleInterval": 200, //最大循环间隔
|
||||
"CheckInterval": 1800000, //检查间隔
|
||||
"MaxChannelCount": 1000, //最大通道数量
|
||||
"MaxDeviceCount": 1000, //最大设备数量
|
||||
"MaxVariableCount": 1000000 //最大变量数量
|
||||
"MaxChannelCount": 5000, //最大通道数量
|
||||
"MaxDeviceCount": 5000, //最大设备数量
|
||||
"MaxVariableCount": 2000000 //最大变量数量
|
||||
}
|
||||
}
|
||||
|
@@ -8,8 +8,6 @@
|
||||
// QQ群:605534569
|
||||
//------------------------------------------------------------------------------
|
||||
|
||||
using SqlSugar;
|
||||
|
||||
using System.Reflection;
|
||||
|
||||
namespace ThingsGateway.Server;
|
||||
@@ -36,8 +34,6 @@ public class SingleFilePublish : ISingleFilePublish
|
||||
/// <returns></returns>
|
||||
public string[] IncludeAssemblyNames()
|
||||
{
|
||||
InstanceFactory.CustomAssemblies =
|
||||
[typeof(SqlSugar.TDengine.TDengineProvider).Assembly];
|
||||
return
|
||||
[
|
||||
"ThingsGateway.Furion",
|
||||
|
@@ -298,9 +298,10 @@ public class Startup : AppStartup
|
||||
public void Use(IApplicationBuilder applicationBuilder, IWebHostEnvironment env)
|
||||
{
|
||||
var app = (WebApplication)applicationBuilder;
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All, KnownNetworks = { }, KnownProxies = { } });
|
||||
|
||||
app.UseBootstrapBlazor();
|
||||
|
||||
app.UseForwardedHeaders(new ForwardedHeadersOptions { ForwardedHeaders = ForwardedHeaders.All });
|
||||
|
||||
// 启用本地化
|
||||
var option = app.Services.GetService<IOptions<RequestLocalizationOptions>>();
|
||||
|
@@ -7,7 +7,7 @@
|
||||
"ASPNETCORE_ENVIRONMENT": "Development"
|
||||
},
|
||||
"dotnetRunMessages": true,
|
||||
"applicationUrl": "http://localhost:5000"
|
||||
"applicationUrl": "http://*:5000"
|
||||
},
|
||||
"demo": {
|
||||
"commandName": "Project",
|
||||
@@ -16,7 +16,7 @@
|
||||
"ASPNETCORE_ENVIRONMENT": "Demo"
|
||||
},
|
||||
"dotnetRunMessages": true,
|
||||
"applicationUrl": "http://localhost:5000"
|
||||
"applicationUrl": "http://*:5000"
|
||||
},
|
||||
|
||||
"IIS Express": {
|
||||
@@ -32,7 +32,7 @@
|
||||
"windowsAuthentication": false,
|
||||
"anonymousAuthentication": true,
|
||||
"iisExpress": {
|
||||
"applicationUrl": "http://localhost:59494/",
|
||||
"applicationUrl": "http://*:59494/",
|
||||
"sslPort": 44372
|
||||
}
|
||||
}
|
||||
|
@@ -1,5 +1,4 @@
|
||||
{
|
||||
"urls": "http://*:5000",
|
||||
|
||||
"ConfigurationScanDirectories": [ "Configuration", "" ], // 扫描配置文件json文件夹(自动合并该文件夹里面所有json文件)
|
||||
"IgnoreConfigurationFiles": [ "" ],
|
||||
|
@@ -4,7 +4,7 @@ using TouchSocket.Rpc;
|
||||
|
||||
namespace ThingsGateway.Upgrade;
|
||||
|
||||
public partial class FileRpcServer : RpcServer
|
||||
public partial class FileRpcServer : SingletonRpcServer
|
||||
{
|
||||
private readonly ILog _logger;
|
||||
|
||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user