fix 补充日志输出

This commit is contained in:
2024-08-20 11:45:33 +08:00
parent 637d1da040
commit 0291a59e2e
4 changed files with 67 additions and 125 deletions

View File

@@ -18,13 +18,15 @@ public class DataDownloadService : IDataDownloadService
private readonly IHttpClientFactory _httpClientFactory;
private readonly IMemoryCache _memoryCache;
private readonly IDbContext _dbContext;
private readonly ILogger<DataDownloadService> _logger;
private readonly string _hostName;
public DataDownloadService(IHttpClientFactory httpClientFactory, IMemoryCache memoryCache, IConfiguration configuration, IDbContext dbContext)
public DataDownloadService(IHttpClientFactory httpClientFactory, IMemoryCache memoryCache, IConfiguration configuration, IDbContext dbContext, ILogger<DataDownloadService> logger)
{
_httpClientFactory = httpClientFactory;
_memoryCache = memoryCache;
_dbContext = dbContext;
_logger = logger;
_hostName = configuration.GetSection("HostName").Value;
}
@@ -36,6 +38,7 @@ public class DataDownloadService : IDataDownloadService
foreach (var item in factories)
{
_logger.LogInformation("正在下载{factory}", item);
if (!await _dbContext.Queryable<LocalDepartmentEntity>().AnyAsync())
{
await DownloadAsync<LocalDepartmentEntity>(item);
@@ -63,6 +66,8 @@ public class DataDownloadService : IDataDownloadService
}
}
}
_logger.LogInformation("下载完成");
}
public async Task DownloadAsync<T>(string factory) where T : class, new()
@@ -97,38 +102,8 @@ public class DataDownloadService : IDataDownloadService
await _dbContext.Client.Deleteable<LocalBusinessPlaceShiftRelationshipEntity>().ExecuteCommandAsync();
await _dbContext.Client.Deleteable<LocalBusinessShiftMealRelationshipEntity>().ExecuteCommandAsync();
//await _dbContext.Client.Deleteable<LocalGainfoEntity>().ExecuteCommandAsync();
//await _dbContext.Client.Deleteable<LocalGainfoMealEntity>().ExecuteCommandAsync();
}
/// <inheritdoc />
public async Task DownloadGainfosAsync(string factory)
{
await _dbContext.Client.Ado.BeginTranAsync();
try
{
await _dbContext.Client.Deleteable<LocalGainfoEntity>().ExecuteCommandAsync();
await _dbContext.Client.Deleteable<LocalGainfoMealEntity>().ExecuteCommandAsync();
await DownloadAsync<LocalGainfoEntity>(factory);
await DownloadAsync<LocalGainfoMealEntity>(factory);
await DownloadAsync<LocalDeviceEntity>(factory);
await DownloadAsync<LocalDeviceRegistryEntity>(factory);
await DownloadAsync<LocalBusinessPlaceEntity>(factory);
await DownloadAsync<LocalBusinessShiftEntity>(factory);
await DownloadAsync<LocalBusinessPlaceShiftRelationshipEntity>(factory);
await DownloadAsync<LocalBusinessShiftMealRelationshipEntity>(factory);
await _dbContext.Client.Ado.CommitTranAsync();
}
catch (Exception)
{
await _dbContext.Client.Ado.RollbackTranAsync();
}
await _dbContext.Client.Deleteable<LocalGainfoEntity>().ExecuteCommandAsync();
await _dbContext.Client.Deleteable<LocalGainfoMealEntity>().ExecuteCommandAsync();
}
private async Task<string> AuthAsync()