bugfix:修复Mqtt服务器详情页变量值不更新的问题，修复修改Mqtt别名后台不更新的问题，重新调整了别名的架构

2025-10-11 18:07:01 +08:00
parent 6daca3eaf6
commit 2ada4246ff
30 changed files with 527 additions and 275 deletions
--- a/DMS.WPF/Services/DataEventService.cs
+++ b/DMS.WPF/Services/DataEventService.cs
@@ -142,6 +142,9 @@ public class DataEventService : IDataEventService
            _wpfDataService.MqttDataService.LoadMqttServers();
            _logger?.LogDebug("MQTT服务器数据加载完成");
            
+            _wpfDataService.MqttAliasDataService.LoadMqttAliases();
+            _logger?.LogDebug("MQTT别名加载完成");
+            
            _wpfDataService.LogDataService.LoadAllLog();
            _logger?.LogDebug("日志数据加载完成");
            
--- a/DMS.WPF/Services/DataStorageService.cs
+++ b/DMS.WPF/Services/DataStorageService.cs
@@ -46,6 +46,11 @@ public class DataStorageService : IDataStorageService
    /// </summary>
    public ObservableCollection<NlogItem> Nlogs { get; set; }

+    /// <summary>
+    /// MQTT别名列表。
+    /// </summary>
+    public ObservableDictionary<int, MqttAliasItem> MqttAliases { get; set; }
+
    /// <summary>
    /// 触发器列表。
    /// </summary>
@@ -60,6 +65,7 @@ public class DataStorageService : IDataStorageService
        Menus=new ObservableCollection<MenuItem>();
        MenuTrees=new ObservableCollection<MenuItem>();
        Nlogs=new ObservableCollection<NlogItem>();
+        MqttAliases=new ObservableDictionary<int, MqttAliasItem>();
        Triggers = new ObservableDictionary<int, TriggerItem>();
        
    }
--- a/DMS.WPF/Services/MqttAliasDataService.cs
+++ b/DMS.WPF/Services/MqttAliasDataService.cs
@@ -0,0 +1,174 @@
+using AutoMapper;
+using DMS.Application.DTOs;
+using DMS.Application.Interfaces;
+using DMS.Application.Interfaces.Management;
+using DMS.WPF.Interfaces;
+using DMS.WPF.ItemViewModel;
+
+namespace DMS.WPF.Services;
+
+/// <summary>
+/// MQTT别名数据服务类，负责管理MQTT别名相关的数据和操作。
+/// </summary>
+public class MqttAliasDataService : IMqttAliasDataService
+{
+    private readonly IMapper _mapper;
+    private readonly IAppDataStorageService _appDataStorageService;
+    private readonly IMqttAliasManagementService _mqttAliasManagementService;
+    private readonly IDataStorageService _dataStorageService;
+
+    /// <summary>
+    /// MqttAliasDataService类的构造函数。
+    /// </summary>
+    /// <param name="mapper">AutoMapper 实例。</param>
+    /// <param name="appDataStorageService">应用数据存储服务实例。</param>
+    /// <param name="mqttAliasManagementService">MQTT别名管理服务实例。</param>
+    /// <param name="dataStorageService">数据存储服务实例。</param>
+    public MqttAliasDataService(IMapper mapper, 
+        IAppDataStorageService appDataStorageService, 
+        IMqttAliasManagementService mqttAliasManagementService, 
+        IDataStorageService dataStorageService)
+    {
+        _mapper = mapper;
+        _appDataStorageService = appDataStorageService;
+        _mqttAliasManagementService = mqttAliasManagementService;
+        _dataStorageService = dataStorageService;
+    }
+
+    /// <summary>
+    /// 加载所有MQTT别名数据。
+    /// </summary>
+    public async Task LoadMqttAliases()
+    {
+        try
+        {
+            // 清空现有数据
+            _dataStorageService.MqttAliases.Clear();
+            
+            // 加载MQTT别名数据
+            foreach (var mqttAlias in _appDataStorageService.MqttAliases.Values)
+            {
+                MqttAliasItem mqttAliasItem = _mapper.Map<MqttAliasItem>(mqttAlias);
+                if(_dataStorageService.MqttAliases.TryAdd(mqttAlias.Id, mqttAliasItem))
+                {
+
+                    if (_dataStorageService.MqttServers.TryGetValue(mqttAlias.MqttServerId,out var mqttServerItem))
+                    {
+                        mqttServerItem.VariableAliases.Add(mqttAliasItem);
+                        mqttAliasItem.MqttServer = mqttServerItem;
+                    }
+
+                    if (_dataStorageService.Variables.TryGetValue(mqttAlias.VariableId,out var variableItem))
+                    {
+                        variableItem.MqttAliases.Add(mqttAliasItem);
+                        mqttAliasItem.Variable = variableItem;
+                    }
+
+                }
+
+            }
+        }
+        catch (Exception ex)
+        {
+            // 记录异常或处理错误
+            Console.WriteLine($"加载MQTT别名数据时发生错误: {ex.Message}");
+        }
+    }
+
+    /// <summary>
+    /// 添加MQTT别名。
+    /// </summary>
+    public async Task<MqttAliasItem> AssignAliasAsync(MqttAliasItem mqttAlias)
+    {
+        var addMqttAlias = await _mqttAliasManagementService.AssignAliasAsync(_mapper.Map<MqttAlias>(mqttAlias));
+
+       
+        if (_dataStorageService.MqttAliases.ContainsKey(addMqttAlias.Id))
+        {
+            return null;
+        }
+        mqttAlias.Id = addMqttAlias.Id;
+
+        _dataStorageService.MqttAliases.Add(mqttAlias.Id, mqttAlias);
+        if (_dataStorageService.MqttServers.TryGetValue(mqttAlias.MqttServerId, out var mqttServerItem))
+        {
+            mqttAlias.MqttServer = mqttServerItem;
+            mqttServerItem.VariableAliases.Add(mqttAlias);
+        }
+        if (_dataStorageService.Variables.TryGetValue(mqttAlias.VariableId, out var variableItem))
+        {
+            mqttAlias.Variable = variableItem;
+            variableItem.MqttAliases.Add(mqttAlias);
+        }
+
+        return mqttAlias;
+    }
+
+    /// <summary>
+    /// 更新MQTT别名。
+    /// </summary>
+    public async Task<bool> UpdateMqttAlias(MqttAliasItem mqttAlias)
+    {
+        var result = await _mqttAliasManagementService.UpdateAsync(_mapper.Map<MqttAlias>(mqttAlias));
+
+        if (result > 0)
+        {
+            // 更新界面数据
+            if (_dataStorageService.MqttAliases.TryGetValue(mqttAlias.Id, out var existingAlias))
+            {
+                // 更新现有别名的属性
+                existingAlias.VariableId = mqttAlias.VariableId;
+                existingAlias.MqttServerId = mqttAlias.MqttServerId;
+                existingAlias.Alias = mqttAlias.Alias;
+                existingAlias.MqttServerName = mqttAlias.MqttServerName;
+            }
+        }
+
+        return result > 0;
+    }
+
+    /// <summary>
+    /// 删除MQTT别名。
+    /// </summary>
+    public async Task<bool> DeleteMqttAlias(MqttAliasItem mqttAlias)
+    {
+        // 从数据库和内存中删除MQTT别名
+        var result = await _mqttAliasManagementService.UpdateAsync(new MqttAlias 
+        { 
+            Id = mqttAlias.Id, 
+            VariableId = mqttAlias.VariableId, 
+            MqttServerId = mqttAlias.MqttServerId,
+            Alias = null // Setting alias to null effectively removes the alias
+        });
+
+        if (result > 0)
+        {
+            // 从界面删除MQTT别名
+            _dataStorageService.MqttAliases.Remove(mqttAlias.Id);
+        }
+
+        return result > 0;
+    }
+    
+    /// <summary>
+    /// 根据ID获取MQTT别名。
+    /// </summary>
+    public async Task<MqttAliasItem> GetMqttAliasById(int id)
+    {
+        if (_dataStorageService.MqttAliases.TryGetValue(id, out var mqttAliasItem))
+        {
+            return mqttAliasItem;
+        }
+
+        // 如果内存中没有，则从数据库查询
+        var mqttAlias = await _mqttAliasManagementService.AssignAliasAsync(new MqttAlias { Id = id });
+        if (mqttAlias != null)
+        {
+            var mappedItem = _mapper.Map<MqttAliasItem>(mqttAlias);
+            _dataStorageService.MqttAliases.TryAdd(mappedItem.Id, mappedItem);
+            return mappedItem;
+        }
+
+        return null;
+    }
+}
--- a/DMS.WPF/Services/WPFDataService.cs
+++ b/DMS.WPF/Services/WPFDataService.cs
@@ -39,6 +39,11 @@ public class WPFDataService : IWPFDataService
    /// </summary>
    public IMqttDataService MqttDataService { get; }

+    /// <summary>
+    /// MQTT别名数据服务。
+    /// </summary>
+    public IMqttAliasDataService MqttAliasDataService { get; }
+
    /// <summary>
    /// 日志数据服务。
    /// </summary>
@@ -61,7 +66,8 @@ public class WPFDataService : IWPFDataService
        IMqttDataService mqttDataService,
        ILogDataService logDataService, 
        IVariableTableDataService variableTableDataService,
-        ITriggerDataService triggerDataService)
+        ITriggerDataService triggerDataService,
+        IMqttAliasDataService mqttAliasDataService)
    {
        _mapper = mapper;
        _appDataCenterService = appDataCenterService;
@@ -72,5 +78,6 @@ public class WPFDataService : IWPFDataService
        LogDataService = logDataService;
        VariableTableDataService = variableTableDataService;
        TriggerDataService = triggerDataService;
+        MqttAliasDataService = mqttAliasDataService;
    }
 }