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

Services/Processors/CheckValueChangedProcessor.cs

@@ -3,7 +3,7 @@ using PMSWPF.Models;
 
 namespace PMSWPF.Services.Processors;
 
-public class CheckValueChangedProcessor : IVariableDataProcessor
+public class CheckValueChangedProcessor : IVariableProcessor
 {
     private readonly DataServices _dataServices;
 
@@ -11,10 +11,10 @@ public class CheckValueChangedProcessor : IVariableDataProcessor
     {
         _dataServices = dataServices;
     }
-    public Task ProcessAsync(VariableDataContext context)
+    public Task ProcessAsync(VariableContext context)
     {
-        VariableData newVariable = context.Data;
-        if (!_dataServices.AllVariables.TryGetValue(newVariable.Id, out VariableData oldVariable))
+        Variable newVariable = context.Data;
+        if (!_dataServices.AllVariables.TryGetValue(newVariable.Id, out Variable oldVariable))
         {
             NlogHelper.Warn($"检查变量值是否改变时在_dataServices.AllVariables中找不到Id:{newVariable.Id},Name:{newVariable.Name}的变量。");
             context.IsHandled = true;

Services/Processors/HistoryProcessor.cs

@@ -13,22 +13,22 @@ using PMSWPF.Services;
 
 namespace PMSWPF.Services.Processors;
 
-public class HistoryDataProcessor : IVariableDataProcessor, IDisposable
+public class HistoryProcessor : IVariableProcessor, IDisposable
 {
     private const int BATCH_SIZE = 50; // 批量写入的阈值
     private const int TIMER_INTERVAL_MS = 30 * 1000; // 30秒
 
-    private readonly ConcurrentQueue<DbVariableDataHistory> _queue = new();
+    private readonly ConcurrentQueue<DbVariableHistory> _queue = new();
     private readonly Timer _timer;
 
-    public HistoryDataProcessor()
+    public HistoryProcessor()
     {
 
         _timer = new Timer(async _ => await FlushQueueToDatabase(), null, Timeout.Infinite, Timeout.Infinite);
         _timer.Change(TIMER_INTERVAL_MS, TIMER_INTERVAL_MS); // 启动定时器
     }
 
-    public async Task ProcessAsync(VariableDataContext context)
+    public async Task ProcessAsync(VariableContext context)
     {
         // 只有当数据发生变化时才记录历史
         if (!context.Data.IsSave) // 如果数据已经被其他处理器处理过或者不需要保存，则跳过
@@ -36,13 +36,13 @@ public class HistoryDataProcessor : IVariableDataProcessor, IDisposable
             return;
         }
 
-        // 将 VariableData 转换为 DbVariableDataHistory
-        var historyData = new DbVariableDataHistory
+        // 将 Variable 转换为 DbVariableHistory
+        var historyData = new DbVariableHistory
         {
             Name = context.Data.Name,
             NodeId = context.Data.NodeId,
             DataValue = context.Data.DataValue,
-            VariableDataId = context.Data.Id,
+            VariableId = context.Data.Id,
             Timestamp = DateTime.Now // 记录当前时间
         };
 
@@ -59,7 +59,7 @@ public class HistoryDataProcessor : IVariableDataProcessor, IDisposable
         // 停止定时器，防止在写入过程中再次触发
         _timer.Change(Timeout.Infinite, Timeout.Infinite);
 
-        var itemsToProcess = new List<DbVariableDataHistory>();
+        var itemsToProcess = new List<DbVariableHistory>();
         while (_queue.TryDequeue(out var item))
         {
             itemsToProcess.Add(item);

Services/Processors/LoggingProcessor.cs

@@ -9,15 +9,15 @@ namespace PMSWPF.Services.Processors;
 /// 一个简单的数据处理器实现，用于演示。
 /// 其主要功能是记录接收到的变量数据的名称和值。
 /// </summary>
-public class LoggingDataProcessor : IVariableDataProcessor
+public class LoggingProcessor : IVariableProcessor
 {
-    public LoggingDataProcessor()
+    public LoggingProcessor()
     {
     }
 
-    public Task ProcessAsync(VariableDataContext context)
+    public Task ProcessAsync(VariableContext context)
     {
-        NlogHelper.Info($"处理数据: {context.Data.Name}, 值: {context.Data.DataValue}");
+        // NlogHelper.Info($"处理数据: {context.Data.Name}, 值: {context.Data.DataValue}");
         return Task.CompletedTask;
     }
 }

Services/Processors/UpdateDbVariableProcessor.cs

@@ -4,7 +4,7 @@ using PMSWPF.Helper;
 
 namespace PMSWPF.Services.Processors
 {
-    public class UpdateDbVariableProcessor : IVariableDataProcessor
+    public class UpdateDbVariableProcessor : IVariableProcessor
     {
         private readonly DataServices _dataServices;
 
@@ -13,15 +13,15 @@ namespace PMSWPF.Services.Processors
             _dataServices = dataServices;
         }
 
-        public async Task ProcessAsync(VariableDataContext context)
+        public async Task ProcessAsync(VariableContext context)
         {
             try
             {
-                // 假设 DataServices 有一个方法来更新 VariableData
-                await _dataServices.UpdateVariableDataAsync(context.Data);
-                NlogHelper.Info($"数据库变量 {context.Data.Name} 更新成功，值为: {context.Data.DataValue}");
+                // 假设 DataServices 有一个方法来更新 Variable
+                await _dataServices.UpdateVariableAsync(context.Data);
+                // NlogHelper.Info($"数据库变量 {context.Data.Name} 更新成功，值为: {context.Data.DataValue}");
                 
-                if (!_dataServices.AllVariables.TryGetValue(context.Data.Id, out VariableData oldVariable))
+                if (!_dataServices.AllVariables.TryGetValue(context.Data.Id, out Variable oldVariable))
                 {
                     NlogHelper.Warn($"数据库更新完成修改变量值是否改变时在_dataServices.AllVariables中找不到Id:{context.Data.Id},Name:{context.Data.Name}的变量。");
                     context.IsHandled = true;