修复变量值不更新的问题

DMS.Application/Interfaces/ILogManagementService.cs

@@ -1,7 +1,7 @@
 using DMS.Application.DTOs;
 using DMS.Application.DTOs.Events;
 
-namespace DMS.Application.Services;
+namespace DMS.Application.Interfaces;
 
 public interface ILogManagementService
 {

DMS.Application/Interfaces/IMenuManagementService.cs

@@ -1,6 +1,6 @@
 using DMS.Application.DTOs;
 
-namespace DMS.Application.Services;
+namespace DMS.Application.Interfaces;
 
 public interface IMenuManagementService
 {

DMS.Application/Interfaces/IMqttManagementService.cs

@@ -1,6 +1,6 @@
 using DMS.Application.DTOs;
 
-namespace DMS.Application.Services;
+namespace DMS.Application.Interfaces;
 
 public interface IMqttManagementService
 {

DMS.Application/Services/IVariableManagementService.cs

@@ -1,6 +1,7 @@
 using System.Collections.Concurrent;
 using DMS.Application.DTOs;
 using DMS.Application.DTOs.Events;
+using DMS.Core.Models;
 
 namespace DMS.Application.Services;
 
@@ -56,8 +57,15 @@ public interface IVariableManagementService
     /// </summary>
     void RemoveVariableFromMemory(int variableId, ConcurrentDictionary<int, VariableTableDto> variableTables);
 
+    void VariableValueChanged(VariableValueChangedEventArgs eventArgs);
+
     /// <summary>
     /// 当变量数据发生变化时触发
     /// </summary>
     event EventHandler<VariableChangedEventArgs> OnVariableChanged;
+
+    /// <summary>
+    /// 当变量数据发生变化时触发
+    /// </summary>
+    event EventHandler<VariableValueChangedEventArgs> OnVariableValueChanged;
 }

DMS.Application/Services/VariableManagementService.cs

@@ -25,7 +25,13 @@ public class VariableManagementService : IVariableManagementService
     /// </summary>
     public event EventHandler<VariableChangedEventArgs> OnVariableChanged;
 
-    public VariableManagementService(IVariableAppService variableAppService,IAppDataStorageService appDataStorageService)
+    /// <summary>
+    /// 当变量数据发生变化时触发
+    /// </summary>
+    public event EventHandler<VariableValueChangedEventArgs> OnVariableValueChanged;
+
+    public VariableManagementService(IVariableAppService variableAppService,
+                                     IAppDataStorageService appDataStorageService)
     {
         _variableAppService = variableAppService;
         _appDataStorageService = appDataStorageService;
@@ -102,14 +108,16 @@ public class VariableManagementService : IVariableManagementService
 
         if (_appDataStorageService.Variables.TryAdd(variableDto.Id, variableDto))
         {
-            OnVariableChanged?.Invoke(this,new VariableChangedEventArgs(DataChangeType.Added, variableDto, variableTableDto));
+            OnVariableChanged?.Invoke(
+                this, new VariableChangedEventArgs(DataChangeType.Added, variableDto, variableTableDto));
         }
     }
 
     /// <summary>
     /// 在内存中更新变量
     /// </summary>
-    public void UpdateVariableInMemory(VariableDto variableDto, ConcurrentDictionary<int, VariableTableDto> variableTables)
+    public void UpdateVariableInMemory(VariableDto variableDto,
+                                       ConcurrentDictionary<int, VariableTableDto> variableTables)
     {
         VariableTableDto variableTableDto = null;
         if (variableTables.TryGetValue(variableDto.VariableTableId, out var variableTable))
@@ -118,7 +126,8 @@ public class VariableManagementService : IVariableManagementService
         }
 
         _appDataStorageService.Variables.AddOrUpdate(variableDto.Id, variableDto, (key, oldValue) => variableDto);
-        OnVariableChanged?.Invoke(this,new VariableChangedEventArgs(DataChangeType.Updated, variableDto, variableTableDto));
+        OnVariableChanged?.Invoke(
+            this, new VariableChangedEventArgs(DataChangeType.Updated, variableDto, variableTableDto));
     }
 
     /// <summary>
@@ -135,8 +144,13 @@ public class VariableManagementService : IVariableManagementService
                 variableTable.Variables.Remove(variableDto);
             }
 
-            OnVariableChanged?.Invoke(this,new VariableChangedEventArgs(DataChangeType.Deleted, variableDto, variableTableDto));
+            OnVariableChanged?.Invoke(
+                this, new VariableChangedEventArgs(DataChangeType.Deleted, variableDto, variableTableDto));
         }
     }
 
+    public void VariableValueChanged(VariableValueChangedEventArgs eventArgs)
+    {
+        OnVariableValueChanged?.Invoke(this, eventArgs);
+    }
 }

DMS.Infrastructure/Services/OpcUaServiceManager.cs

@@ -300,6 +300,8 @@ namespace DMS.Infrastructure.Services
                         variable.DisplayValue = newValue;
                         variable.UpdatedAt = DateTime.Now;
                         
+                        _logger.LogDebug($"节点：{variable.OpcUaNodeId}值发生了变化:{newValue}");
+
                         // 触发变量值变更事件
                         var eventArgs = new VariableValueChangedEventArgs(
                             variable.Id,
@@ -308,7 +310,7 @@ namespace DMS.Infrastructure.Services
                             newValue,
                             variable.UpdatedAt);
                         
-                        // _appDataCenterService.OnVariableValueChanged( eventArgs);
+                        _appDataCenterService.VariableManagementService.VariableValueChanged( eventArgs);
 
                         // 推送到数据处理队列
                         await _dataProcessingService.EnqueueAsync(variable);

DMS.WPF/Services/DataEventService.cs

@@ -37,7 +37,7 @@ public class DataEventService : IDataEventService
       
         
         // 监听变量值变更事件
-        _appDataCenterService.VariableManagementService.OnVariableChanged += OnVariableValueChanged;
+        _appDataCenterService.VariableManagementService.OnVariableValueChanged += OnVariableValueChanged;
         _appDataCenterService.DataLoaderService.OnLoadDataCompleted += OnLoadDataCompleted;
         // 监听日志变更事件
         // _appDataCenterService.OnLogChanged += _logDataService.OnNlogChanged;
@@ -60,18 +60,18 @@ public class DataEventService : IDataEventService
     /// <summary>
     /// 处理变量值变更事件。
     /// </summary>
-    private void OnVariableValueChanged(object? sender, VariableChangedEventArgs e)
+    private void OnVariableValueChanged(object? sender, VariableValueChangedEventArgs e)
     {
         // 在UI线程上更新变量值
         App.Current.Dispatcher.BeginInvoke(new Action(() =>
         {
             // 查找并更新对应的变量
-            var variableToUpdate = _dataStorageService.Variables.FirstOrDefault(v => v.Id == e.Variable.Id);
+            var variableToUpdate = _dataStorageService.Variables.FirstOrDefault(v => v.Id == e.VariableId);
             if (variableToUpdate != null)
             {
-                variableToUpdate.DataValue = e.Variable.DataValue;
+                variableToUpdate.DataValue = e.NewValue;
-                variableToUpdate.DisplayValue = e.Variable.DisplayValue;
+                variableToUpdate.DisplayValue = e.NewValue;
-                variableToUpdate.UpdatedAt = e.Variable.UpdatedAt;
+                variableToUpdate.UpdatedAt = e.UpdateTime;
             }
         }));
     }

DMS.WPF/Services/VariableTableDataService.cs

@@ -32,11 +32,14 @@ public class VariableTableDataService : IVariableTableDataService
     
     public void LoadAllVariableTables()
     {
-        foreach (var variableTable in _dataStorageService.VariableTables)
+        foreach (var device in _dataStorageService.Devices)
+        {
+            foreach (var variableTable in device.VariableTables)
             {
                 _dataStorageService.VariableTables.Add(variableTable);
             }
         }
+    }
 
     public async Task<bool> AddVariableTable(VariableTableDto variableTableDto,
                                              MenuBeanDto menuDto = null, bool isAddDb = false)