完成的变更：

1. 向 VariableTableManagementService 添加了 IEventService 依赖 2. 将内存操作和事件触发逻辑合并到数据库操作方法中： - CreateVariableTableAsync 现在会在数据库创建后自动添加到内存并触发事件 - UpdateVariableTableAsync 现在会在数据库更新后自动更新内存并触发事件 - DeleteVariableTableAsync 现在会在数据库删除后自动从内存移除并触发事件 3. 从类中删除了独立的内存操作方法 4. 从接口中移除了内存操作方法 5. 更新了所有调用这些服务的代码，使它们不再调用已删除的内存方法 6. 扩展了 IEventService 以支持 VariableTableChanged 事件
2025-10-01 19:16:47 +08:00
parent 438ee0fe58
commit e43c0df1cf
11 changed files with 116 additions and 103 deletions
--- a/DMS.Application/Services/EventService.cs
+++ b/DMS.Application/Services/EventService.cs
@@ -84,6 +84,21 @@ public class EventService : IEventService
    #endregion

    #region 变量事件
+    /// <summary>
+    /// 变量表改变事件
+    /// </summary>
+    public event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;
+
+    /// <summary>
+    /// 触发变量表改变事件
+    /// </summary>
+    /// <param name="sender">事件发送者</param>
+    /// <param name="e">变量表改变事件参数</param>
+    public void RaiseVariableTableChanged(object sender, VariableTableChangedEventArgs e)
+    {
+        OnVariableTableChanged?.Invoke(sender, e);
+    }
+
    /// <summary>
    /// 变量值改变事件
    /// </summary>
--- a/DMS.Application/Services/Management/VariableTableManagementService.cs
+++ b/DMS.Application/Services/Management/VariableTableManagementService.cs
@@ -15,17 +15,20 @@ public class VariableTableManagementService : IVariableTableManagementService
 {
    private readonly IVariableTableAppService _variableTableAppService;
    private readonly IAppDataStorageService _appDataStorageService;
+    private readonly IEventService _eventService;

    /// <summary>
    /// 当变量表数据发生变化时触发
    /// </summary>
    public event EventHandler<VariableTableChangedEventArgs> OnVariableTableChanged;

-    public VariableTableManagementService(IVariableTableAppService variableTableAppService,IAppDataStorageService appDataStorageService 
-                                         )
+    public VariableTableManagementService(IVariableTableAppService variableTableAppService, 
+                                         IAppDataStorageService appDataStorageService,
+                                         IEventService eventService)
    {
        _variableTableAppService = variableTableAppService;
        _appDataStorageService = appDataStorageService;
+        _eventService = eventService;
    }

    /// <summary>
@@ -49,7 +52,42 @@ public class VariableTableManagementService : IVariableTableManagementService
    /// </summary>
    public async Task<CreateVariableTableWithMenuDto> CreateVariableTableAsync(CreateVariableTableWithMenuDto dto)
    {
-        return await _variableTableAppService.CreateVariableTableAsync(dto);
+        var result = await _variableTableAppService.CreateVariableTableAsync(dto);
+        
+        // 创建成功后，将变量表添加到内存中
+        if (result?.VariableTable != null)
+        {
+            // 添加null检查
+            if (result.VariableTable == null)
+                return result;
+
+            DeviceDto deviceDto = null;
+            if (_appDataStorageService.Devices != null && 
+                _appDataStorageService.Devices.TryGetValue(result.VariableTable.DeviceId, out var device))
+            {
+                deviceDto = device;
+                // 确保VariableTables不为null
+                if (device.VariableTables == null)
+                    device.VariableTables = new List<VariableTableDto>();
+                    
+                device.VariableTables.Add(result.VariableTable);
+                
+                // 确保Device属性不为null
+                if (result.VariableTable != null)
+                    result.VariableTable.Device = device;
+            }
+
+            // 确保_variableTables和result.VariableTable不为null
+            if (_appDataStorageService.VariableTables.TryAdd(result.VariableTable.Id, result.VariableTable))
+            {
+                _eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
+                                           DataChangeType.Added,
+                                           result.VariableTable,
+                                           deviceDto));
+            }
+        }
+        
+        return result;
    }

    /// <summary>
@@ -57,7 +95,25 @@ public class VariableTableManagementService : IVariableTableManagementService
    /// </summary>
    public async Task<int> UpdateVariableTableAsync(VariableTableDto variableTableDto)
    {
-        return await _variableTableAppService.UpdateVariableTableAsync(variableTableDto);
+        var result = await _variableTableAppService.UpdateVariableTableAsync(variableTableDto);
+        
+        // 更新成功后，更新内存中的变量表
+        if (result > 0 && variableTableDto != null)
+        {
+            DeviceDto deviceDto = null;
+            if (_appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
+            {
+                deviceDto = device;
+            }
+
+            _appDataStorageService.VariableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
+            _eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
+                                             DataChangeType.Updated,
+                                             variableTableDto,
+                                             deviceDto));
+        }
+        
+        return result;
    }

    /// <summary>
@@ -65,82 +121,33 @@ public class VariableTableManagementService : IVariableTableManagementService
    /// </summary>
    public async Task<bool> DeleteVariableTableAsync(int id)
    {
-        return await _variableTableAppService.DeleteVariableTableAsync(id);
-    }
-
-    /// <summary>
-    /// 在内存中添加变量表
-    /// </summary>
-    public void AddVariableTableToMemory(VariableTableDto variableTableDto)
-    {
-        // 添加null检查
-        if (variableTableDto == null)
-            return;
-
-        DeviceDto deviceDto = null;
-        if (_appDataStorageService.Devices != null && 
-            _appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
+        var variableTable = await _variableTableAppService.GetVariableTableByIdAsync(id); // 获取变量表信息用于内存删除
+        var result = await _variableTableAppService.DeleteVariableTableAsync(id);
+        
+        // 删除成功后，从内存中移除变量表
+        if (result && variableTable != null)
        {
-            deviceDto = device;
-            // 确保VariableTables不为null
-            if (device.VariableTables == null)
-                device.VariableTables = new List<VariableTableDto>();
-                
-            device.VariableTables.Add(variableTableDto);
-            
-            // 确保Device属性不为null
-            if (variableTableDto != null)
-                variableTableDto.Device = device;
-        }
-
-        // 确保_variableTables和variableTableDto不为null
-            if (_appDataStorageService.VariableTables.TryAdd(variableTableDto.Id, variableTableDto))
+            if (_appDataStorageService.VariableTables.TryRemove(id, out var variableTableDto))
            {
-                OnVariableTableChanged?.Invoke(this, new VariableTableChangedEventArgs(
-                                           DataChangeType.Added,
-                                           variableTableDto,
-                                           deviceDto));
+                DeviceDto deviceDto = null;
+                if (variableTableDto != null && _appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
+                {
+                    deviceDto = device;
+                    if (device.VariableTables != null)
+                        device.VariableTables.Remove(variableTableDto);
+                }
+
+                _eventService.RaiseVariableTableChanged(this, new VariableTableChangedEventArgs(
+                                                 DataChangeType.Deleted,
+                                                 variableTableDto,
+                                                 deviceDto));
            }
-    }
-
-    /// <summary>
-    /// 在内存中更新变量表
-    /// </summary>
-    public void UpdateVariableTableInMemory(VariableTableDto variableTableDto)
-    {
-        DeviceDto deviceDto = null;
-        if (_appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
-        {
-            deviceDto = device;
        }
-
-        _appDataStorageService.VariableTables.AddOrUpdate(variableTableDto.Id, variableTableDto, (key, oldValue) => variableTableDto);
-        OnVariableTableChanged?.Invoke(this,new VariableTableChangedEventArgs(
-                                         DataChangeType.Updated,
-                                         variableTableDto,
-                                         deviceDto));
+        
+        return result;
    }

-    /// <summary>
-    /// 在内存中删除变量表
-    /// </summary>
-    public void RemoveVariableTableFromMemory(int variableTableId)
-    {
-        if (_appDataStorageService.VariableTables.TryRemove(variableTableId, out var variableTableDto))
-        {
-            DeviceDto deviceDto = null;
-            if (variableTableDto != null && _appDataStorageService.Devices.TryGetValue(variableTableDto.DeviceId, out var device))
-            {
-                deviceDto = device;
-                device.VariableTables.Remove(variableTableDto);
-            }
-
-            OnVariableTableChanged?.Invoke(this,new VariableTableChangedEventArgs(
-                                             DataChangeType.Deleted,
-                                             variableTableDto,
-                                             deviceDto));
-        }
-    }
+    

  
 }
--- a/DMS.Application/Services/Monitoring/DeviceMonitoringService.cs
+++ b/DMS.Application/Services/Monitoring/DeviceMonitoringService.cs
@@ -2,6 +2,7 @@ using System;
 using System.Collections.Concurrent;
 using System.Threading;
 using System.Threading.Tasks;
+using DMS.Application.Events;
 using DMS.Application.Interfaces;
 using DMS.Core.Events;
 using DMS.Core.Models;