From 49687c0f50f98cbf562e88929d87a8675e8b6032 Mon Sep 17 00:00:00 2001
From: liguoyang <Ligy.97@foxmail.com>
Date: Tue, 3 Sep 2024 10:04:03 +0800
Subject: [PATCH] =?UTF-8?q?fix=20=E8=A1=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Src/Dlhis.Middle/Packs/SqlSugarPack.cs        | 14 ++--
 .../Implements/DataDownloadService.cs         | 82 +++++++++++--------
 2 files changed, 53 insertions(+), 43 deletions(-)

diff --git a/Src/Dlhis.Middle/Packs/SqlSugarPack.cs b/Src/Dlhis.Middle/Packs/SqlSugarPack.cs
index 54fe458d..89e24c61 100644
--- a/Src/Dlhis.Middle/Packs/SqlSugarPack.cs
+++ b/Src/Dlhis.Middle/Packs/SqlSugarPack.cs
@@ -139,12 +139,12 @@ public class SqlSugarPack : BaseAppPack
 
     public override void Configure(IApplicationBuilder app, IWebHostEnvironment env)
     {
-        // using var scope = app.ApplicationServices.CreateScope();
-        // var db = scope.ServiceProvider.GetService<IDbContext>();
-        //
-        // db.Client.DbMaintenance.CreateDatabase();
-        // db.Client.CodeFirst.InitTables<LocalBalanceRecordEntity, LocalGainfoEntity, LocalGainfoMealEntity, LocalBusinessPlaceEntity>();
-        // db.Client.CodeFirst.InitTables<LocalBusinessShiftEntity, LocalDeviceRegistryEntity, LocalDeviceEntity, LocalBusinessPlaceShiftRelationshipEntity, LocalBusinessShiftMealRelationshipEntity>();
-        // db.Client.CodeFirst.InitTables<LocalCanteenSettingEntity, LocalDepartmentEntity>();
+        using var scope = app.ApplicationServices.CreateScope();
+        var db = scope.ServiceProvider.GetService<IDbContext>();
+        
+        db.Client.DbMaintenance.CreateDatabase();
+        db.Client.CodeFirst.InitTables<LocalBalanceRecordEntity, LocalGainfoEntity, LocalGainfoMealEntity, LocalBusinessPlaceEntity>();
+        db.Client.CodeFirst.InitTables<LocalBusinessShiftEntity, LocalDeviceRegistryEntity, LocalDeviceEntity, LocalBusinessPlaceShiftRelationshipEntity, LocalBusinessShiftMealRelationshipEntity>();
+        db.Client.CodeFirst.InitTables<LocalCanteenSettingEntity, LocalDepartmentEntity>();
     }
 }
\ No newline at end of file
diff --git a/Src/Dlhis.Middle/Services/Implements/DataDownloadService.cs b/Src/Dlhis.Middle/Services/Implements/DataDownloadService.cs
index cafa3607..c9498000 100644
--- a/Src/Dlhis.Middle/Services/Implements/DataDownloadService.cs
+++ b/Src/Dlhis.Middle/Services/Implements/DataDownloadService.cs
@@ -39,48 +39,58 @@ public class DataDownloadService : IDataDownloadService
 
         var factories = factory.Split(',');
 
-        await TruncateAsync();
-
-        foreach (var item in factories)
+        await _dbContext.Client.Ado.BeginTranAsync();
+        try
         {
-            _logger.LogInformation("正在下载{factory}", item);
-            if (!await _dbContext.Queryable<LocalDepartmentEntity>().AnyAsync())
+            await TruncateAsync();
+
+            foreach (var item in factories)
             {
-                await DownloadAsync<LocalDepartmentEntity>(item);
-            }
-
-            await DownloadAsync<LocalDeviceEntity>(item);
-            await DownloadAsync<LocalDeviceRegistryEntity>(item);
-
-            await DownloadAsync<LocalBusinessPlaceEntity>(item);
-            await DownloadAsync<LocalBusinessShiftEntity>(item);
-            await DownloadAsync<LocalBusinessPlaceShiftRelationshipEntity>(item);
-            await DownloadAsync<LocalBusinessShiftMealRelationshipEntity>(item);
-
-            if (!await _dbContext.Queryable<LocalGainfoEntity>().Where(x => x.Factory == item).AnyAsync())
-            {
-                await DownloadAsync<LocalGainfoEntity>(item);
-            }
-
-            if (!await _dbContext.Queryable<LocalGainfoMealEntity>().AnyAsync())
-            {
-                foreach (var currentItem in factories)
+                _logger.LogInformation("正在下载{factory}", item);
+                if (!await _dbContext.Queryable<LocalDepartmentEntity>().AnyAsync())
                 {
-                    await DownloadAsync<LocalGainfoMealEntity>(currentItem);
+                    await DownloadAsync<LocalDepartmentEntity>(item);
+                }
+
+                await DownloadAsync<LocalDeviceEntity>(item);
+                await DownloadAsync<LocalDeviceRegistryEntity>(item);
+
+                await DownloadAsync<LocalBusinessPlaceEntity>(item);
+                await DownloadAsync<LocalBusinessShiftEntity>(item);
+                await DownloadAsync<LocalBusinessPlaceShiftRelationshipEntity>(item);
+                await DownloadAsync<LocalBusinessShiftMealRelationshipEntity>(item);
+
+                if (!await _dbContext.Queryable<LocalGainfoEntity>().Where(x => x.Factory == item).AnyAsync())
+                {
+                    await DownloadAsync<LocalGainfoEntity>(item);
+                }
+
+                if (!await _dbContext.Queryable<LocalGainfoMealEntity>().AnyAsync())
+                {
+                    foreach (var currentItem in factories)
+                    {
+                        await DownloadAsync<LocalGainfoMealEntity>(currentItem);
+                    }
                 }
             }
-        }
 
-        _logger.LogInformation("部门{count}", await _dbContext.Queryable<LocalDepartmentEntity>().CountAsync());
-        _logger.LogInformation("设备{count}", await _dbContext.Queryable<LocalDeviceEntity>().CountAsync());
-        _logger.LogInformation("设备注册信息{count}", await _dbContext.Queryable<LocalDeviceRegistryEntity>().CountAsync());
-        _logger.LogInformation("营业点{count}", await _dbContext.Queryable<LocalBusinessPlaceEntity>().CountAsync());
-        _logger.LogInformation("营业点餐别{count}", await _dbContext.Queryable<LocalBusinessShiftEntity>().CountAsync());
-        _logger.LogInformation("营业点餐别对照{count}", await _dbContext.Queryable<LocalBusinessPlaceShiftRelationshipEntity>().CountAsync());
-        _logger.LogInformation("营业点餐别餐次对照{count}", await _dbContext.Queryable<LocalBusinessShiftMealRelationshipEntity>().CountAsync());
-        _logger.LogInformation("档案{count}", await _dbContext.Queryable<LocalGainfoEntity>().CountAsync());
-        _logger.LogInformation("余额{count}", await _dbContext.Queryable<LocalGainfoMealEntity>().CountAsync());
-        _logger.LogInformation("下载完成");
+            _logger.LogInformation("部门{count}", await _dbContext.Queryable<LocalDepartmentEntity>().CountAsync());
+            _logger.LogInformation("设备{count}", await _dbContext.Queryable<LocalDeviceEntity>().CountAsync());
+            _logger.LogInformation("设备注册信息{count}", await _dbContext.Queryable<LocalDeviceRegistryEntity>().CountAsync());
+            _logger.LogInformation("营业点{count}", await _dbContext.Queryable<LocalBusinessPlaceEntity>().CountAsync());
+            _logger.LogInformation("营业点餐别{count}", await _dbContext.Queryable<LocalBusinessShiftEntity>().CountAsync());
+            _logger.LogInformation("营业点餐别对照{count}", await _dbContext.Queryable<LocalBusinessPlaceShiftRelationshipEntity>().CountAsync());
+            _logger.LogInformation("营业点餐别餐次对照{count}", await _dbContext.Queryable<LocalBusinessShiftMealRelationshipEntity>().CountAsync());
+            _logger.LogInformation("档案{count}", await _dbContext.Queryable<LocalGainfoEntity>().CountAsync());
+            _logger.LogInformation("余额{count}", await _dbContext.Queryable<LocalGainfoMealEntity>().CountAsync());
+            _logger.LogInformation("下载完成");
+            await _dbContext.Client.Ado.CommitTranAsync();
+        }
+        catch (Exception e)
+        {
+            await _dbContext.Client.Ado.RollbackTranAsync();
+            throw;
+        }
     }
 
     public async Task DownloadAsync<T>(string factory) where T : class, new()