diff --git a/IRaCIS.Core.API/HostService/HangfireHostService.cs b/IRaCIS.Core.API/HostService/HangfireHostService.cs new file mode 100644 index 000000000..65336aec0 --- /dev/null +++ b/IRaCIS.Core.API/HostService/HangfireHostService.cs @@ -0,0 +1,66 @@ +using Microsoft.Extensions.Hosting; +using System.Threading; +using System; +using System.Threading.Tasks; +using MassTransit; +using IRaCIS.Core.Domain.Models; +using IRaCIS.Core.Infra.EFCore; +using Microsoft.Extensions.Logging; +using Hangfire; +using IRaCIS.Core.Application.Helper; +using IRaCIS.Core.Application.MassTransit.Consumer; +using IRaCIS.Core.Domain.Share; +using MassTransit.Scheduling; +using Hangfire.Storage; +using System.Linq; +using Microsoft.EntityFrameworkCore; + +namespace IRaCIS.Core.API.HostService; + +public class HangfireHostService(IRecurringMessageScheduler _recurringMessageScheduler, + IRepository _trialEmailNoticeConfigRepository, + ILogger _logger) : IHostedService +{ + + + public async Task StartAsync(CancellationToken cancellationToken) + { + _logger.LogInformation("项目启动 hangfire 任务初始化 执行开始~"); + + + //创建邮件定时任务 + //项目定时任务都在default 队列 + var dbJobIdList = JobStorage.Current.GetConnection().GetRecurringJobs().Where(t => t.Queue == "default").Select(t => t.Id).ToList(); + + foreach (var jobId in dbJobIdList) + { + HangfireJobHelper.RemoveCronJob(jobId); + } + + + var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr == StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend) + .Select(t => new { t.Id, t.Code, TrialCode = t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId }) + .ToListAsync(); + + foreach (var task in taskInfoList) + { + //利用主键作为任务Id + var jobId = $"{task.TrialId}({task.TrialCode})_({task.BusinessScenarioEnum})"; + + var trialId = task.TrialId; + + HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron); + } + + + await _recurringMessageScheduler.ScheduleRecurringPublish(new QCImageQuestionSchedule() { CronExpression = "0/3 * * * * ? " }, new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() }); + + + + _logger.LogInformation("项目启动 hangfire 任务初始化 执行结束"); + } + + public Task StopAsync(CancellationToken cancellationToken) => Task.CompletedTask; + + +} diff --git a/IRaCIS.Core.API/Progranm.cs b/IRaCIS.Core.API/Progranm.cs index b57a9bd78..99903e9f7 100644 --- a/IRaCIS.Core.API/Progranm.cs +++ b/IRaCIS.Core.API/Progranm.cs @@ -1,9 +1,9 @@ using IRaCIS.Core.API; +using IRaCIS.Core.API.HostService; using IRaCIS.Core.Application.BusinessFilter; using IRaCIS.Core.Application.Filter; using IRaCIS.Core.Application.MassTransit.Consumer; using IRaCIS.Core.Application.Service; -using IRaCIS.Core.Application.Service.BackGroundJob; using IRaCIS.Core.Application.Service.BusinessFilter; using IRaCIS.Core.Infra.EFCore; using IRaCIS.Core.Infrastructure.Extention; @@ -72,6 +72,8 @@ var _configuration = builder.Configuration; //手动注册服务 builder.Services.ConfigureServices(_configuration); +builder.Services.AddHostedService(); + //minimal api 异常处理 builder.Services.AddExceptionHandler(); //builder.Services.AddProblemDetails(); @@ -251,11 +253,6 @@ SerilogExtension.AddSerilogSetup(enviromentName, app.Services); -var hangfireJobService = app.Services.GetRequiredService(); - -await hangfireJobService.InitHangfireJobTaskAsync(); - - try { #region 运行环境 部署平台 @@ -288,6 +285,8 @@ try #endregion app.Run(); + + } catch (Exception e) { diff --git a/IRaCIS.Core.API/_ServiceExtensions/MassTransitSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/MassTransitSetup.cs index 57f7b0f5f..19b368b9d 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/MassTransitSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/MassTransitSetup.cs @@ -28,36 +28,21 @@ namespace IRaCIS.Core.API //添加 MassTransit 和 InMemory 传输 services.AddMassTransit(cfg => { - // 自动扫描程序集中的消费者并进行注册 cfg.AddConsumers(typeof(UserSiteSurveySubmitedEventConsumer).Assembly); - - - //Uri schedulerEndpoint = new Uri("queue:scheduler"); - //cfg.AddMessageScheduler(schedulerEndpoint); - cfg.AddPublishMessageScheduler(); cfg.AddHangfireConsumers(); - - // 使用 InMemory 作为消息传递机制 cfg.UsingInMemory((context, cfg) => { - //https://github.com/MassTransit/Sample-Hangfire/blob/master/src/Sample.Hangfire.Console/Program.cs cfg.UsePublishMessageScheduler(); - //cfg.UseMessageScheduler(schedulerEndpoint); - //使用 Hangfire 进行消息调度 - //cfg.UseHangfireScheduler(); - cfg.UseConsumeFilter(typeof(CultureInfoFilter<>), context, x => x.Include(type => type.IsAssignableTo(typeof(DomainEvent)))); - - // 这里可以进行额外的配置 cfg.ConfigureEndpoints(context); // 自动配置所有消费者的端点 }); diff --git a/IRaCIS.Core.API/_ServiceExtensions/ServiceCollectionSetup.cs b/IRaCIS.Core.API/_ServiceExtensions/ServiceCollectionSetup.cs index 0593a0e31..6eb538635 100644 --- a/IRaCIS.Core.API/_ServiceExtensions/ServiceCollectionSetup.cs +++ b/IRaCIS.Core.API/_ServiceExtensions/ServiceCollectionSetup.cs @@ -4,7 +4,6 @@ using IP2Region.Net.XDB; using IRaCIS.Core.Application.BackGroundJob; using IRaCIS.Core.Application.Helper; using IRaCIS.Core.Application.Service; -using IRaCIS.Core.Application.Service.BackGroundJob; using IRaCIS.Core.Domain.Share; using IRaCIS.Core.Infra.EFCore; using Microsoft.AspNetCore.Builder; @@ -52,7 +51,6 @@ public static class ServiceCollectionSetup services.AddScoped(); services.AddScoped(); - services.AddScoped(); // עService βķ services.Scan(scan => scan diff --git a/IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs b/IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs deleted file mode 100644 index f924134b4..000000000 --- a/IRaCIS.Core.Application/BackGroundJob/IRaCISCHangfireJob.cs +++ /dev/null @@ -1,83 +0,0 @@ -using Hangfire; -using Hangfire.Storage; -using IRaCIS.Core.Application.Helper; -using IRaCIS.Core.Application.MassTransit.Consumer; -using IRaCIS.Core.Domain.Models; -using IRaCIS.Core.Domain.Share; -using MassTransit; -using MassTransit.Mediator; -using MassTransit.Scheduling; -using Microsoft.Extensions.Logging; -using NPOI.SS.Formula.Functions; - -namespace IRaCIS.Core.Application.Service.BackGroundJob -{ - - public interface IIRaCISHangfireJob - { - Task InitHangfireJobTaskAsync(); - - } - public class IRaCISCHangfireJob(ILogger _logger, - IRepository _trialEmailNoticeConfigRepository, - IBus _bus - ) : IIRaCISHangfireJob - { - public static string JsonFileFolder = Path.Combine(AppContext.BaseDirectory, StaticData.Folder.Resources); - - - public async Task InitHangfireJobTaskAsync() - { - _logger.LogInformation("项目启动 hangfire 任务初始化 执行开始~"); - - - //创建邮件定时任务 - await InitSysAndTrialCronJobAsync(); - - - _logger.LogInformation("项目启动 hangfire 任务初始化 执行结束"); - } - - - - public async Task InitSysAndTrialCronJobAsync() - { - //项目定时任务都在default 队列 - var dbJobIdList = JobStorage.Current.GetConnection().GetRecurringJobs().Where(t => t.Queue == "default").Select(t => t.Id).ToList(); - - foreach (var jobId in dbJobIdList) - { - HangfireJobHelper.RemoveCronJob(jobId); - } - - - var taskInfoList = await _trialEmailNoticeConfigRepository.Where(t => t.Trial.TrialStatusStr == StaticData.TrialState.TrialOngoing && t.EmailCron != string.Empty && t.IsAutoSend) - .Select(t => new { t.Id, t.Code, TrialCode=t.Trial.TrialCode, t.EmailCron, t.BusinessScenarioEnum, t.TrialId }) - .ToListAsync(); - - foreach (var task in taskInfoList) - { - //利用主键作为任务Id - var jobId = $"{task.TrialId}({task.TrialCode})_{task.Id}({task.BusinessScenarioEnum})"; - - var trialId = task.TrialId; - - HangfireJobHelper.AddOrUpdateTrialCronJob(jobId, trialId, task.BusinessScenarioEnum, task.EmailCron); - } - - //var schedulerEndpoint = await _bus.GetSendEndpoint(new Uri("queue:sys_init")); - //await schedulerEndpoint.ScheduleRecurringSend(new Uri("queue:mt-message-queue"), new QCImageQuestionSchedule() { ScheduleId = jobId, CronExpression = "0 0/1 * 1/1 * ? *" }, new PollExternalSystem { }); - //await schedulerEndpoint.ScheduleRecurringSend(new Uri("queue:sys_init"), new QCImageQuestionSchedule() { ScheduleId = jobId + jobId, CronExpression = "0 0/1 * 1/1 * ? *" }, new PollExternalSystem { }); - - //HangfireJobHelper.AddOrUpdateCronJob("test-MasstransiTestCommand", t => t.Send(new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() }, default), "0/3 * * * * ? "); - - //await _bus.ScheduleRecurringSend(new Uri("queue:mt-message-queue"), new QCImageQuestionSchedule() { ScheduleId = jobId, CronExpression = "0 0/1 * 1/1 * ? *" }, new QCImageQuestionSchedule { }); - - } - - public class PollExternalSystem { } - - } - - -} diff --git a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml index 24af7028b..0984f05f5 100644 --- a/IRaCIS.Core.Application/IRaCIS.Core.Application.xml +++ b/IRaCIS.Core.Application/IRaCIS.Core.Application.xml @@ -1286,27 +1286,6 @@ - - - 影像质控 - - - - - - - QC质疑 - - - - - - - 影像质疑 - - - - TrialEmailNoticeConfigService @@ -12920,6 +12899,18 @@ MIM 回复医学返回通知IR + + + MIM 回复医学返回通知IR + + + + + MIM 回复医学返回通知IR + + + + 加急阅片 IR 申请重阅 或者PM 申请重阅 diff --git a/IRaCIS.Core.Application/BackGroundJob/ObtainTaskAutoCancelJob.cs b/IRaCIS.Core.Application/MassTransit/Consumer/Old/ObtainTaskAutoCancelJob.cs similarity index 100% rename from IRaCIS.Core.Application/BackGroundJob/ObtainTaskAutoCancelJob.cs rename to IRaCIS.Core.Application/MassTransit/Consumer/Old/ObtainTaskAutoCancelJob.cs diff --git a/IRaCIS.Core.Application/MassTransit/Consumer/TestConsumer.cs b/IRaCIS.Core.Application/MassTransit/Consumer/TestConsumer.cs index 09d06fea3..ac559acc0 100644 --- a/IRaCIS.Core.Application/MassTransit/Consumer/TestConsumer.cs +++ b/IRaCIS.Core.Application/MassTransit/Consumer/TestConsumer.cs @@ -2,6 +2,7 @@ using IRaCIS.Core.Domain.Share; using MassTransit; using MassTransit.Mediator; +using MassTransit.Scheduling; using Medallion.Threading; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Options; @@ -46,6 +47,7 @@ public class TestMasstransitService : BaseService public async Task TestMasstransitRequest([FromServices] IMessageScheduler _scheduler, + [FromServices] IRecurringMessageScheduler _recurringMessageScheduler, [FromServices] IRepository _testLengthRepository, [FromServices] IRequestClient _requestClient, [FromServices] IScopedClientFactory _clientFactory, @@ -60,17 +62,17 @@ public class TestMasstransitService : BaseService //IScopedMediator 上下文一致， IMediator上下文不一致 //通过命令不获取结果 进入消费者后再返回 数据库上下文 不同 - await _mediator.Send(new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() }); + //await _mediator.Send(new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() }); - //通过命令获取结果 进入消费者后再返回 数据库上下文 相同 - var dd = await _mediatorScoped.CreateRequest(new MasstransiTestCommand() { value = "message at " + DateTime.Now.ToString() }) - .GetResponse(); + ////通过命令获取结果 进入消费者后再返回 数据库上下文 相同 + //var dd = await _mediatorScoped.CreateRequest(new MasstransiTestCommand() { value = "message at " + DateTime.Now.ToString() }) + // .GetResponse(); - //发布后，不会立即进入消费者，消费者是另外的线程执行 - await _mediatorScoped.Publish(new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() }); + ////发布后，不会立即进入消费者，消费者是另外的线程执行 + //await _mediatorScoped.Publish(new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() }); - - await _scheduler.SchedulePublish(DateTime.Now.AddSeconds(10), new MasstransiTestCommand() { value = "message at " + DateTime.Now.ToString() }); + await _recurringMessageScheduler.ScheduleRecurringPublish(new QCImageQuestionSchedule() { CronExpression = "0/3 * * * * ? " }, new MasstransiTestCommand { value = "message at " + DateTime.Now.ToString() }); + //await _scheduler.SchedulePublish(DateTime.Now.AddSeconds(10), new MasstransiTestCommand() { value = "message at " + DateTime.Now.ToString() }); return ResponseOutput.Ok(); }