xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将所有的VariableData改为Variable,将DataVariables改为Variables,修复了变量添加MQTT服务器后，服务器列表不更新的问题

Browse Source
This commit is contained in:
David P.G
2025-07-17 20:13:21 +08:00
parent 6b21c387d5
commit 018fe7c9d0
44 changed files with 410 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Services/DataServices.cs
View File

@@ -31,7 +31,7 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
// 变量数据列表。
[ObservableProperty]
private List<VariableData> _variableDatas;
private List<Variable> _variables;
// 菜单树列表。
[ObservableProperty]
@@ -42,7 +42,7 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
private List<Mqtt> _mqtts;
public ConcurrentDictionary<int, VariableData> AllVariables;
public ConcurrentDictionary<int, Variable> AllVariables;
// 设备数据仓库，用于设备数据的CRUD操作。
private readonly DeviceRepository _deviceRepository;
@@ -97,8 +97,8 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
_menuRepository = menuRepository;
_mqttRepository = mqttRepository;
_varDataRepository = varDataRepository;
_variableDatas = new List<VariableData>();
AllVariables = new ConcurrentDictionary<int, VariableData>();
_variables = new List<Variable>();
AllVariables = new ConcurrentDictionary<int, Variable>();
}
/// <summary>
@@ -161,9 +161,9 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
}
var allVar = await _varDataRepository.GetAllAsync();
foreach (var variableData in allVar)
foreach (var variable in allVar)
{
AllVariables.AddOrUpdate(variableData.Id, variableData, (key, old) => variableData);
AllVariables.AddOrUpdate(variable.Id, variable, (key, old) => variable);
}
}
@@ -234,19 +234,19 @@ public partial class DataServices : ObservableRecipient, IRecipient<LoadMessage>
/// 异步加载变量数据。
/// </summary>
/// <returns>表示异步操作的任务。</returns>
private async Task LoadVariableDatas()
private async Task LoadVariables()
{
VariableDatas = await _varDataRepository.GetAllAsync();
Variables = await _varDataRepository.GetAllAsync();
}
/// <summary>
/// 异步更新变量数据。
/// </summary>
/// <param name="variableData">要更新的变量数据。</param>
/// <param name="variable">要更新的变量数据。</param>
/// <returns>表示异步操作的任务。</returns>
public async Task UpdateVariableDataAsync(VariableData variableData)
public async Task UpdateVariableAsync(Variable variable)
{
await _varDataRepository.UpdateAsync(variableData);
await _varDataRepository.UpdateAsync(variable);
}
}