added offset for sync

Author: seayxu

src/Hsu.Db.Export.Spreadsheet/Options/ExportOptions.cs

@@ -9,6 +9,7 @@ public class ExportOptions
     public static string Export { get; set; } = "Export:Spreadsheet";
     public TimeSpan Trigger { get; set; } = TimeSpan.Zero;
     public TimeSpan Interval { get; set; } = TimeSpan.FromSeconds(30);
+    [DefaultValue("06:00:00")] public TimeSpan? Offset { get; set; } = TimeSpan.FromHours(6);
     [DefaultValue("00:01:30")] public TimeSpan? Timeout { get; set; } = TimeSpan.FromSeconds(60);
     [DefaultValue(false)] public bool? Launch { get; set; }
     public string Path { get; set; } = string.Empty;

src/Hsu.Db.Export.Spreadsheet/Workers/DbDailySyncWorker.cs

@@ -25,13 +25,15 @@ public class DbDailySyncWorker : BackgroundService, IDbDailySyncWorker
     private readonly IExportServiceFactory _factory;
     private readonly ExportOptions _options;
     private readonly TimeSpan _time;
+    private readonly TimeSpan _offset;
     private readonly string _path;
 
     public DbDailySyncWorker(ILogger<DbDailySyncWorker> logger, IFreeSql freeSql, IConfiguration configuration, IExportServiceFactory exportService)
     {
         _options = configuration.GetSection(ExportOptions.Export).Get<ExportOptions>() ?? throw new InvalidOperationException();
         _path = string.IsNullOrWhiteSpace(_options.Path) ? Path.Combine(Environment.CurrentDirectory, "Data") : _options.Path;
         _time = _options.Trigger;
+        _offset = _options.Offset ?? TimeSpan.FromHours(6);
         _logger = logger;
         _freeSql = freeSql;
         _factory = exportService;
@@ -63,7 +65,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
 
         if (launch)
         {
-            await HandlerAsync(DateTime.Now,dir,types,timeout,stoppingToken);
+            await HandlerAsync(DateTime.Now, _offset, dir, types, timeout, stoppingToken);
         }
 
         while (!stoppingToken.IsCancellationRequested)
@@ -75,7 +77,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
                 _logger.LogDebug("Sync Check: {ret}", ret);
                 if (!ret) continue;
 
-                await HandlerAsync(now, dir, types, timeout, stoppingToken);
+                await HandlerAsync(now, _offset, dir, types, timeout, stoppingToken);
             }
             catch (Exception ex)
             {
@@ -86,7 +88,7 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
         _logger.LogInformation("Sync Executed");
     }
 
-    protected async Task HandlerAsync(DateTime now,string dir, ConcurrentDictionary<string, TableInfo> types, int timeout, CancellationToken stoppingToken)
+    protected async Task HandlerAsync(DateTime now,TimeSpan offset,string dir, ConcurrentDictionary<string, TableInfo> types, int timeout, CancellationToken stoppingToken)
     {
         _logger.LogInformation("Sync Handler Executing");
 
@@ -125,7 +127,7 @@ protected async Task HandlerAsync(DateTime now,string dir, ConcurrentDictionary<
                             _ => null
                         };
 
-                        var total = await FetchRecordAsync(_freeSql, timeout, table, date, _path, types[table.Code], exportService, _logger, stoppingToken);
+                        var total = await FetchRecordAsync(_freeSql, timeout, table, date,offset, _path, types[table.Code], exportService, _logger, stoppingToken);
                         sw.Stop();
                         _logger.LogInformation("Executing synchronously [{Table}]-{Date:yyyy-MM-dd} export to {Output} {Total} records completed used {Time}."
                             , table.Name
@@ -189,6 +191,7 @@ private static async Task<int> FetchRecordAsync(IFreeSql freeSql,
         int timeout,
         TableOptions table,
         DateTime date,
+        TimeSpan offset,
         string dir,
         TableInfo info,
         IExportService exportService,
@@ -205,13 +208,13 @@ CancellationToken stoppingToken
                 {
                     Field = $"a.{table.Filter}",
                     Operator = DynamicFilterOperator.GreaterThanOrEqual,
-                    Value = date.Date
+                    Value = date.Date + offset
                 },
                 new()
                 {
                     Field = $"a.{table.Filter}",
                     Operator = DynamicFilterOperator.LessThan,
-                    Value = date.Date.AddDays(1)
+                    Value = date.Date.AddDays(1) + offset
                 }
             }
         };