From ac88ae7a3bcee2bfc7cee9605293999a4722df0f Mon Sep 17 00:00:00 2001 From: liguoyang Date: Sat, 24 May 2025 20:29:49 +0800 Subject: [PATCH] =?UTF-8?q?fix=20=E5=A4=84=E7=90=86=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=97=B6=E9=97=B4,=E8=B0=83=E6=95=B4=E5=88=B05=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BalanceRecordUploadBackgroundService.cs | 16 ++-------- Src/Dlhis.Middle/Program.cs | 30 +++++++++---------- 2 files changed, 17 insertions(+), 29 deletions(-) diff --git a/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs b/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs index 470a15ce..db795431 100644 --- a/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs +++ b/Src/Dlhis.Middle/BackgroundServices/BalanceRecordUploadBackgroundService.cs @@ -48,7 +48,7 @@ public class BalanceRecordUploadBackgroundService : BackgroundService var balanceRecords = await db.Queryable() .Where(x => x.TenantId == factory) .Where(x => !x.IsSync).ToListAsync(stoppingToken); - + if (balanceRecords.Any()) { _logger.LogInformation("上传离线订单"); @@ -104,24 +104,12 @@ public class BalanceRecordUploadBackgroundService : BackgroundService try { - if (now is { Hour: 4, Minute: 1 } + if (now is { Hour: 5, Minute: 1 } && !_healthCheckService.GetIsOffline() && !await db.Queryable().Where(x => !x.IsSync).AnyAsync()) { await ds.InitAsync(factories); } - else if (now is { Hour: 15, Minute: 1 } - && !_healthCheckService.GetIsOffline() - && !await db.Queryable().Where(x => !x.IsSync).AnyAsync()) - { - await ds.InitAsync(factories); - } - else if (now is { Hour: 20, Minute: 1 } - && !_healthCheckService.GetIsOffline() - && !await db.Queryable().Where(x => !x.IsSync).AnyAsync()) - { - await ds.InitAsync(factories); - } } catch (Exception e) { diff --git a/Src/Dlhis.Middle/Program.cs b/Src/Dlhis.Middle/Program.cs index b07548a2..6bd8e0db 100644 --- a/Src/Dlhis.Middle/Program.cs +++ b/Src/Dlhis.Middle/Program.cs @@ -39,20 +39,20 @@ public class Startup : DefaultStartup { base.Configure(app, env); - var healthCheckService = app.ApplicationServices.GetService(); - if (healthCheckService.DoHealthCheckAsync().GetAwaiter().GetResult()) - { - using var scope = app.ApplicationServices.CreateScope(); - var db = scope.ServiceProvider.GetService(); - - db.Client.DbMaintenance.CreateDatabase(); - db.Client.CodeFirst.InitTables(); - db.Client.CodeFirst.InitTables(); - db.Client.CodeFirst.InitTables(); - - var factories = scope.ServiceProvider.GetService().GetFactories(); - var ds = scope.ServiceProvider.GetService(); - ds.InitAsync(factories).Wait(); - } + // var healthCheckService = app.ApplicationServices.GetService(); + // if (healthCheckService.DoHealthCheckAsync().GetAwaiter().GetResult()) + // { + // using var scope = app.ApplicationServices.CreateScope(); + // var db = scope.ServiceProvider.GetService(); + // + // db.Client.DbMaintenance.CreateDatabase(); + // db.Client.CodeFirst.InitTables(); + // db.Client.CodeFirst.InitTables(); + // db.Client.CodeFirst.InitTables(); + // + // var factories = scope.ServiceProvider.GetService().GetFactories(); + // var ds = scope.ServiceProvider.GetService(); + // ds.InitAsync(factories).Wait(); + // } } } \ No newline at end of file