修复Mysql

2026-07-26 10:19:46 +08:00
parent 634ef69a27
commit 72297aa23f
31 changed files with 1642 additions and 1192 deletions
@@ -123,32 +123,39 @@ public sealed class PersonnelExcelController(
        }
        if (rows.Count == 0) return ValidationProblem("Excel 中没有可导入的数据。");

-        var errors = new List<string>();
-        await using var transaction = await db.Database.BeginTransactionAsync(cancellationToken);
-        try
-        {
-            var result = kind.Equals("teachers", StringComparison.OrdinalIgnoreCase)
-                ? await ImportTeachersAsync(rows, errors, cancellationToken)
-                : await ImportStudentsAsync(rows, errors, cancellationToken);
-            if (errors.Count > 0)
+        return await db.ExecuteInRetriableTransactionAsync<
+            ActionResult<ExcelImportResult>>(
+            async transaction =>
            {
-                await transaction.RollbackAsync(cancellationToken);
-                return ImportValidationProblem(errors);
-            }
-            await db.SaveChangesAsync(cancellationToken);
-            await transaction.CommitAsync(cancellationToken);
-            return Ok(result);
-        }
-        catch (DbUpdateException)
-        {
-            await transaction.RollbackAsync(cancellationToken);
-            return Conflict(new ProblemDetails
-            {
-                Title = "导入失败",
-                Detail = "存在重复编号或无效关联，未写入任何档案。",
-                Status = StatusCodes.Status409Conflict
-            });
-        }
+                var errors = new List<string>();
+                try
+                {
+                    var result = kind.Equals(
+                        "teachers",
+                        StringComparison.OrdinalIgnoreCase)
+                        ? await ImportTeachersAsync(rows, errors, cancellationToken)
+                        : await ImportStudentsAsync(rows, errors, cancellationToken);
+                    if (errors.Count > 0)
+                    {
+                        await transaction.RollbackAsync(cancellationToken);
+                        return ImportValidationProblem(errors);
+                    }
+                    await db.SaveChangesAsync(cancellationToken);
+                    await transaction.CommitAsync(cancellationToken);
+                    return Ok(result);
+                }
+                catch (DbUpdateException)
+                {
+                    await transaction.RollbackAsync(cancellationToken);
+                    return Conflict(new ProblemDetails
+                    {
+                        Title = "导入失败",
+                        Detail = "存在重复编号或无效关联，未写入任何档案。",
+                        Status = StatusCodes.Status409Conflict
+                    });
+                }
+            },
+            cancellationToken);
    }

    private async Task<ExcelImportResult> ImportTeachersAsync(