xiaowei/DMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

继续修改触发器（未完成，修改一个触发器可以添加多个变量）

Browse Source
This commit is contained in:
David P.G
2025-09-22 22:58:51 +08:00
parent 0f869cf410
commit 042bc15288
14 changed files with 434 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
DMS.Infrastructure/Entities/DbTriggerDefinition.cs
View File

@@ -1,4 +1,5 @@
using System;
using System.Collections.Generic;
using DMS.Core.Models.Triggers;
using SqlSugar;
using SqlSugar.DbConvert;
@@ -17,11 +18,6 @@ public class DbTriggerDefinition
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 关联的变量 ID。
/// </summary>
public int VariableId { get; set; }
/// <summary>
/// 触发器是否处于激活状态。
/// </summary>
@@ -96,4 +92,10 @@ public class DbTriggerDefinition
/// 最后更新时间。
/// </summary>
public DateTime UpdatedAt { get; set; } = DateTime.UtcNow;
/// <summary>
/// 关联的变量 ID 列表（通过中间表关联）。
/// </summary>
[SugarColumn(IsIgnore = true)]
public List<int> VariableIds { get; set; } = new List<int>();
}

22
DMS.Infrastructure/Entities/DbTriggerVariable.cs Normal file
View File

@@ -0,0 +1,22 @@
using SqlSugar;
namespace DMS.Infrastructure.Entities;
/// <summary>
/// 数据库实体：表示触发器与变量的多对多关联关系。
/// </summary>
public class DbTriggerVariable
{
[SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
public int Id { get; set; }
/// <summary>
/// 外键，指向 TriggerDefinitions 表的 Id。
/// </summary>
public int TriggerDefinitionId { get; set; }
/// <summary>
/// 外键，指向 Variables 表的 Id。
/// </summary>
public int VariableId { get; set; }
}

23
DMS.Infrastructure/Migrations/001_CreateTriggerVariablesTable.sql Normal file
View File

@@ -0,0 +1,23 @@
-- 创建触发器与变量关联表
CREATE TABLE TriggerVariables (
Id INTEGER PRIMARY KEY AUTOINCREMENT,
TriggerDefinitionId INTEGER NOT NULL,
VariableId INTEGER NOT NULL,
FOREIGN KEY (TriggerDefinitionId) REFERENCES TriggerDefinitions(Id) ON DELETE CASCADE,
FOREIGN KEY (VariableId) REFERENCES Variables(Id) ON DELETE CASCADE
);
-- 创建索引以提高查询性能
CREATE INDEX IX_TriggerVariables_TriggerDefinitionId ON TriggerVariables (TriggerDefinitionId);
CREATE INDEX IX_TriggerVariables_VariableId ON TriggerVariables (VariableId);
-- 迁移现有数据：将TriggerDefinitions表中的VariableId迁移到新的关联表中
INSERT INTO TriggerVariables (TriggerDefinitionId, VariableId)
SELECT Id, VariableId
FROM TriggerDefinitions
WHERE VariableId IS NOT NULL AND VariableId > 0;
-- 删除TriggerDefinitions表中的VariableId列（如果数据库支持）
-- 注意：SQLite不支持直接删除列，所以这里只是注释说明
-- 在支持的数据库中，可以使用以下语句：
-- ALTER TABLE TriggerDefinitions DROP COLUMN VariableId;

4
DMS.Infrastructure/Profiles/MappingProfile.cs
View File

@@ -50,10 +50,12 @@ public class MappingProfile : Profile
opt => opt.MapFrom(src => src.SuppressionDurationTicks.HasValue ?
TimeSpan.FromTicks(src.SuppressionDurationTicks.Value) :
(TimeSpan?)null))
.ForMember(dest => dest.VariableIds, opt => opt.MapFrom(src => src.VariableIds))
.ReverseMap()
.ForMember(dest => dest.SuppressionDurationTicks,
opt => opt.MapFrom(src => src.SuppressionDuration.HasValue ?
src.SuppressionDuration.Value.Ticks :
(long?)null));
(long?)null))
.ForMember(dest => dest.VariableIds, opt => opt.MapFrom(src => src.VariableIds));
}
}

104
DMS.Infrastructure/Repositories/TriggerRepository.cs
View File

@@ -34,6 +34,16 @@ namespace DMS.Infrastructure.Repositories
public async Task<IEnumerable<TriggerDefinition>> GetAllAsync()
{
var dbList = await base.GetAllAsync();
// 加载关联的变量ID
foreach (var dbTrigger in dbList)
{
var variableIds = await _dbContext.GetInstance()
.Queryable<DbTriggerVariable>()
.Where(tv => tv.TriggerDefinitionId == dbTrigger.Id)
.Select(tv => tv.VariableId)
.ToListAsync();
dbTrigger.VariableIds = variableIds;
}
return _mapper.Map<List<TriggerDefinition>>(dbList);
}
@@ -43,6 +53,16 @@ namespace DMS.Infrastructure.Repositories
public async Task<TriggerDefinition?> GetByIdAsync(int id)
{
var dbTrigger = await base.GetByIdAsync(id);
if (dbTrigger != null)
{
// 加载关联的变量ID
var variableIds = await _dbContext.GetInstance()
.Queryable<DbTriggerVariable>()
.Where(tv => tv.TriggerDefinitionId == dbTrigger.Id)
.Select(tv => tv.VariableId)
.ToListAsync();
dbTrigger.VariableIds = variableIds;
}
return _mapper.Map<TriggerDefinition>(dbTrigger);
}
@@ -51,7 +71,21 @@ namespace DMS.Infrastructure.Repositories
/// </summary>
public async Task<TriggerDefinition> AddAsync(TriggerDefinition trigger)
{
var dbTrigger = await base.AddAsync(_mapper.Map<DbTriggerDefinition>(trigger));
var dbTrigger = _mapper.Map<DbTriggerDefinition>(trigger);
dbTrigger = await base.AddAsync(dbTrigger);
// 保存关联的变量ID
if (trigger.VariableIds != null && trigger.VariableIds.Any())
{
var triggerVariables = trigger.VariableIds.Select(variableId => new DbTriggerVariable
{
TriggerDefinitionId = dbTrigger.Id,
VariableId = variableId
}).ToList();
await _dbContext.GetInstance().Insertable(triggerVariables).ExecuteCommandAsync();
}
return _mapper.Map(dbTrigger, trigger);
}
@@ -60,8 +94,33 @@ namespace DMS.Infrastructure.Repositories
/// </summary>
public async Task<TriggerDefinition?> UpdateAsync(TriggerDefinition trigger)
{
var rowsAffected = await base.UpdateAsync(_mapper.Map<DbTriggerDefinition>(trigger));
return rowsAffected > 0 ? trigger : null;
var dbTrigger = _mapper.Map<DbTriggerDefinition>(trigger);
var rowsAffected = await base.UpdateAsync(dbTrigger);
if (rowsAffected > 0)
{
// 删除旧的关联关系
await _dbContext.GetInstance()
.Deleteable<DbTriggerVariable>()
.Where(tv => tv.TriggerDefinitionId == dbTrigger.Id)
.ExecuteCommandAsync();
// 插入新的关联关系
if (trigger.VariableIds != null && trigger.VariableIds.Any())
{
var triggerVariables = trigger.VariableIds.Select(variableId => new DbTriggerVariable
{
TriggerDefinitionId = dbTrigger.Id,
VariableId = variableId
}).ToList();
await _dbContext.GetInstance().Insertable(triggerVariables).ExecuteCommandAsync();
}
return trigger;
}
return null;
}
/// <summary>
@@ -71,6 +130,14 @@ namespace DMS.Infrastructure.Repositories
{
var stopwatch = new Stopwatch();
stopwatch.Start();
// 先删除关联的变量关系
await _dbContext.GetInstance()
.Deleteable<DbTriggerVariable>()
.Where(tv => tv.TriggerDefinitionId == id)
.ExecuteCommandAsync();
// 再删除触发器本身
var rowsAffected = await _dbContext.GetInstance().Deleteable<DbTriggerDefinition>()
.In(id)
.ExecuteCommandAsync();
@@ -86,9 +153,34 @@ namespace DMS.Infrastructure.Repositories
{
var stopwatch = new Stopwatch();
stopwatch.Start();
var dbList = await _dbContext.GetInstance().Queryable<DbTriggerDefinition>()
.Where(t => t.VariableId == variableId)
.ToListAsync();
// 先查询关联表获取触发器ID
var triggerIds = await _dbContext.GetInstance()
.Queryable<DbTriggerVariable>()
.Where(tv => tv.VariableId == variableId)
.Select(tv => tv.TriggerDefinitionId)
.ToListAsync();
// 再查询触发器定义
var dbList = new List<DbTriggerDefinition>();
if (triggerIds.Any())
{
dbList = await _dbContext.GetInstance().Queryable<DbTriggerDefinition>()
.In(it => it.Id, triggerIds)
.ToListAsync();
// 加载每个触发器的变量ID列表
foreach (var dbTrigger in dbList)
{
var variableIds = await _dbContext.GetInstance()
.Queryable<DbTriggerVariable>()
.Where(tv => tv.TriggerDefinitionId == dbTrigger.Id)
.Select(tv => tv.VariableId)
.ToListAsync();
dbTrigger.VariableIds = variableIds;
}
}
stopwatch.Stop();
_logger.LogInformation($"GetByVariableId {typeof(DbTriggerDefinition).Name},VariableId={variableId},耗时：{stopwatch.ElapsedMilliseconds}ms");
return _mapper.Map<List<TriggerDefinition>>(dbList);