diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index ef03b3be1..3a017e98b 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -155,7 +155,7 @@ builder.Services.AddMediator(cfg => builder.Services.AddMassTransit(cfg => { // 注册消费者 - cfg.AddConsumer(); // 替换为你的消费者类 + cfg.AddConsumer(); // 替换为你的消费者类 // 使用 InMemory 作为消息传递机制 cfg.UsingInMemory((context, cfg) => diff --git a/IRaCIS.Core.API/_ServiceExtensions/AutoMapperSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/AutoMapperSetup.cs index 70ef3e5d5..788f420de 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/AutoMapperSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/AutoMapperSetup.cs @@ -18,6 +18,7 @@ namespace IRaCIS.Core.API // 全局忽略 DomainEvents 属性 automapper.AddGlobalIgnore(nameof(Entity.DomainEvents)); + automapper.AddGlobalIgnore(nameof(Entity.DomainCommands)); #region 会使 IncludeMembers 失效 不能全局使用 //mapping an EntityFramework Core DbContext-object. diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/AddSubjectConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/AddSubjectTriggerConsumer.cs similarity index 83% rename from IRaCIS.Core.Application/MassTransit/Consumer/AddSubjectConsumer.cs rename to IRaCIS.Core.Application/MassTransit/Consumer/AddSubjectTriggerConsumer.cs index f0c5e41ae..646a0b38d 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/AddSubjectConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/AddSubjectTriggerConsumer.cs @@ -6,13 +6,13 @@ using MassTransit; namespace IRaCIS.Core.Application.MassTransit.Consumer; -public class AddSubjectConsumer(IRepository _subjectVisitRepository, +public class AddSubjectTriggerConsumer(IRepository _subjectVisitRepository, IRepository _visitStageRepository, IRepository _trialRepository, - IMapper _mapper) : IConsumer + IMapper _mapper) : IConsumer { - public async Task Consume(ConsumeContext context) + public async Task Consume(ConsumeContext context) { var addSubjectEvent= context.Message; diff --git a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs index 35964354e..95303ffc4 100644 --- a/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs +++ b/IRaCIS.Core.Domain/BaseModel/DomainEvent.cs @@ -1,12 +1,27 @@ using System.ComponentModel; namespace IRaCIS.Core.Domain.BaseModel; + +/// +/// 事件 不影响数据库提交事务的，不会记录稽查 +/// +/// 比如 添加subject 自动添加访视，不适合作为事件，否则自动添加访视后，记录稽查，当前请求url 都不知道 +/// [Description("领域实体事件基类")] public abstract class DomainEvent { } +/// +/// 命令，触发一些操作，在当前事务一起提交 +/// +[Description("领域实体命令基类")] +public abstract class DomainCommand +{ + +} + public class FailedDomainEvent { public Guid Id { get; set; } diff --git a/IRaCIS.Core.Domain/BaseModel/Entity.cs b/IRaCIS.Core.Domain/BaseModel/Entity.cs index eecd81ff9..4aa529c86 100644 --- a/IRaCIS.Core.Domain/BaseModel/Entity.cs +++ b/IRaCIS.Core.Domain/BaseModel/Entity.cs @@ -44,6 +44,31 @@ public abstract class Entity : IEntity } #endregion + + #region 领域命令 当前事务一起处理的，触发操作 + + [JsonIgnore] + private readonly List _domainCommands = []; + + [JsonIgnore] + [NotMapped] + public IReadOnlyCollection DomainCommands => _domainCommands.AsReadOnly(); + public void AddDomainCommand(DomainCommand domainCommand) + { + _domainCommands.Add(domainCommand); + } + + public void RemoveDomainCommand(DomainCommand domainCommand) + { + _domainCommands.Remove(domainCommand); + } + + public void ClearDomainCommands() + { + _domainCommands.Clear(); + } + + #endregion } #region 减少实体属性，增加基类 diff --git a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj index fefabf7ba..57b96fb35 100644 --- a/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj +++ b/IRaCIS.Core.Domain/IRaCIS.Core.Domain.csproj @@ -19,4 +19,8 @@ + + + + diff --git a/IRaCIS.Core.Domain/_DomainEvent/AddSubjectEvent.cs b/IRaCIS.Core.Domain/_DomainCommand/AddSubjectTriggerCommand.cs similarity index 63% rename from IRaCIS.Core.Domain/_DomainEvent/AddSubjectEvent.cs rename to IRaCIS.Core.Domain/_DomainCommand/AddSubjectTriggerCommand.cs index 0a23e13c4..d2b7de732 100644 --- a/IRaCIS.Core.Domain/_DomainEvent/AddSubjectEvent.cs +++ b/IRaCIS.Core.Domain/_DomainCommand/AddSubjectTriggerCommand.cs @@ -3,7 +3,10 @@ using IRaCIS.Core.Domain.BaseModel; namespace IRaCIS.Core.Domain; -public class AddSubjectEvent : DomainEvent +/// +/// 添加Subject 触发命令 +/// +public class AddSubjectTriggerCommand : DomainCommand { public Guid SubjectId { get; set; } public Guid TrialId { get; set; } diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainEvent.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs similarity index 64% rename from IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainEvent.cs rename to IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs index 5519ece20..0d724746a 100644 --- a/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainEvent.cs +++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AddDomainExt.cs @@ -14,6 +14,15 @@ public static class DBContext_Ext { var changeTracker = context.ChangeTracker; + + } + + + + public static void AddDomainCommands(this DbContext context) + { + var changeTracker = context.ChangeTracker; + // 遍历 ChangeTracker 中的实体 foreach (var entry in changeTracker.Entries()) { @@ -22,10 +31,12 @@ public static class DBContext_Ext if (entry.State == EntityState.Added) { // 受试者添加 触发访视自动添加 - var addedEvent = new AddSubjectEvent { SubjectId = subject.Id, TrialId = subject.TrialId, TrialSiteId = subject.TrialSiteId }; + var addedEvent = new AddSubjectTriggerCommand { SubjectId = subject.Id, TrialId = subject.TrialId, TrialSiteId = subject.TrialSiteId }; - subject.AddDomainEvent(addedEvent); + subject.AddDomainCommand(addedEvent); } } } + + } \ No newline at end of file diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs index 7c3b36322..370b76f02 100644 --- a/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs +++ b/IRaCIS.Core.Infra.EFCore/Interceptor/AuditEntityInterceptor.cs @@ -2,6 +2,8 @@ using IRaCIS.Core.Domain.Models; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infra.EFCore.Common; +using MassTransit; +using MassTransit.Transports; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.Extensions.Logging; using System.Data; @@ -9,7 +11,10 @@ using System.Data; namespace IRaCIS.Core.Infra.EFCore; -public class AuditEntityInterceptor(IUserInfo _userInfo, ILogger _logger) : SaveChangesInterceptor +public class AuditEntityInterceptor(IUserInfo _userInfo, + ILogger _logger + //,ISendEndpoint _sendEndpoint + ) : SaveChangesInterceptor { /// @@ -22,7 +27,12 @@ public class AuditEntityInterceptor(IUserInfo _userInfo, ILogger> SavingChangesAsync(DbContextEventData eventData, InterceptionResult result, CancellationToken cancellationToken = default) { - //测试领域事件 + //领域命令 （同一个事务提交的一些逻辑，类似Trigger 保存事务之前执行的一些逻辑） + eventData.Context.AddDomainCommands(); + + //DispatchDomainCommands(eventData.Context).GetAwaiter().GetResult(); + + //领域事件 eventData.Context.AddDomainEvents(); //审计时间 @@ -35,8 +45,18 @@ public class AuditEntityInterceptor(IUserInfo _userInfo, ILogger SavingChanges(DbContextEventData eventData, InterceptionResult result) { + //领域命令 （同一个事务提交的一些逻辑，类似Trigger 保存事务之前执行的一些逻辑） + eventData.Context.AddDomainCommands(); + + //领域事件 + eventData.Context.AddDomainEvents(); + + //审计时间 AuditEntities(eventData.Context); + //IRC稽查 放在savechange 之前 不影响之前的逻辑 + IRCDataInspection(eventData.Context); + return base.SavingChanges(eventData, result); } public void AuditEntities(DbContext? context) @@ -143,6 +163,11 @@ public class AuditEntityInterceptor(IUserInfo _userInfo, ILogger() + // .Where(e => e.Entity.DomainCommands.Any()) + // .Select(e => e.Entity) + // .ToList(); + + // var domainCommands = entities + // .SelectMany(e => e.DomainCommands) + // .ToList(); + + // entities.ForEach(e => e.ClearDomainCommands()); + + // foreach (var domainCommand in domainCommands) + // { + // await _sendEndpoint.Send(domainCommand.GetType(), domainCommand); + // } + //} + #endregion } \ No newline at end of file diff --git a/IRaCIS.Core.Infra.EFCore/Interceptor/DispatchDomainEventsInterceptor.cs b/IRaCIS.Core.Infra.EFCore/Interceptor/DispatchDomainEventsInterceptor.cs index d7f0ec974..195d1c710 100644 --- a/IRaCIS.Core.Infra.EFCore/Interceptor/DispatchDomainEventsInterceptor.cs +++ b/IRaCIS.Core.Infra.EFCore/Interceptor/DispatchDomainEventsInterceptor.cs @@ -1,4 +1,5 @@ -using IRaCIS.Core.Domain.Models; +using IRaCIS.Core.Domain; +using IRaCIS.Core.Domain.Models; using MassTransit; using Microsoft.EntityFrameworkCore.Diagnostics; using System.Data; @@ -48,7 +49,10 @@ namespace IRaCIS.Core.Infra.EFCore.Interceptor foreach (var domainEvent in domainEvents) { - await publishEndpoint.Publish(domainEvent); + //这种方式会导致消息没处理 + //await publishEndpoint.Publish(domainEvent); + + await publishEndpoint.Publish(domainEvent.GetType(), domainEvent); } }