修改画面

DMS.Infrastructure/Repositories/VariableRepository.cs

@@ -29,88 +29,6 @@ public class VariableRepository : BaseRepository<DbVariable>, IVariableRepositor
     }
 
 
-    /*
-    /// <summary>
-    /// 为变量添加MQTT服务器关联，并指定别名。（此方法当前被注释，可能为待实现或废弃功能）
-    /// </summary>
-    /// <param name="variableMqttList"></param>
-    /// <param name="variableDatas">要添加MQTT服务器的变量数据列表。</param>
-    /// <returns>成功添加或更新关联的数量。</returns>
-     public async Task<int> AddMqttToVariablesAsync(IEnumerable<VariableMqtt> variableMqttList)
-    {
-        await _dbContext.GetInstance().BeginTranAsync();
-
-        try
-        {
-            int affectedCount = 0;
-            var variableIds = variableMqttList.Select(vm => vm.Variable.Id).Distinct().ToList();
-            var mqttIds = variableMqttList.Select(vm => vm.Mqtt.Id).Distinct().ToList();
-
-            // 1. 一次性查询所有相关的现有别名
-            var existingAliases = await _dbContext.GetInstance().Queryable<DbVariableMqtt>()
-                                          .Where(it => variableIds.Contains(it.VariableId) && mqttIds.Contains(it.MqttId))
-                                          .ToListAsync();
-
-            var existingAliasesDict = existingAliases
-                .ToDictionary(a => (a.VariableId, a.Mqtt.Id), a => a);
-
-            var toInsert = new List<DbVariableMqtt>();
-            var toUpdate = new List<DbVariableMqtt>();
-
-            foreach (var variableMqtt in variableMqttList)
-            {
-                var key = (variableMqtt.Variable.Id, variableMqtt.Mqtt.Id);
-                if (existingAliasesDict.TryGetValue(key, out var existingAlias))
-                {
-                    // 如果存在但别名不同，则准备更新
-                    // if (existingAlias.MqttAlias != variableMqtt.MqttAlias)
-                    // {
-                    //     existingAlias.MqttAlias = variableMqtt.MqttAlias;
-                    //     existingAlias.UpdateTime = DateTime.Now;
-                    //     toUpdate.Add(existingAlias);
-                    // }
-                }
-                else
-                {
-                    // 如果不存在，则准备插入
-                    toInsert.Add(new DbVariableMqtt
-                    {
-                        VariableId = variableMqtt.Variable.Id,
-                        MqttId = variableMqtt.Mqtt.Id,
-                        // MqttAlias = variableMqtt.MqttAlias,
-                        CreateTime = DateTime.Now,
-                        UpdateTime = DateTime.Now
-                    });
-                }
-            }
-
-            // 2. 批量更新
-            if (toUpdate.Any())
-            {
-                var updateResult = await _dbContext.GetInstance().Updateable(toUpdate).ExecuteCommandAsync();
-                affectedCount += updateResult;
-            }
-
-            // 3. 批量插入
-            if (toInsert.Any())
-            {
-                var insertResult = await _dbContext.GetInstance().Insertable(toInsert).ExecuteCommandAsync();
-                affectedCount += insertResult;
-            }
-
-            await _dbContext.GetInstance().CommitTranAsync();
-            //_logger.LogInformation($"成功为 {variableMqttList.Count()} 个变量请求添加/更新了MQTT服务器关联，实际影响 {affectedCount} 个。");
-            return affectedCount;
-        }
-        catch (Exception ex)
-        {
-            await _dbContext.GetInstance().RollbackTranAsync();
-            //_logger.LogError(ex, $"为变量添加MQTT服务器关联时发生错误: {ex.Message}");
-            // 根据需要，可以向上层抛出异常
-            throw;
-        }
-    }
-*/
     /// <summary>
     /// 异步根据ID获取单个变量。
     /// </summary>
@@ -158,6 +76,23 @@ public class VariableRepository : BaseRepository<DbVariable>, IVariableRepositor
     public async Task<int> DeleteAsync(Variable entity) => await base.DeleteAsync(_mapper.Map<DbVariable>(entity));
     
     
+    /// <summary>
+    /// 异步根据变量表ID删除变量。
+    /// </summary>
+    /// <param name="variableTableId">变量表的唯一标识符。</param>
+    /// <returns>受影响的行数。</returns>
+    public async Task<int> DeleteByVariableTableIdAsync(int variableTableId)
+    {
+        var stopwatch = new Stopwatch();
+        stopwatch.Start();
+        var result = await _dbContext.GetInstance().Deleteable<DbVariable>()
+                             .Where(v => v.VariableTableId == variableTableId)
+                             .ExecuteCommandAsync();
+        stopwatch.Stop();
+        _logger.LogInformation($"Delete {typeof(DbVariable)} by VariableTableId={variableTableId}, Count={result}, 耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return result;
+    }
+    
     /// <summary>
     /// 异步根据ID删除变量。
     /// </summary>

DMS.Infrastructure/Repositories/VariableTableRepository.cs

@@ -3,8 +3,6 @@ using DMS.Core.Interfaces.Repositories;
 using DMS.Core.Models;
 using DMS.Infrastructure.Data;
 using DMS.Infrastructure.Entities;
-
-
 using AutoMapper;
 using Microsoft.Extensions.Logging;
 
@@ -17,6 +15,7 @@ namespace DMS.Infrastructure.Repositories;
 public class VariableTableRepository : BaseRepository<DbVariableTable>, IVariableTableRepository
 {
     private readonly IMapper _mapper;
+    private readonly IVariableRepository _variableRepository;
 
     /// <summary>
     /// 构造函数，注入 AutoMapper 和 SqlSugarDbContext。
@@ -24,10 +23,26 @@ public class VariableTableRepository : BaseRepository<DbVariableTable>, IVariabl
     /// <param name="mapper">AutoMapper 实例，用于实体模型和数据库模型之间的映射。</param>
     /// <param name="dbContext">SqlSugar 数据库上下文，用于数据库操作。</param>
     /// <param name="logger">日志记录器实例。</param>
-    public VariableTableRepository(IMapper mapper, SqlSugarDbContext dbContext, ILogger<VariableTableRepository> logger)
+    public VariableTableRepository(IMapper mapper, SqlSugarDbContext dbContext, ILogger<VariableTableRepository> logger,
+                                   IVariableRepository variableRepository)
         : base(dbContext, logger)
     {
         _mapper = mapper;
+        _variableRepository = variableRepository;
+    }
+
+    /// <summary>
+    /// 异步根据ID获取单个变量表。
+    /// </summary>
+    /// <param name="id">变量表的唯一标识符。</param>
+    /// <returns>对应的变量表实体，如果不存在则为null。</returns>
+    public async Task<List<VariableTable>> GetByDeviceIdAsync(int deviceId)
+    {
+        var variableTables = await _dbContext.GetInstance()
+                                             .Queryable<DbVariableTable>()
+                                             .Where(d => d.DeviceId == deviceId)
+                                             .ToListAsync();
+        return _mapper.Map<List<VariableTable>>(variableTables);
     }
 
     /// <summary>
@@ -67,15 +82,23 @@ public class VariableTableRepository : BaseRepository<DbVariableTable>, IVariabl
     /// </summary>
     /// <param name="entity">要更新的变量表实体。</param>
     /// <returns>受影响的行数。</returns>
-    public async Task<int> UpdateAsync(VariableTable entity) => await base.UpdateAsync(_mapper.Map<DbVariableTable>(entity));
+    public async Task<int> UpdateAsync(VariableTable entity) =>
+        await base.UpdateAsync(_mapper.Map<DbVariableTable>(entity));
 
     /// <summary>
     /// 异步删除变量表。
     /// </summary>
     /// <param name="entity">要删除的变量表实体。</param>
     /// <returns>受影响的行数。</returns>
-    public async Task<int> DeleteAsync(VariableTable entity) => await base.DeleteAsync(_mapper.Map<DbVariableTable>(entity));
-    
+    public async Task<int> DeleteAsync(VariableTable entity)
+    {
+        //删除变量表中的所有变量
+        await  _variableRepository.DeleteByVariableTableIdAsync(entity.Id);
+        //删除变量表
+        return   await base.DeleteAsync(_mapper.Map<DbVariableTable>(entity));
+    }
+        
+
     /// <summary>
     /// 异步根据ID删除变量表。
     /// </summary>
@@ -85,13 +108,17 @@ public class VariableTableRepository : BaseRepository<DbVariableTable>, IVariabl
     {
         var stopwatch = new Stopwatch();
         stopwatch.Start();
-        var result = await _dbContext.GetInstance().Deleteable(new DbVariableTable() { Id = id })
-                             .ExecuteCommandAsync();
+        //删除变量表中的所有变量
+        await  _variableRepository.DeleteByVariableTableIdAsync(id);
+        //删除变量表
+        var result = await _dbContext.GetInstance()
+                                     .Deleteable(new DbVariableTable() { Id = id })
+                                     .ExecuteCommandAsync();
         stopwatch.Stop();
         _logger.LogInformation($"Delete {typeof(DbVariableTable)},ID={id},耗时：{stopwatch.ElapsedMilliseconds}ms");
         return result;
     }
-    
+
     /// <summary>
     /// 异步获取指定数量的变量表。
     /// </summary>
@@ -101,7 +128,6 @@ public class VariableTableRepository : BaseRepository<DbVariableTable>, IVariabl
     {
         var dbList = await base.TakeAsync(number);
         return _mapper.Map<List<VariableTable>>(dbList);
-
     }
 
     public async Task<List<VariableTable>> AddBatchAsync(List<VariableTable> entities)
@@ -120,9 +146,14 @@ public class VariableTableRepository : BaseRepository<DbVariableTable>, IVariabl
     {
         var stopwatch = new Stopwatch();
         stopwatch.Start();
-        var result = await _dbContext.GetInstance().Deleteable<DbVariableTable>()
-                             .Where(it => it.DeviceId == deviceId)
-                             .ExecuteCommandAsync();
+        int result = 0;
+        var variableTables = await GetByDeviceIdAsync(deviceId);
+        foreach (var variableTable in variableTables)
+        {
+          var res=  await DeleteByIdAsync(variableTable.Id);
+          result += res;
+        }
+
         stopwatch.Stop();
         _logger.LogInformation($"Delete VariableTable by DeviceId={deviceId}, 耗时：{stopwatch.ElapsedMilliseconds}ms");
         return result;