临时提交3

2025-07-19 11:11:01 +08:00
parent 01fe2e14ef
commit ca67d2e6df
117 changed files with 476 additions and 910 deletions
--- a/DMS.Infrastructure/Repositories/BaseRepository.cs
+++ b/DMS.Infrastructure/Repositories/BaseRepository.cs
@@ -0,0 +1,88 @@
+using AutoMapper;
+using DMS.Core.Helper;
+using DMS.Infrastructure.Interfaces;
+using DMS.Infrastructure.Data;
+using SqlSugar;
+using System.Diagnostics;
+using System.Linq.Expressions;
+
+namespace DMS.Infrastructure.Repositories;
+
+public abstract class BaseRepository<TEntity, TModel>
+    where TEntity : class, new()
+    where TModel : class, new()
+{
+    protected readonly IMapper _mapper;
+    private readonly SqlSugarDbContext dbContext;
+
+    protected SqlSugarClient Db => dbContext.GetInstance();
+
+    protected BaseRepository(IMapper mapper, ITransaction transaction)
+    {
+        _mapper = mapper;
+        this.dbContext = dbContext;
+    }
+
+    public virtual async Task<int> AddAsync(TModel model)
+    {
+        Stopwatch stopwatch = new Stopwatch();
+        stopwatch.Start();
+        var entity = _mapper.Map<TEntity>(model);
+        var result = await Db.Insertable(entity).ExecuteCommandAsync();
+        stopwatch.Stop();
+        NlogHelper.Info($"Add {typeof(TModel).Name}耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return result;
+    }
+
+    public virtual async Task<int> UpdateAsync(TModel model)
+    {
+        Stopwatch stopwatch = new Stopwatch();
+        stopwatch.Start();
+        var entity = _mapper.Map<TEntity>(model);
+        var result = await Db.Updateable(entity).ExecuteCommandAsync();
+        stopwatch.Stop();
+        NlogHelper.Info($"Update {typeof(TModel).Name}耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return result;
+    }
+
+    public virtual async Task<int> DeleteAsync(TModel model)
+    {
+        Stopwatch stopwatch = new Stopwatch();
+        stopwatch.Start();
+        var entity = _mapper.Map<TEntity>(model);
+        var result = await Db.Deleteable(entity).ExecuteCommandAsync();
+        stopwatch.Stop();
+        NlogHelper.Info($"Delete {typeof(TModel).Name}耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return result;
+    }
+
+    public virtual async Task<List<TModel>> GetAllAsync()
+    {
+        Stopwatch stopwatch = new Stopwatch();
+        stopwatch.Start();
+        var entities = await Db.Queryable<TEntity>().ToListAsync();
+        stopwatch.Stop();
+        NlogHelper.Info($"GetAll {typeof(TModel).Name}耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return _mapper.Map<List<TModel>>(entities);
+    }
+
+    public virtual async Task<TModel> GetByIdAsync(int id)
+    {
+        Stopwatch stopwatch = new Stopwatch();
+        stopwatch.Start();
+        var entity = await Db.Queryable<TEntity>().In(id).FirstAsync();
+        stopwatch.Stop();
+        NlogHelper.Info($"GetById {typeof(TModel).Name}耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return _mapper.Map<TModel>(entity);
+    }
+
+    public virtual async Task<TModel> GetByConditionAsync(Expression<Func<TEntity, bool>> expression)
+    {
+        Stopwatch stopwatch = new Stopwatch();
+        stopwatch.Start();
+        var entity = await Db.Queryable<TEntity>().FirstAsync(expression);
+        stopwatch.Stop();
+        NlogHelper.Info($"GetByCondition {typeof(TModel).Name}耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return _mapper.Map<TModel>(entity);
+    }
+}
--- a/DMS.Infrastructure/Repositories/DeviceRepository.cs
+++ b/DMS.Infrastructure/Repositories/DeviceRepository.cs
@@ -6,141 +6,76 @@ using DMS.Core.Helper;
 using DMS.Core.Models;
 using DMS.Infrastructure.Data;
 using SqlSugar;
+using DMS.Infrastructure.Interfaces;

 namespace DMS.Infrastructure.Repositories;

-public class DeviceRepository : IDeviceRepository
+public class DeviceRepository : BaseRepository<DbDevice, Device>, IDeviceRepository
 {
-    private readonly IMapper _mapper;
    private readonly IMenuRepository _menuRepository;
    private readonly IVarTableRepository _varTableRepository;
-    private readonly IUnitOfWork _unitOfWork;

-    public DeviceRepository(IMapper mapper, IMenuRepository menuRepository, IVarTableRepository varTableRepository, IUnitOfWork unitOfWork)
+    public DeviceRepository(IMapper mapper, IMenuRepository menuRepository, IVarTableRepository varTableRepository, ITransaction transaction)
+        : base(mapper, transaction)
    {
-        _mapper = mapper;
        _menuRepository = menuRepository;
        _varTableRepository = varTableRepository;
-        _unitOfWork = unitOfWork;
-    }
-
-
-
-    /// <summary>
-    /// 编辑设备信息。
-    /// </summary>
-    /// <param name="device">要编辑的设备对象。</param>
-    /// <returns>受影响的行数。</returns>
-    public async Task<int> UpdateAsync(Device device)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        var db = _unitOfWork.GetInstance();
-        var result = await db.Updateable<DbDevice>(_mapper.Map<DbDevice>(device))
-                             .ExecuteCommandAsync();
-        stopwatch.Stop();
-        NlogHelper.Info($"编辑设备 '{device.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-        return result;
    }

    

-
-    /// <summary>
-    /// 获取设备列表
-    /// </summary>
-    /// <returns></returns>
-    public async Task<List<Device>> GetAllAsync()
-    {
-        using (var db = DbContext.GetInstance())
-        {
-            Stopwatch stopwatch = new Stopwatch();
-            stopwatch.Start();
-            var dlist = await db.Queryable<DbDevice>()
-                                .Includes(d => d.VariableTables, dv => dv.Device)
-                                .Includes(d => d.VariableTables, dvd => dvd.Variables, data => data.VariableTable)
-                                .Includes(d => d.VariableTables, vt => vt.Variables, v => v.VariableMqtts)
-                                .ToListAsync();
-
-
-            stopwatch.Stop();
-            NlogHelper.Info($"加载设备列表总耗时：{stopwatch.ElapsedMilliseconds}ms");
-            var devices = _mapper.Map<List<Device>>(dlist);
-            return devices;
-        }
-    }
-
-    /// <summary>
-    /// 根据ID获取设备信息。
-    /// </summary>
-    /// <param name="id">设备ID。</param>
-    /// <returns>对应的DbDevice对象。</returns>
-    public async Task<Device> GetByIdAsync(int id)
+    public override async Task<List<Device>> GetAllAsync()
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await db.Queryable<DbDevice>()
-                                 .FirstAsync(p => p.Id == id);
-            stopwatch.Stop();
-            NlogHelper.Info($"根据ID '{id}' 获取设备耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return _mapper.Map<Device>(result);
-        }
+        var dlist = await Db.Queryable<DbDevice>()
+                            .Includes(d => d.VariableTables, dv => dv.Device)
+                            .Includes(d => d.VariableTables, dvd => dvd.Variables, data => data.VariableTable)
+                            .Includes(d => d.VariableTables, vt => vt.Variables, v => v.VariableMqtts)
+                            .ToListAsync();
+
+        stopwatch.Stop();
+        NlogHelper.Info($"加载设备列表总耗时：{stopwatch.ElapsedMilliseconds}ms");
+        var devices = _mapper.Map<List<Device>>(dlist);
+        return devices;
    }

+    

-    /// <summary>
-    /// 删除设备。
-    /// </summary>
-    /// <param name="id">要删除的设备ID。</param>
-    /// <returns>受影响的行数。</returns>
    public async Task<int> DeleteAsync(Device device, List<MenuBean> menus)
    {
-        var db = _unitOfWork.GetInstance();
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        var result = await db.Deleteable<DbDevice>(new DbDevice { Id = device.Id })
+        var result = await Db.Deleteable<DbDevice>(new DbDevice { Id = device.Id })
                             .ExecuteCommandAsync();
        // 删除变量表
-        await _varTableRepository.DeleteAsync(device.VariableTables);
+        //await _varTableRepository.DeleteAsync(device.VariableTables);

        stopwatch.Stop();
        NlogHelper.Info($"删除设备:{device.Name},耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result;
    }

-
-    
-
-
-    /// <summary>
-    /// 添加设备
-    /// </summary>
-    /// <param name="device"></param>
    public async Task AddAsync(Device device)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        var db = _unitOfWork.GetInstance();

        //查询设备的名字是否存在
-        var exist = await db.Queryable<DbDevice>()
+        var exist = await Db.Queryable<DbDevice>()
                            .Where(d => d.Name == device.Name)
                            .FirstAsync();
        if (exist != null)
            throw new InvalidOperationException("设备名称已经存在。");

        // 2. 将设备添加到数据库
-        var addDevice = await db.Insertable<DbDevice>(_mapper.Map<DbDevice>(device))
+        var addDevice = await Db.Insertable<DbDevice>(_mapper.Map<DbDevice>(device))
                                .ExecuteReturnEntityAsync();

        // 4. 为新设备添加菜单
-        var addDeviceMenuId = await _menuRepository.AddAsync(addDevice);
+        //var addDeviceMenuId = await _menuRepository.AddAsync(addDevice);

        stopwatch.Stop();
        NlogHelper.Info($"添加设备 '{device.Name}' 及相关菜单耗时：{stopwatch.ElapsedMilliseconds}ms");
    }
-
-
 }
--- a/DMS.Infrastructure/Repositories/MenuRepository.cs
+++ b/DMS.Infrastructure/Repositories/MenuRepository.cs
@@ -6,22 +6,20 @@ using DMS.Core.Enums;
 using DMS.Core.Helper;
 using DMS.Core.Models;
 using DMS.Infrastructure.Data;
+using DMS.Infrastructure.Interfaces;

 namespace DMS.Infrastructure.Repositories;

-public class MenuRepository : IMenuRepository
+public class MenuRepository : BaseRepository<DbMenu, MenuBean>
 {
-    private readonly IMapper _mapper;
-
-    public MenuRepository(IMapper mapper)
+    public MenuRepository(IMapper mapper, ITransaction transaction)
+        : base(mapper, transaction)
    {
-        _mapper = mapper;
    }

    public async Task<int> DeleteAsync(MenuBean menu)
    {
-        using var db = DbContext.GetInstance();
-        return await DeleteAsync(menu, db);
+        return await DeleteAsync(menu, Db);
    }

    public async Task<int> DeleteAsync(MenuBean menu, SqlSugarClient db)
@@ -42,18 +40,15 @@ public class MenuRepository : IMenuRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            List<MenuBean> menuTree = new();
-            var dbMenuTree = await db.Queryable<DbMenu>()
-                                     .ToTreeAsync(dm => dm.Items, dm => dm.ParentId, 0);
+        List<MenuBean> menuTree = new();
+        var dbMenuTree = await Db.Queryable<DbMenu>()
+                                 .ToTreeAsync(dm => dm.Items, dm => dm.ParentId, 0);

-            foreach (var dbMenu in dbMenuTree)
-                menuTree.Add(_mapper.Map<MenuBean>(dbMenu));
-            stopwatch.Stop();
-            NlogHelper.Info($"获取菜单树耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return menuTree;
-        }
+        foreach (var dbMenu in dbMenuTree)
+            menuTree.Add(_mapper.Map<MenuBean>(dbMenu));
+        stopwatch.Stop();
+        NlogHelper.Info($"获取菜单树耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return menuTree;
    }


@@ -61,8 +56,7 @@ public class MenuRepository : IMenuRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using var db = DbContext.GetInstance();
-        var result = await AddAsync(menu, db);
+        var result = await AddAsync(menu, Db);
        stopwatch.Stop();
        NlogHelper.Info($"添加菜单 '{menu.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result;
@@ -148,13 +142,10 @@ public class MenuRepository : IMenuRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await UpdateAsync(menu, db);
-            stopwatch.Stop();
-            NlogHelper.Info($"编辑菜单 '{menu.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
+        var result = await UpdateAsync(menu, Db);
+        stopwatch.Stop();
+        NlogHelper.Info($"编辑菜单 '{menu.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return result;
    }

    /// <summary>
@@ -177,20 +168,16 @@ public class MenuRepository : IMenuRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await db.Queryable<DbMenu>()
-                                 .FirstAsync(m => m.DataId == dataId && m.Type == menuType);
-            stopwatch.Stop();
-            NlogHelper.Info($"根据DataId '{dataId}' 和 MenuType '{menuType}' 获取菜单耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return _mapper.Map<MenuBean>(result);
-        }
+        var result = await Db.Queryable<DbMenu>()
+                             .FirstAsync(m => m.DataId == dataId && m.Type == menuType);
+        stopwatch.Stop();
+        NlogHelper.Info($"根据DataId '{dataId}' 和 MenuType '{menuType}' 获取菜单耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return _mapper.Map<MenuBean>(result);
    }

    public async Task<MenuBean> GetMainMenuByNameAsync(string name)
    {
-        using var db = DbContext.GetInstance();
-       var dbMenu= await db.Queryable<DbMenu>().FirstAsync(m => m.Name == name  && m.Type == MenuType.MainMenu);
+       var dbMenu= await Db.Queryable<DbMenu>().FirstAsync(m => m.Name == name  && m.Type == MenuType.MainMenu);
       return _mapper.Map<MenuBean>(dbMenu);
    }
 }
--- a/DMS.Infrastructure/Repositories/MqttRepository.cs
+++ b/DMS.Infrastructure/Repositories/MqttRepository.cs
@@ -5,21 +5,21 @@ using DMS.Core.Enums;
 using DMS.Core.Helper;
 using DMS.Core.Models;
 using DMS.Infrastructure.Data;
+using DMS.Infrastructure.Interfaces;

 namespace DMS.Infrastructure.Repositories;

 /// <summary>
 /// Mqtt仓储类，用于操作DbMqtt实体
 /// </summary>
-public class MqttRepository : IMqttRepository
+public class MqttRepository : BaseRepository<DbMqtt, Mqtt>
 {
    private readonly MenuRepository _menuRepository;
-    private readonly IMapper _mapper;

-    public MqttRepository(MenuRepository menuRepository, IMapper mapper)
+    public MqttRepository(MenuRepository menuRepository, IMapper mapper, ITransaction transaction)
+        : base(mapper, transaction)
    {
        _menuRepository = menuRepository;
-        _mapper = mapper;
    }

    /// <summary>
@@ -31,15 +31,12 @@ public class MqttRepository : IMqttRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var _db = DbContext.GetInstance())
-        {
-            var result = await _db.Queryable<DbMqtt>()
-                                  .In(id)
-                                  .SingleAsync();
-            stopwatch.Stop();
-            NlogHelper.Info($"根据ID '{id}' 获取Mqtt配置耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return _mapper.Map<Mqtt>(result);
-        }
+        var result = await Db.Queryable<DbMqtt>()
+                             .In(id)
+                             .SingleAsync();
+        stopwatch.Stop();
+        NlogHelper.Info($"根据ID '{id}' 获取Mqtt配置耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return _mapper.Map<Mqtt>(result);
    }

    /// <summary>
@@ -50,17 +47,14 @@ public class MqttRepository : IMqttRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var _db = DbContext.GetInstance())
-        {
-            var result = await _db.Queryable<DbMqtt>()
-                                  .Includes(m => m.VariableMqtts, vm => vm.Variable)
-                                  .Includes(m => m.VariableMqtts, vm => vm.Mqtt)
-                                  .ToListAsync();
-            stopwatch.Stop();
-            NlogHelper.Info($"获取所有Mqtt配置耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result.Select(m => _mapper.Map<Mqtt>(m))
-                         .ToList();
-        }
+        var result = await Db.Queryable<DbMqtt>()
+                             .Includes(m => m.VariableMqtts, vm => vm.Variable)
+                             .Includes(m => m.VariableMqtts, vm => vm.Mqtt)
+                             .ToListAsync();
+        stopwatch.Stop();
+        NlogHelper.Info($"获取所有Mqtt配置耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return result.Select(m => _mapper.Map<Mqtt>(m))
+                     .ToList();
    }

    /// <summary>
@@ -72,11 +66,10 @@ public class MqttRepository : IMqttRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using var db = DbContext.GetInstance();
-        await db.BeginTranAsync();
+        await Db.BeginTranAsync();
        try
        {
-            var result = await db.Insertable(_mapper.Map<DbMqtt>(mqtt))
+            var result = await Db.Insertable(_mapper.Map<DbMqtt>(mqtt))
                                 .ExecuteReturnIdentityAsync();
            var mqttMenu = await _menuRepository.GetMainMenuByNameAsync("Mqtt服务器");
            // AddAsync menu entry
@@ -88,15 +81,15 @@ public class MqttRepository : IMqttRepository
                           DataId = result,
                           ParentId = mqttMenu.Id,
                       };
-            await _menuRepository.AddAsync(menu, db);
-            await db.CommitTranAsync();
+            await _menuRepository.AddAsync(menu, Db);
+            await Db.CommitTranAsync();
            stopwatch.Stop();
            NlogHelper.Info($"新增Mqtt配置 '{mqtt.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
            return result;
        }
        catch (Exception ex)
        {
-            await db.RollbackTranAsync();
+            await Db.RollbackTranAsync();
            NlogHelper.Error($"添加MQTT配置 {{mqtt.Name}} 失败", ex);
            throw;
        }
@@ -111,32 +104,29 @@ public class MqttRepository : IMqttRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
+        await Db.BeginTranAsync();
+        try
        {
-            await db.BeginTranAsync();
-            try
+            var result = await Db.Updateable(_mapper.Map<DbMqtt>(mqtt))
+                                 .ExecuteCommandAsync();
+            // Update menu entry
+            var menu = await _menuRepository.GetMenuByDataIdAsync(mqtt.Id, MenuType.MqttMenu);
+            if (menu != null)
            {
-                var result = await db.Updateable(_mapper.Map<DbMqtt>(mqtt))
-                                     .ExecuteCommandAsync();
-                // Update menu entry
-                var menu = await _menuRepository.GetMenuByDataIdAsync(mqtt.Id, MenuType.MqttMenu);
-                if (menu != null)
-                {
-                    menu.Name = mqtt.Name;
-                    await _menuRepository.UpdateAsync(menu, db);
-                }
+                menu.Name = mqtt.Name;
+                await _menuRepository.UpdateAsync(menu, Db);
+            }

-                await db.CommitTranAsync();
-                stopwatch.Stop();
-                NlogHelper.Info($"更新Mqtt配置 '{mqtt.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-                return result;
-            }
-            catch (Exception ex)
-            {
-                await db.RollbackTranAsync();
-                NlogHelper.Error($"更新MQTT配置 {{mqtt.Name}} 失败", ex);
-                throw;
-            }
+            await Db.CommitTranAsync();
+            stopwatch.Stop();
+            NlogHelper.Info($"更新Mqtt配置 '{mqtt.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
+            return result;
+        }
+        catch (Exception ex)
+        {
+            await Db.RollbackTranAsync();
+            NlogHelper.Error($"更新MQTT配置 {{mqtt.Name}} 失败", ex);
+            throw;
        }
    }

@@ -149,32 +139,29 @@ public class MqttRepository : IMqttRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
+        await Db.BeginTranAsync();
+        try
        {
-            await db.BeginTranAsync();
-            try
+            var result = await Db.Deleteable<DbMqtt>()
+                                 .In(mqtt.Id)
+                                 .ExecuteCommandAsync();
+            // DeleteAsync menu entry
+            var menu = await _menuRepository.GetMenuByDataIdAsync(mqtt.Id, MenuType.MqttMenu);
+            if (menu != null)
            {
-                var result = await db.Deleteable<DbMqtt>()
-                                     .In(mqtt.Id)
-                                     .ExecuteCommandAsync();
-                // DeleteAsync menu entry
-                var menu = await _menuRepository.GetMenuByDataIdAsync(mqtt.Id, MenuType.MqttMenu);
-                if (menu != null)
-                {
-                    await _menuRepository.DeleteAsync(menu, db);
-                }
+                await _menuRepository.DeleteAsync(menu, Db);
+            }

-                await db.CommitTranAsync();
-                stopwatch.Stop();
-                NlogHelper.Info($"删除Mqtt配置ID '{mqtt.Id}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-                return result;
-            }
-            catch (Exception ex)
-            {
-                await db.RollbackTranAsync();
-                NlogHelper.Error($"删除MQTT配置 {{mqtt.Name}} 失败", ex);
-                throw;
-            }
+            await Db.CommitTranAsync();
+            stopwatch.Stop();
+            NlogHelper.Info($"删除Mqtt配置ID '{mqtt.Id}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
+            return result;
+        }
+        catch (Exception ex)
+        {
+            await Db.RollbackTranAsync();
+            NlogHelper.Error($"删除MQTT配置 {{mqtt.Name}} 失败", ex);
+            throw;
        }
    }
 }
--- a/DMS.Infrastructure/Repositories/UserRepository.cs
+++ b/DMS.Infrastructure/Repositories/UserRepository.cs
@@ -1,8 +1,7 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading.Tasks;
+using AutoMapper;
+using DMS.Core.Models;
+using DMS.Infrastructure.Interfaces;
 using DMS.Infrastructure.Entities;
-using DMS.Core.Helper;
 using DMS.Infrastructure.Data;

 namespace DMS.Infrastructure.Repositories;
@@ -10,95 +9,10 @@ namespace DMS.Infrastructure.Repositories;
 /// <summary>
 /// 用户仓储类，用于操作DbUser实体
 /// </summary>
-public class UserRepository : IUserRepository
+public class UserRepository : BaseRepository<DbUser, User>
 {
-
-    /// <summary>
-    /// 根据ID获取用户
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <returns></returns>
-    public async Task<DbUser> GetByIdAsync(int id)
+    public UserRepository(IMapper mapper, ITransaction transaction)
+        : base(mapper, transaction)
    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var _db = DbContext.GetInstance())
-        {
-            var result = await _db.Queryable<DbUser>().In(id).SingleAsync();
-            stopwatch.Stop();
-            NlogHelper.Info($"根据ID '{id}' 获取用户耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 获取所有用户
-    /// </summary>
-    /// <returns></returns>
-    public async Task<List<DbUser>> GetAllAsync()
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var _db = DbContext.GetInstance())
-        {
-            var result = await _db.Queryable<DbUser>().ToListAsync();
-            stopwatch.Stop();
-            NlogHelper.Info($"获取所有用户耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 新增用户
-    /// </summary>
-    /// <param name="user">用户实体</param>
-    /// <returns></returns>
-    public async Task<int> AddAsync(DbUser user)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var _db = DbContext.GetInstance())
-        {
-            var result = await _db.Insertable(user).ExecuteReturnIdentityAsync();
-            stopwatch.Stop();
-            NlogHelper.Info($"新增用户 '{user.Id}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 更新用户
-    /// </summary>
-    /// <param name="user">用户实体</param>
-    /// <returns></returns>
-    public async Task<int> UpdateAsync(DbUser user)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var _db = DbContext.GetInstance())
-        {
-            var result = await _db.Updateable(user).ExecuteCommandAsync();
-            stopwatch.Stop();
-            NlogHelper.Info($"更新用户 '{user.Id}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 根据ID删除用户
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <returns></returns>
-    public async Task<int> DeleteAsync(int id)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var _db = DbContext.GetInstance())
-        {
-            var result = await _db.Deleteable<DbUser>().In(id).ExecuteCommandAsync();
-            stopwatch.Stop();
-            NlogHelper.Info($"删除用户ID '{id}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
    }
 }
--- a/DMS.Infrastructure/Repositories/VarDataRepository.cs
+++ b/DMS.Infrastructure/Repositories/VarDataRepository.cs
@@ -1,12 +1,8 @@
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Threading.Tasks;
-using SqlSugar;
 using AutoMapper;
-using Dm.util;
-using DMS.Infrastructure.Entities;
-using DMS.Core.Helper;
 using DMS.Core.Models;
+using DMS.Infrastructure.Interfaces;
+using System.Diagnostics;
+using DMS.Infrastructure.Entities;
 using DMS.Infrastructure.Data;

 namespace DMS.Infrastructure.Repositories;
@@ -14,169 +10,54 @@ namespace DMS.Infrastructure.Repositories;
 /// <summary>
 /// VariableData仓储类，用于操作DbVariableData实体
 /// </summary>
-public class VarDataRepository : IVarDataRepository
+public class VarDataRepository : BaseRepository<DbVariable, Variable>
 {
-    private readonly IMapper _mapper;
-
-    public VarDataRepository(IMapper mapper)
+    public VarDataRepository(IMapper mapper, ITransaction transaction)
+        : base(mapper, transaction)
    {
-        _mapper = mapper;
    }

-    /// <summary>
-    /// 根据ID获取VariableData
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <returns></returns>
-    public async Task<DbVariable> GetByIdAsync(int id)
+    
+
+    public override async Task<List<Variable>> GetAllAsync()
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await GetByIdAsync(id, db);
-            stopwatch.Stop();
-            NlogHelper.Info($"根据ID '{id}' 获取VariableData耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 根据ID获取VariableData
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <param name="db">SqlSugarClient实例</param>
-    /// <returns></returns>
-    public async Task<DbVariable> GetByIdAsync(int id, SqlSugarClient db)
-    {
-        return await db.Queryable<DbVariable>()
-                       .In(id)
-                       .SingleAsync();
-    }
-
-    /// <summary>
-    /// 获取所有VariableData
-    /// </summary>
-    /// <returns></returns>
-    public async Task<List<Variable>> GetAllAsync()
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await GetAllAsync(db);
-            stopwatch.Stop();
-            NlogHelper.Info($"获取所有VariableData耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 获取所有VariableData
-    /// </summary>
-    /// <param name="db">SqlSugarClient实例</param>
-    /// <returns></returns>
-    public async Task<List<Variable>> GetAllAsync(SqlSugarClient db)
-    {
-        var result = await db.Queryable<DbVariable>()
+        var result = await Db.Queryable<DbVariable>()
                             .Includes(d => d.VariableTable)
                             .Includes(d => d.VariableTable.Device)
                             .ToListAsync();
+        stopwatch.Stop();
+        //NlogHelper.Info($"获取所有VariableData耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result.Select(d => _mapper.Map<Variable>(d))
                     .ToList();
    }

-    /// <summary>
-    /// 获取所有VariableData
-    /// </summary>
-    /// <returns></returns>
    public async Task<List<Variable>> GetByVariableTableIdAsync(int varTableId)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await GetByVariableTableIdAsync(varTableId, db);
-            stopwatch.Stop();
-            NlogHelper.Info($"获取变量表的所有变量{result.Count()}个耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 获取所有VariableData
-    /// </summary>
-    /// <param name="db">SqlSugarClient实例</param>
-    /// <returns></returns>
-    public async Task<List<Variable>> GetByVariableTableIdAsync(int varTableId, SqlSugarClient db)
-    {
-        var result = await db.Queryable<DbVariable>()
+        var result = await Db.Queryable<DbVariable>()
                             .Where(d => d.VariableTableId == varTableId)
                             .ToListAsync();
+        stopwatch.Stop();
+        //NlogHelper.Info($"获取变量表的所有变量{result.Count()}个耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result.Select(d => _mapper.Map<Variable>(d))
                     .ToList();
    }

-    /// <summary>
-    /// 新增VariableData
-    /// </summary>
-    /// <param name="variable">VariableData实体</param>
-    /// <returns></returns>
-    public async Task<Variable> AddAsync(Variable variable)
+    public override async Task<int> AddAsync(Variable variable)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var varData = await AddAsync(variable, db);
-            stopwatch.Stop();
-            NlogHelper.Info($"新增VariableData '{variable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return varData;
-        }
-    }
-
-
-    /// <summary>
-    /// 新增VariableData
-    /// </summary>
-    /// <param name="variable">VariableData实体</param>
-    /// <returns></returns>
-    public async Task<Variable> AddAsync(Variable variable, SqlSugarClient db)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        var dbVarData = await db.Insertable(_mapper.Map<DbVariable>(variable))
+        var dbVarData = await Db.Insertable(_mapper.Map<DbVariable>(variable))
                                .ExecuteReturnEntityAsync();
        stopwatch.Stop();
-        NlogHelper.Info($"新增VariableData '{variable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-        return _mapper.Map<Variable>(dbVarData);
+        //NlogHelper.Info($"新增VariableData '{variable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
+        return dbVarData.Id;
    }

-    /// <summary>
-    /// 新增VariableData
-    /// </summary>
-    /// <param name="variableData">VariableData实体</param>
-    /// <returns></returns>
    public async Task<int> AddAsync(IEnumerable<Variable> variableDatas)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var varData = await AddAsync(variableDatas, db);
-            stopwatch.Stop();
-            NlogHelper.Info($"新增VariableData '{variableDatas.Count()}'个， 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return varData;
-        }
-    }
-
-
-    /// <summary>
-    /// 新增VariableData
-    /// </summary>
-    /// <param name="variableData">VariableData实体</param>
-    /// <returns></returns>
-    public async Task<int> AddAsync(IEnumerable<Variable> variableDatas, SqlSugarClient db)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
@@ -185,138 +66,66 @@ public class VarDataRepository : IVarDataRepository
        var dbList = variableDatas.Select(vb => _mapper.Map<DbVariable>(vb))
                                  .ToList();
        stopwatch2.Stop();
-        NlogHelper.Info($"复制 Variable'{variableDatas.Count()}'个， 耗时：{stopwatch2.ElapsedMilliseconds}ms");
+        //NlogHelper.Info($"复制 Variable'{variableDatas.Count()}'个， 耗时：{stopwatch2.ElapsedMilliseconds}ms");

-        var res = await db.Insertable<DbVariable>(dbList)
+        var res = await Db.Insertable<DbVariable>(dbList)
                          .ExecuteCommandAsync();

        stopwatch.Stop();
-        NlogHelper.Info($"新增VariableData '{variableDatas.Count()}'个， 耗时：{stopwatch.ElapsedMilliseconds}ms");
+        //NlogHelper.Info($"新增VariableData '{variableDatas.Count()}'个， 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return res;
    }


-    /// <summary>
-    /// 更新VariableData
-    /// </summary>
-    /// <param name="variable">VariableData实体</param>
-    /// <returns></returns>
-    public async Task<int> UpdateAsync(Variable variable)
+    public override async Task<int> UpdateAsync(Variable variable)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await UpdateAsync(variable, db);
-            stopwatch.Stop();
-            NlogHelper.Info($"更新VariableData '{variable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-
-    /// <summary>
-    /// 更新VariableData
-    /// </summary>
-    /// <param name="variable">VariableData实体</param>
-    /// <param name="db">SqlSugarClient实例</param>
-    /// <returns></returns>
-    public async Task<int> UpdateAsync(Variable variable, SqlSugarClient db)
-    {
-        var result = await db.Updateable<DbVariable>(_mapper.Map<DbVariable>(variable))
+        var result = await Db.Updateable<DbVariable>(_mapper.Map<DbVariable>(variable))
                             .ExecuteCommandAsync();
+        stopwatch.Stop();
+        //NlogHelper.Info($"更新VariableData '{variable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result;
    }

-    /// <summary>
-    /// 更新VariableData
-    /// </summary>
-    /// <param name="variableData">VariableData实体</param>
-    /// <returns></returns>
    public async Task<int> UpdateAsync(List<Variable> variableDatas)
-    {
-        using var _db = DbContext.GetInstance();
-        return await UpdateAsync(variableDatas, _db);
-    }
-
-    /// <summary>
-    /// 更新VariableData
-    /// </summary>
-    /// <param name="variableData">VariableData实体</param>
-    /// <returns></returns>
-    public async Task<int> UpdateAsync(List<Variable> variableDatas, SqlSugarClient db)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();

        var dbVarDatas = variableDatas.Select(vd => _mapper.Map<DbVariable>(vd));
-        var result = await db.Updateable<DbVariable>(dbVarDatas.ToList())
+        var result = await Db.Updateable<DbVariable>(dbVarDatas.ToList())
                             .ExecuteCommandAsync();

        stopwatch.Stop();
-        NlogHelper.Info($"更新VariableData  {variableDatas.Count()}个 耗时：{stopwatch.ElapsedMilliseconds}ms");
+        //NlogHelper.Info($"更新VariableData  {variableDatas.Count()}个 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result;
    }

-    /// <summary>
-    /// 删除VariableData
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <returns></returns>
-    public async Task<int> DeleteAsync(Variable variable)
+    public override async Task<int> DeleteAsync(Variable variable)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using var db = DbContext.GetInstance();
-        var result = await DeleteAsync(variable, db);
-        stopwatch.Stop();
-        NlogHelper.Info($"删除VariableData: '{variable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-        return result;
-    }
-
-    /// <summary>
-    /// 根据ID删除VariableData
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <param name="db">SqlSugarClient实例</param>
-    /// <returns></returns>
-    public async Task<int> DeleteAsync(Variable variable, SqlSugarClient db)
-    {
-        var result = await db.Deleteable<DbVariable>()
+        var result = await Db.Deleteable<DbVariable>()
                             .Where(d => d.Id == variable.Id)
                             .ExecuteCommandAsync();
+        stopwatch.Stop();
+        //NlogHelper.Info($"删除VariableData: '{variable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result;
    }

-    /// <summary>
-    /// 删除VariableData
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <returns></returns>
    public async Task<int> DeleteAsync(IEnumerable<Variable> variableDatas)
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using var db = DbContext.GetInstance();

-        var result = await DeleteAsync(variableDatas, db);
-
-        stopwatch.Stop();
-        NlogHelper.Info($"删除VariableData: '{variableDatas.Count()}'个 耗时：{stopwatch.ElapsedMilliseconds}ms");
-        return result;
-    }
-
-    /// <summary>
-    /// 删除VariableData
-    /// </summary>
-    /// <param name="id">主键ID</param>
-    /// <param name="db">SqlSugarClient实例</param>
-    /// <returns></returns>
-    public async Task<int> DeleteAsync(IEnumerable<Variable> variableDatas, SqlSugarClient db)
-    {
        var dbList = variableDatas.Select(vd => _mapper.Map<DbVariable>(vd))
                                  .ToList();
-        var result = await db.Deleteable<DbVariable>(dbList)
+        var result = await Db.Deleteable<DbVariable>(dbList)
                             .ExecuteCommandAsync();
+
+        stopwatch.Stop();
+        //NlogHelper.Info($"删除VariableData: '{variableDatas.Count()}'个 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result;
    }

@@ -333,8 +142,7 @@ public class VarDataRepository : IVarDataRepository
    /// <returns>成功添加或更新关联的数量。</returns>
     public async Task<int> AddMqttToVariablesAsync(IEnumerable<VariableMqtt> variableMqttList)
    {
-        using var db = DbContext.GetInstance();
-        await db.BeginTranAsync();
+        await Db.BeginTranAsync();

        try
        {
@@ -343,7 +151,7 @@ public class VarDataRepository : IVarDataRepository
            var mqttIds = variableMqttList.Select(vm => vm.Mqtt.Id).Distinct().ToList();

            // 1. 一次性查询所有相关的现有别名
-            var existingAliases = await db.Queryable<DbVariableMqtt>()
+            var existingAliases = await Db.Queryable<DbVariableMqtt>()
                                          .Where(it => variableIds.Contains(it.VariableId) && mqttIds.Contains(it.MqttId))
                                          .ToListAsync();

@@ -383,25 +191,25 @@ public class VarDataRepository : IVarDataRepository
            // 2. 批量更新
            if (toUpdate.Any())
            {
-                var updateResult = await db.Updateable(toUpdate).ExecuteCommandAsync();
+                var updateResult = await Db.Updateable(toUpdate).ExecuteCommandAsync();
                affectedCount += updateResult;
            }

            // 3. 批量插入
            if (toInsert.Any())
            {
-                var insertResult = await db.Insertable(toInsert).ExecuteCommandAsync();
+                var insertResult = await Db.Insertable(toInsert).ExecuteCommandAsync();
                affectedCount += insertResult;
            }

-            await db.CommitTranAsync();
-            NlogHelper.Info($"成功为 {variableMqttList.Count()} 个变量请求添加/更新了MQTT服务器关联，实际影响 {affectedCount} 个。");
+            await Db.CommitTranAsync();
+            //NlogHelper.Info($"成功为 {variableMqttList.Count()} 个变量请求添加/更新了MQTT服务器关联，实际影响 {affectedCount} 个。");
            return affectedCount;
        }
        catch (Exception ex)
        {
-            await db.RollbackTranAsync();
-            NlogHelper.Error($"为变量添加MQTT服务器关联时发生错误: {ex.Message}", ex);
+            await Db.RollbackTranAsync();
+            //NlogHelper.Error($"为变量添加MQTT服务器关联时发生错误: {ex.Message}", ex);
            // 根据需要，可以向上层抛出异常
            throw;
        }
--- a/DMS.Infrastructure/Repositories/VarTableRepository.cs
+++ b/DMS.Infrastructure/Repositories/VarTableRepository.cs
@@ -1,20 +1,17 @@
-using SqlSugar;
-using System.Diagnostics;
 using AutoMapper;
-using DMS.Infrastructure.Entities;
-using DMS.Core.Helper;
 using DMS.Core.Models;
+using DMS.Infrastructure.Interfaces;
+using DMS.Infrastructure.Entities;
+using System.Diagnostics;
 using DMS.Infrastructure.Data;

 namespace DMS.Infrastructure.Repositories;

-public class VarTableRepository : IVarTableRepository
+public class VarTableRepository : BaseRepository<DbVariableTable, VariableTable>
 {
-    private readonly IMapper _mapper;
-
-    public VarTableRepository(IMapper mapper)
+    public VarTableRepository(IMapper mapper, ITransaction transaction)
+        : base(mapper, transaction)
    {
-        _mapper = mapper;
    }

    /// <summary>
@@ -26,32 +23,11 @@ public class VarTableRepository : IVarTableRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var addVarTable = await AddAsync(varTable, db);
-
-            stopwatch.Stop();
-            NlogHelper.Info($"添加变量表 '{varTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return addVarTable;
-        }
-    }
-
-
-    /// <summary>
-    /// 添加变量表支持事务
-    /// </summary>
-    /// <param name="db"></param>
-    /// <param name="dbDevice"></param>
-    /// <returns></returns>
-    public async Task<VariableTable> AddAsync(VariableTable variableTable, SqlSugarClient db)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-
-        var addVarTabel = await db.Insertable<DbVariableTable>(_mapper.Map<DbVariableTable>(variableTable))
+        var addVarTabel = await Db.Insertable<DbVariableTable>(_mapper.Map<DbVariableTable>(varTable))
                                  .ExecuteReturnEntityAsync();
+
        stopwatch.Stop();
-        NlogHelper.Info($"添加设备 '{addVarTabel.Name}' 的默认变量表耗时：{stopwatch.ElapsedMilliseconds}ms");
+        //NlogHelper.Info($"添加变量表 '{varTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return _mapper.Map<VariableTable>(addVarTabel);
    }

@@ -64,26 +40,10 @@ public class VarTableRepository : IVarTableRepository
    {
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
-        using var db = DbContext.GetInstance();
-        var result = await UpdateAsync(variableTable, db);
-        stopwatch.Stop();
-        NlogHelper.Info($"编辑变量表 '{variableTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-        return result;
-    }
-
-    /// <summary>
-    /// 编辑变量表，支持事务
-    /// </summary>
-    /// <param name="variableTable"></param>
-    /// <returns></returns>
-    public async Task<int> UpdateAsync(VariableTable variableTable, SqlSugarClient db)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        var result = await db.Updateable<DbVariableTable>(_mapper.Map<DbVariableTable>(variableTable))
+        var result = await Db.Updateable<DbVariableTable>(_mapper.Map<DbVariableTable>(variableTable))
                             .ExecuteCommandAsync();
        stopwatch.Stop();
-        NlogHelper.Info($"编辑变量表 '{variableTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
+        //NlogHelper.Info($"编辑变量表 '{variableTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
        return result;
    }
    
@@ -92,35 +52,17 @@ public class VarTableRepository : IVarTableRepository
    /// </summary>
    /// <param name="variableTable"></param>
    /// <returns></returns>
-    public async Task<int> DeleteAsync(VariableTable variableTable)
-    {
-        Stopwatch stopwatch = new Stopwatch();
-        stopwatch.Start();
-        using (var db = DbContext.GetInstance())
-        {
-            var result = await DeleteAsync(variableTable, db);
-            stopwatch.Stop();
-            NlogHelper.Info($"删除变量表 '{variableTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
-            return result;
-        }
-    }
-    
-    /// <summary>
-    /// 删除变量表支持事务
-    /// </summary>
-    /// <param name="deviceVariableTables"></param>
-    /// <param name="db"></param>
-    public async Task<int> DeleteAsync(VariableTable varTable, SqlSugarClient db)
+    public async Task<int> DeleteAsync(VariableTable varTable)
    {
        if (varTable == null )
            return 0;
        Stopwatch stopwatch = new Stopwatch();
        stopwatch.Start();
        // 转换对象
-       var res= await db.Deleteable<DbVariableTable>(_mapper.Map<DbVariableTable>(varTable))
+       var res= await Db.Deleteable<DbVariableTable>(_mapper.Map<DbVariableTable>(varTable))
                .ExecuteCommandAsync();
       stopwatch.Stop();
-       NlogHelper.Info($"删除变量表 '{varTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
+       //NlogHelper.Info($"删除变量表 '{varTable.Name}' 耗时：{stopwatch.ElapsedMilliseconds}ms");
       return res;
    }

@@ -129,14 +71,14 @@ public class VarTableRepository : IVarTableRepository
    /// </summary>
    /// <param name="deviceVariableTables"></param>
    /// <param name="db"></param>
-    public async Task DeleteAsync(IEnumerable<VariableTable> deviceVariableTables, SqlSugarClient db)
+    public async Task DeleteAsync(IEnumerable<VariableTable> deviceVariableTables)
    {
        if (deviceVariableTables == null || deviceVariableTables.Count() == 0)
            return;
        // 转换对象
        var dbList = deviceVariableTables.Select(v => _mapper.Map<DbVariableTable>(v))
                                         .ToList();
-        await db.Deleteable<DbVariableTable>(dbList)
+        await Db.Deleteable<DbVariableTable>(dbList)
                .ExecuteCommandAsync();
    }

--- a/DMS.Infrastructure/Repositories/VariableMqttAliasRepository.cs
+++ b/DMS.Infrastructure/Repositories/VariableMqttAliasRepository.cs
@@ -1,124 +1,18 @@
-using SqlSugar;
-using System.Collections.Generic;
-using System.Threading.Tasks;
-using DMS.Infrastructure.Data;
+using AutoMapper;
+using DMS.Core.Models;
+using DMS.Infrastructure.Interfaces;
 using DMS.Infrastructure.Entities;
+using DMS.Infrastructure.Data;

 namespace DMS.Infrastructure.Repositories;

 /// <summary>
 /// 变量与MQTT服务器别名关联的数据仓库。
 /// </summary>
-public class VariableMqttAliasRepository : IVariableMqttAliasRepository
+public class VariableMqttAliasRepository : BaseRepository<DbVariableMqtt, VariableMqtt>
 {
-    /// <summary>
-    /// 根据变量ID和MQTT服务器ID获取别名。
-    /// </summary>
-    /// <param name="variableDataId">变量数据ID。</param>
-    /// <param name="mqttId">MQTT服务器ID。</param>
-    /// <returns>DbVariableMqtt实体，如果不存在则为null。</returns>
-    public async Task<DbVariableMqtt?> GetAliasByVariableAndMqtt(int variableDataId, int mqttId)
+    public VariableMqttAliasRepository(IMapper mapper, ITransaction transaction)
+        : base(mapper, transaction)
    {
-        using (var db = DbContext.GetInstance())
-        {
-            return await GetAliasByVariableAndMqtt(variableDataId, mqttId, db);
-        }
-    }
-
-    /// <summary>
-    /// 根据变量ID和MQTT服务器ID获取别名。
-    /// </summary>
-    /// <param name="variableDataId">变量数据ID。</param>
-    /// <param name="mqttId">MQTT服务器ID。</param>
-    /// <param name="db">SqlSugarClient实例。</param>
-    /// <returns>DbVariableMqtt实体，如果不存在则为null。</returns>
-    public async Task<DbVariableMqtt?> GetAliasByVariableAndMqtt(int variableDataId, int mqttId, SqlSugarClient db)
-    {
-        return await db.Queryable<DbVariableMqtt>()
-                            .Where(it => it.VariableId == variableDataId && it.MqttId == mqttId)
-                            .FirstAsync();
-    }
-
-    /// <summary>
-    /// 批量添加变量与MQTT服务器的关联。
-    /// </summary>
-    /// <param name="entities">要添加的DbVariableMqtt实体列表。</param>
-    /// <returns>成功添加的数量。</returns>
-    public async Task<int> AddManyAsync(IEnumerable<DbVariableMqtt> entities)
-    {
-        using (var db = DbContext.GetInstance())
-        {
-            return await AddManyAsync(entities, db);
-        }
-    }
-
-    /// <summary>
-    /// 批量添加变量与MQTT服务器的关联。
-    /// </summary>
-    /// <param name="entities">要添加的DbVariableMqtt实体列表。</param>
-    /// <param name="db">SqlSugarClient实例。</param>
-    /// <returns>成功添加的数量。</returns>
-    public async Task<int> AddManyAsync(IEnumerable<DbVariableMqtt> entities, SqlSugarClient db)
-    {
-        return await db.Insertable<DbVariableMqtt>(entities).ExecuteCommandAsync();
-    }
-
-    /// <summary>
-    /// 更新变量与MQTT服务器的别名。
-    /// </summary>
-    /// <param name="variableDataId">变量数据ID。</param>
-    /// <param name="mqttId">MQTT服务器ID。</param>
-    /// <param name="newAlias">新的别名。</param>
-    /// <returns>受影响的行数。</returns>
-    public async Task<int> UpdateAliasAsync(int variableDataId, int mqttId, string newAlias)
-    {
-        using (var db = DbContext.GetInstance())
-        {
-            return await UpdateAliasAsync(variableDataId, mqttId, newAlias, db);
-        }
-    }
-
-    /// <summary>
-    /// 更新变量与MQTT服务器的别名。
-    /// </summary>
-    /// <param name="variableDataId">变量数据ID。</param>
-    /// <param name="mqttId">MQTT服务器ID。</param>
-    /// <param name="newAlias">新的别名。</param>
-    /// <param name="db">SqlSugarClient实例。</param>
-    /// <returns>受影响的行数。</returns>
-    public async Task<int> UpdateAliasAsync(int variableDataId, int mqttId, string newAlias, SqlSugarClient db)
-    {
-        return await db.Updateable<DbVariableMqtt>()
-                            .SetColumns(it => it.MqttAlias == newAlias)
-                            .Where(it => it.VariableId == variableDataId && it.MqttId == mqttId)
-                            .ExecuteCommandAsync();
-    }
-
-    /// <summary>
-    /// 删除变量与MQTT服务器的关联。
-    /// </summary>
-    /// <param name="variableDataId">变量数据ID。</param>
-    /// <param name="mqttId">MQTT服务器ID。</param>
-    /// <returns>受影响的行数。</returns>
-    public async Task<int> DeleteAsync(int variableDataId, int mqttId)
-    {
-        using (var db = DbContext.GetInstance())
-        {
-            return await DeleteAsync(variableDataId, mqttId, db);
-        }
-    }
-
-    /// <summary>
-    /// 删除变量与MQTT服务器的关联。
-    /// </summary>
-    /// <param name="variableDataId">变量数据ID。</param>
-    /// <param name="mqttId">MQTT服务器ID。</param>
-    /// <param name="db">SqlSugarClient实例。</param>
-    /// <returns>受影响的行数。</returns>
-    public async Task<int> DeleteAsync(int variableDataId, int mqttId, SqlSugarClient db)
-    {
-        return await db.Deleteable<DbVariableMqtt>()
-                            .Where(it => it.VariableId == variableDataId && it.MqttId == mqttId)
-                            .ExecuteCommandAsync();
    }
 }