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

更新依赖

Browse Source
This commit is contained in:
2248356998 qq.com
2025-06-22 23:05:12 +08:00
parent df9e7d6ff1
commit 0174f7c6f2
22 changed files with 65 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Directory.Build.props
View File

@@ -1,10 +1,10 @@
<Project>
<PropertyGroup>
<PluginVersion>10.8.17</PluginVersion>
<ProPluginVersion>10.8.17</ProPluginVersion>
<AuthenticationVersion>2.8.2</AuthenticationVersion>
<SourceGeneratorVersion>10.8.4</SourceGeneratorVersion>
<PluginVersion>10.8.18</PluginVersion>
<ProPluginVersion>10.8.18</ProPluginVersion>
<AuthenticationVersion>2.8.3</AuthenticationVersion>
<SourceGeneratorVersion>10.8.5</SourceGeneratorVersion>
<NET8Version>8.0.17</NET8Version>
<NET9Version>9.0.6</NET9Version>
<SatelliteResourceLanguages>zh-Hans;en-US</SatelliteResourceLanguages>

4
src/Foundation/ThingsGateway.Foundation/ThingsGateway.Foundation.csproj
View File

@@ -10,8 +10,8 @@
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="$(NET9Version)" />
<PackageReference Include="TouchSocket" Version="3.1.8" />
<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.8" />
<PackageReference Include="TouchSocket" Version="3.1.9" />
<PackageReference Include="TouchSocket.SerialPorts" Version="3.1.9" />
</ItemGroup>
<ItemGroup>

6
src/Gateway/ThingsGateway.Gateway.Application/Driver/Business/Cache/BusinessBaseWithCacheVariableModel.cs
View File

@@ -435,9 +435,11 @@ public abstract class BusinessBaseWithCacheVariableModel<VarModel> : BusinessBas
try
{
if (_memoryVarModelsQueue.TryDequeue(out var cacheDBItem))
while (_memoryVarModelsQueue.TryDequeue(out var cacheDBItem))
{
var list = cacheDBItem.Value;
if (cancellationToken.IsCancellationRequested)
break;
var list = cacheDBItem.Value;
var data = list.ChunkBetter(_businessPropertyWithCache.SplitSize);
foreach (var item in data)
{

11
src/Gateway/ThingsGateway.Gateway.Application/Entity/Variable.cs
View File

@@ -30,9 +30,6 @@ namespace ThingsGateway.Gateway.Application;
[SugarIndex("unique_deviceid_variable_name", nameof(Variable.Name), OrderByType.Asc, nameof(Variable.DeviceId), OrderByType.Asc, true)]
public class Variable : BaseDataEntity, IValidatableObject
{
/// <summary>
/// 导入验证专用
/// </summary>
@@ -68,6 +65,7 @@ public class Variable : BaseDataEntity, IValidatableObject
private bool lLAlarmEnable;
private bool lAlarmEnable;
private bool customAlarmEnable;
private bool businessGroupUpdateTrigger = true;
private object _value;
private string name;
@@ -143,6 +141,13 @@ public class Variable : BaseDataEntity, IValidatableObject
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 1)]
public virtual string BusinessGroup { get => businessGroup; set => businessGroup = value; }
/// <summary>
/// 分组上传触发变量
/// </summary>
[SugarColumn(ColumnDescription = "分组上传触发变量", IsNullable = true)]
[AutoGenerateColumn(Visible = true, Filterable = true, Sortable = true, Order = 1)]
public virtual bool BusinessGroupUpdateTrigger { get => businessGroupUpdateTrigger; set => businessGroupUpdateTrigger = value; }
/// <summary>
/// 描述
/// </summary>

15
src/Gateway/ThingsGateway.Gateway.Application/Locales/en-US.json
View File

@@ -52,17 +52,7 @@
"RulesId": "Name"
},
"ThingsGateway.Management.Authentication": {
"AuthName": "AuthName",
"Authorized": "Authorized",
"ExpireTime": "ExpireTime {0}",
"Password": "Password",
"Register": "Register",
"RegisterStatus": "RegisterStatus",
"Unauthorized": "Unauthorized",
"Unregister": "Unregister",
"UUID": "UUID"
},
"ThingsGateway.Management.AutoUpdateController": {
"AutoUpdateController": "AutoUpdate",
"Update": "Update"
@@ -448,6 +438,7 @@
"BoolOpenAlarmText": "BoolOpenAlarmText",
"BoolOpenRestrainExpressions": "BoolOpenRestrainExpressions",
"BusinessGroup": "BusinessGroup",
"BusinessGroupUpdateTrigger": "BusinessGroupUpdateTrigger",
"ClearVariable": "Clear Variable",
"CollectGroup": "CollectGroup",
"CopyVariable": "Copy Variable",
@@ -456,7 +447,7 @@
"CustomAlarmText": "CustomAlarmText",
"CustomRestrainExpressions": "CustomRestrainExpressions",
"DataType": "DataType",
"DeleteVariable": "Copy Variable",
"DeleteVariable": "Delete Variable",
"Description": "Description",
"DeviceId": "CollectionDevice",
"DeviceId.MinValue": "{0} cannot be empty",

13
src/Gateway/ThingsGateway.Gateway.Application/Locales/zh-CN.json
View File

@@ -50,17 +50,7 @@
"LogConsole": "日志",
"RulesId": "名称"
},
"ThingsGateway.Management.Authentication": {
"AuthName": "公司名称",
"Authorized": "已授权",
"ExpireTime": "过期时间 {0}",
"Password": "注册码",
"Register": "注册",
"RegisterStatus": "注册状态",
"Unauthorized": "未授权",
"Unregister": "取消注册",
"UUID": "唯一编码"
},
"ThingsGateway.Management.AutoUpdateController": {
"AutoUpdateController": "程序更新",
"Update": "更新"
@@ -449,6 +439,7 @@
"BoolOpenAlarmText": "布尔开报警文本",
"BoolOpenRestrainExpressions": "布尔开报警约束",
"BusinessGroup": "业务组",
"BusinessGroupUpdateTrigger": "分组上传触发",
"ClearVariable": "清空变量",
"CollectGroup": "采集组",
"CopyVariable": "复制变量",

3
src/Gateway/ThingsGateway.Gateway.Application/Model/DataModel.cs
View File

@@ -101,6 +101,9 @@ public class VariableBasicData
[System.Text.Json.Serialization.JsonIgnore(Condition = System.Text.Json.Serialization.JsonIgnoreCondition.WhenWritingNull)]
public string BusinessGroup => VariableRuntime.BusinessGroup;
/// <inheritdoc cref="Variable.BusinessGroupUpdateTrigger"/>
public bool BusinessGroupUpdateTrigger => VariableRuntime.BusinessGroupUpdateTrigger;
/// <inheritdoc cref="VariableRuntime.DeviceName"/>
public string DeviceName => VariableRuntime.DeviceName;

4
src/Gateway/ThingsGateway.Gateway.Application/ThingsGateway.Gateway.Application.csproj
View File

@@ -8,8 +8,8 @@
<ItemGroup>
<PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
<PackageReference Include="Rougamo.Fody" Version="5.0.1" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.8" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.8" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.9" />
<PackageReference Include="TouchSocket.WebApi.Swagger" Version="3.1.9" />
<PackageReference Include="ThingsGateway.Authentication" Version="$(AuthenticationVersion)" />
<!--<ProjectReference Include="..\..\PluginPro\ThingsGateway.Authentication\ThingsGateway.Authentication.csproj" />-->

12
src/Gateway/ThingsGateway.Gateway.Razor/Locales/en-US.json
View File

@@ -1,4 +1,16 @@
{
"ThingsGateway.Management.Authentication": {
"AuthName": "AuthName",
"Authorized": "Authorized",
"ExpireTime": "ExpireTime",
"Password": "Password",
"Register": "Register",
"RegisterStatus": "RegisterStatus",
"Unauthorized": "Unauthorized",
"Unregister": "Unregister",
"UUID": "UUID"
},
"ThingsGateway.Gateway.Razor._Imports": {
"Actuator": "Actuator",

12
src/Gateway/ThingsGateway.Gateway.Razor/Locales/zh-CN.json
View File

@@ -1,4 +1,16 @@
{
"ThingsGateway.Management.Authentication": {
"AuthName": "公司名称",
"Authorized": "已授权",
"ExpireTime": "过期时间",
"Password": "注册码",
"Register": "注册",
"RegisterStatus": "注册状态",
"Unauthorized": "未授权",
"Unregister": "取消注册",
"UUID": "唯一编码"
},
"ThingsGateway.Gateway.Razor._Imports": {
"Actuator": "执行",

1
src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableEditComponent.razor
View File

@@ -46,6 +46,7 @@
<EditorItem @bind-Field="@context.Description" />
<EditorItem @bind-Field="@context.CollectGroup" />
<EditorItem @bind-Field="@context.BusinessGroup" />
<EditorItem @bind-Field="@context.BusinessGroupUpdateTrigger" />
<EditorItem @bind-Field="@context.Unit" />
<EditorItem @bind-Field="@context.ProtectType" />

3
src/Gateway/ThingsGateway.Gateway.Razor/Pages/GatewayMonitorPage/Variable/VariableRuntimeInfo.razor
View File

@@ -35,7 +35,8 @@
<TableColumn @bind-Field="@context.Name" ShowTips=true Filterable=true Sortable=true Visible=true />
<TableColumn @bind-Field="@context.Description" ShowTips=true Filterable=true Sortable=true Visible=true />
<TableColumn @bind-Field="@context.BusinessGroup" ShowTips=true Filterable=true Sortable=true Visible=true />
<TableColumn @bind-Field="@context.BusinessGroupUpdateTrigger" ShowTips=true Filterable=true Sortable=true Visible=true />
<TableColumn @bind-Field="@context.Enable" Filterable=true Sortable=true Visible="false" />
<TableColumn Field="@context.ChangeTime" ShowTips=true FieldExpression=@(()=>context.ChangeTime) Filterable=true Sortable=true Visible=false />
<TableColumn Field="@context.CollectTime" ShowTips=true FieldExpression=@(()=>context.CollectTime) Filterable=true Sortable=true Visible=true />

2
src/Plugin/ThingsGateway.Plugin.DB/QuestDB/QuestDBProducer.other.cs
View File

@@ -75,7 +75,7 @@ public partial class QuestDBProducer : BusinessBaseWithCacheIntervalVariableMode
private void UpdateVariable(VariableRuntime variableRuntime, VariableBasicData variable)
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{
AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>(_config)));

2
src/Plugin/ThingsGateway.Plugin.DB/SqlDB/SqlDbProducer.other.cs
View File

@@ -82,7 +82,7 @@ public partial class SqlDBProducer : BusinessBaseWithCacheIntervalVariableModel<
{
if (_driverPropertys.IsHistoryDB)
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{
AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>(_config)));

2
src/Plugin/ThingsGateway.Plugin.DB/TDengineDB/TDengineDBProducer.other.cs
View File

@@ -77,7 +77,7 @@ public partial class TDengineDBProducer : BusinessBaseWithCacheIntervalVariableM
private void UpdateVariable(VariableRuntime variableRuntime, VariableBasicData variable)
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{
AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>(_config)));

2
src/Plugin/ThingsGateway.Plugin.Http/Webhook/Webhook.other.cs
View File

@@ -118,7 +118,7 @@ public partial class Webhook : BusinessBaseWithCacheIntervalScript<VariableBasic
{
if (!_businessPropertyWithCacheIntervalScript.VariableTopic.IsNullOrWhiteSpace())
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{
AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>()));

2
src/Plugin/ThingsGateway.Plugin.Kafka/Kafka/KafkaProducer.other.cs
View File

@@ -112,7 +112,7 @@ public partial class KafkaProducer : BusinessBaseWithCacheIntervalScript<Variabl
{
if (!_businessPropertyWithCacheIntervalScript.VariableTopic.IsNullOrWhiteSpace())
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{
AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>()));

2
src/Plugin/ThingsGateway.Plugin.Mqtt/MqttClient/MqttClient.other.cs
View File

@@ -170,7 +170,7 @@ public partial class MqttClient : BusinessBaseWithCacheIntervalScript<VariableBa
{
if (!_businessPropertyWithCacheIntervalScript.VariableTopic.IsNullOrWhiteSpace())
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{
//获取组内全部变量
AddQueueVarModel(new CacheDBItem<List<VariableBasicData>>(variableRuntimeGroup.Adapt<List<VariableBasicData>>()));

2
src/Plugin/ThingsGateway.Plugin.Mqtt/MqttServer/MqttServer.other.cs
View File

@@ -126,7 +126,7 @@ public partial class MqttServer : BusinessBaseWithCacheIntervalScript<VariableBa
{
if (!_businessPropertyWithCacheIntervalScript.VariableTopic.IsNullOrWhiteSpace())
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{

2
src/Plugin/ThingsGateway.Plugin.RabbitMQ/RabbitMQ/RabbitMQProducer.other.cs
View File

@@ -113,7 +113,7 @@ public partial class RabbitMQProducer : BusinessBaseWithCacheIntervalScript<Vari
{
if (!_businessPropertyWithCacheIntervalScript.VariableTopic.IsNullOrWhiteSpace())
{
if (_driverPropertys.GroupUpdate && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
if (_driverPropertys.GroupUpdate && variable.BusinessGroupUpdateTrigger && !variable.BusinessGroup.IsNullOrEmpty() && VariableRuntimeGroups.TryGetValue(variable.BusinessGroup, out var variableRuntimeGroup))
{
//获取组内全部变量

2
src/Upgrade/ThingsGateway.Upgrade/ThingsGateway.Upgrade.csproj
View File

@@ -16,7 +16,7 @@
<ItemGroup>
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.8" />
<PackageReference Include="TouchSocket.Dmtp" Version="3.1.9" />
</ItemGroup>

2
src/Version.props
View File

@@ -1,6 +1,6 @@
<Project>
<PropertyGroup>
<Version>10.8.17</Version>
<Version>10.8.18</Version>
</PropertyGroup>
<ItemGroup>