g82tt/KinginfoGateway
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新nuget，暂缓链路复用功能

Browse Source
This commit is contained in:
2248356998 qq.com
2023-03-20 13:34:59 +08:00
parent 5bebc30ba0
commit a5e7e0d126
8 changed files with 73 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Plugins/ThingsGateway.Foundation.Tests/ThingsGateway.Foundation.Tests.csproj
View File

@@ -10,7 +10,7 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Pure.Xunit" Version="4.8.7.11" />
<PackageReference Include="Furion.Pure.Xunit" Version="4.8.7.16" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">

2
src/Plugins/ThingsGateway.OPCDA/ThingsGateway.OPCDA.csproj
View File

@@ -17,7 +17,7 @@
<ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.8">
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.9">
<IncludeAssets>Compile</IncludeAssets>
</PackageReference>
</ItemGroup>

2
src/Plugins/ThingsGateway.OPCUA/ThingsGateway.OPCUA.csproj
View File

@@ -30,7 +30,7 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.8">
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.9">
<IncludeAssets>Compile</IncludeAssets>
</PackageReference>
</ItemGroup>

8
src/ThingsGateway.Core/ThingsGateway.Core.csproj
View File

@@ -7,9 +7,9 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.11" />
<PackageReference Include="Furion.Pure" Version="4.8.7.11" />
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.2" />
<PackageReference Include="Furion.Extras.ObjectMapper.Mapster" Version="4.8.7.16" />
<PackageReference Include="Furion.Pure" Version="4.8.7.16" />
<PackageReference Include="Magicodes.IE.Excel" Version="2.7.4.3" />
<PackageReference Include="SqlSugarCore" Version="5.1.4.59" />
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="NewLife.Core" Version="10.2.2023.301" />
@@ -18,6 +18,6 @@
<PackageReference Include="Microsoft.Data.Sqlite" Version="7.0.4" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.11" />
<PackageReference Include="Furion.Extras.Authentication.JwtBearer" Version="4.8.7.16" />
</ItemGroup>
</Project>

28
src/ThingsGateway.Web.Foundation/HostServices/CollectDeviceCore.cs
View File

@@ -25,12 +25,12 @@ public class CollectDeviceCore : DisposableObject
/// </summary>
public ConcurrentList<CancellationTokenSource> StoppingTokens = new();
private ILogger _logger;
protected ILogger _logger;
/// <summary>
/// 当前设备信息
/// </summary>
private CollectDeviceRunTime _device;
protected CollectDeviceRunTime _device;
/// <summary>
/// 当前的驱动插件实例
@@ -40,13 +40,13 @@ public class CollectDeviceCore : DisposableObject
/// <summary>
/// 全局插件服务
/// </summary>
private PluginCore _pluginService;
protected PluginCore _pluginService;
/// <summary>
/// 分包变量
/// </summary>
private List<DeviceVariableSourceRead> DeviceVariableSourceReads = new();
private IServiceScopeFactory _scopeFactory;
protected List<DeviceVariableSourceRead> DeviceVariableSourceReads = new();
protected IServiceScopeFactory _scopeFactory;
public CollectDeviceCore(IServiceScopeFactory scopeFactory)
{
@@ -72,14 +72,14 @@ public class CollectDeviceCore : DisposableObject
/// <summary>
/// 当前设备全部特殊方法，执行初始化后获取正确值
/// </summary>
public List<MethodInfo> Methods { get; private set; }
public List<MethodInfo> Methods { get; protected set; }
/// <summary>
/// 当前设备全部设备属性，执行初始化后获取正确值
/// </summary>
public List<DependencyProperty> Propertys { get; private set; }
GlobalCollectDeviceData _globalCollectDeviceData { get; set; }
IDriverPluginService _driverPluginService { get; set; }
public List<DependencyProperty> Propertys { get; protected set; }
protected GlobalCollectDeviceData _globalCollectDeviceData { get; set; }
protected IDriverPluginService _driverPluginService { get; set; }
/// <summary>
/// 初始化，在设备子线程创建或更新时才会执行
/// </summary>
@@ -127,12 +127,12 @@ public class CollectDeviceCore : DisposableObject
#region 设备子线程采集启动停止
private Task<Task> DeviceTask;
protected Task<Task> DeviceTask;
/// <summary>
/// 初始化
/// </summary>
public void Init()
protected void Init()
{
DeviceTask = new Task<Task>(() =>
{
@@ -296,11 +296,11 @@ public class CollectDeviceCore : DisposableObject
/// <summary>
/// 开始采集
/// </summary>
public void StartThread()
public virtual void StartThread()
{
DeviceTask?.Start();
}
public void StopThread()
public virtual void StopThread()
{
try
{
@@ -350,7 +350,7 @@ public class CollectDeviceCore : DisposableObject
/// 传入设备变量列表，执行后赋值<see cref="DeviceVariableSourceReads"/>
/// </summary>
/// <param name="collectVariableRunTimes"></param>
private void LoadSourceReads(List<CollectVariableRunTime> collectVariableRunTimes)
protected void LoadSourceReads(List<CollectVariableRunTime> collectVariableRunTimes)
{
if (collectVariableRunTimes == null || _driver == null) { return; }
try

25
src/ThingsGateway.Web.Foundation/HostServices/CollectMulDeviceCore.cs Normal file
View File

@@ -0,0 +1,25 @@
namespace ThingsGateway.Web.Foundation;
public class CollectMulDeviceCore : CollectDeviceCore
{
public CollectMulDeviceCore(IServiceScopeFactory scopeFactory):base(scopeFactory)
{
}
public override void StartThread()
{
DeviceTask?.Start();
}
public override void StopThread()
{
}
}

26
src/ThingsGateway.Web.Foundation/HostServices/Core/Plugin/DriverBase.cs
View File

@@ -3,8 +3,10 @@
using System.Threading;
using ThingsGateway.Foundation;
using ThingsGateway.Foundation.Serial;
using TouchSocket.Core;
using TouchSocket.Sockets;
namespace ThingsGateway.Web.Foundation;
/// <summary>
@@ -45,6 +47,30 @@ public abstract class DriverBase : IDisposable
}
}
///// <summary>
///// 独立链路
///// </summary>
//[DeviceProperty("独立链路")]
//public bool IsAloneLink { get; set; } = true;
///// <summary>
///// 获取串口链路描述
///// </summary>
///// <returns></returns>
//public virtual SerialProperty GetSerialProperty()
//{
// return null;
//}
///// <summary>
///// 获取Tcp链路描述
///// </summary>
///// <returns></returns>
//public virtual IPHost GetTcpProperty()
//{
// return null;
//}
/// <summary>
/// 数据转换器
/// </summary>

2
src/ThingsGateway.Web.Rcl.Core/ThingsGateway.Web.Rcl.Core.csproj
View File

@@ -23,7 +23,7 @@
<ItemGroup>
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.8" />
<PackageReference Include="Masa.Blazor" Version="1.0.0-preview.9" />
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.4" />
</ItemGroup>