sync: 同步 v1.0.4 开源代码并脱敏

internal/repository/inbound/repository.go

@@ -5,6 +5,7 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/encoding/gjson"
@@ -14,6 +15,7 @@ import (
 
 	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/consts"
 	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/dao"
+	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/library/batchfields"
 	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/model/do"
 	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/model/entity"
 	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/service/batchresult"
@@ -385,10 +387,23 @@ func (r *Repository) findExistingStocksByField(ctx context.Context, field, label
 }
 
 func (r *Repository) SaveValidationFailure(ctx context.Context, task *inbound.Task) error {
-	return r.database().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+	err := r.database().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
 		batchInfo := buildInboundBatchInfo(task)
 		task.Batch.BatchInfo = batchInfo
 		details := buildBatchDetails(task, consts.BatchDetailStatusFailed)
+		failCount := 0
+		detailIndex := 0
+		for _, row := range task.Rows {
+			if row == nil {
+				continue
+			}
+			if inbound.IsCascadeFailure(row) {
+				details[detailIndex].DetailStatus = consts.BatchDetailStatusNotExecuted
+			} else {
+				failCount++
+			}
+			detailIndex++
+		}
 		if err := insertChunkedRows(ctx, tx, dao.BatchDetail.Table(), "inbound detail", details, inboundWriteBatchSize(ctx)); err != nil {
 			return err
 		}
@@ -397,14 +412,38 @@ func (r *Repository) SaveValidationFailure(ctx context.Context, task *inbound.Ta
 			TotalCount:       len(task.Rows),
 			ValidCount:       task.ValidCount,
 			SuccessCount:     0,
-			FailCount:        len(task.Rows),
+			FailCount:        failCount,
 			RunResult:        consts.BatchRunResultFailed,
-			FailReason:       task.FailureReason,
+			FailReason:       batchfields.FailureReason(task.FailureReason),
 			BatchInfo:        batchInfo,
 			EndTime:          gtime.Now(),
 			UpdatedBy:        task.Batch.CreatedBy,
 		})
 	})
+	if err == nil {
+		return nil
+	}
+	g.Log().Errorf(ctx, "save inbound validation details failed, batchNo:%s, err:%s", task.Batch.BatchNo, batchfields.FailureReason(err.Error()))
+	finalizationCtx, cancel := context.WithTimeout(context.WithoutCancel(ctx), 30*time.Second)
+	defer cancel()
+	fallbackErr := r.database().Transaction(finalizationCtx, func(ctx context.Context, tx gdb.TX) error {
+		return updateBatchMain(ctx, tx, task, do.BatchMain{
+			BatchAsyncStatus: consts.BatchAsyncStatusFailed,
+			TotalCount:       len(task.Rows),
+			ValidCount:       task.ValidCount,
+			SuccessCount:     0,
+			FailCount:        len(task.Rows),
+			RunResult:        consts.BatchRunResultFailed,
+			FailReason:       batchfields.FailureReason("错误明细保存失败，本次整批未入库"),
+			BatchInfo:        task.Batch.BatchInfo,
+			EndTime:          gtime.Now(),
+			UpdatedBy:        task.Batch.CreatedBy,
+		})
+	})
+	if fallbackErr != nil {
+		return gerror.Wrapf(fallbackErr, "save inbound failure details failed: %v; finalize batch failed", err)
+	}
+	return nil
 }
 
 func (r *Repository) SaveSuccess(ctx context.Context, task *inbound.Task) error {
@@ -481,8 +520,8 @@ func batchDetailRow(task *inbound.Task, row *inbound.Row, status int) do.BatchDe
 		DetailStatus:   status,
 		BlankOutStatus: 1,
 		RowNo:          row.RowNo,
-		ItemId:         row.ICCID,
-		ErrorReason:    row.Reason,
+		ItemId:         batchfields.ItemID(row.ICCID),
+		ErrorReason:    batchfields.DetailReason(row.Reason),
 		Snapshot:       rowSnapshot(row),
 		TenantId:       task.Batch.TenantID,
 		CreatedDept:    task.Batch.CreatedDept,
@@ -526,7 +565,7 @@ func (r *Repository) SaveResultFile(ctx context.Context, task *inbound.Task, req
 			ExportScene:      task.Batch.BatchType,
 			TotalCount:       len(task.Rows),
 			SuccessCount:     successRows(task.Rows),
-			FailCount:        len(task.Rows) - successRows(task.Rows),
+			FailCount:        failedRows(task.Rows),
 			DownloadStatus:   consts.DownloadStatusGenerated,
 			OssId:            ossID,
 			FileName:         artifact.FileName,
@@ -863,3 +902,13 @@ func successRows(rows []*inbound.Row) int {
 	}
 	return count
 }
+
+func failedRows(rows []*inbound.Row) int {
+	count := 0
+	for _, row := range rows {
+		if row != nil && row.Reason != "" && !inbound.IsCascadeFailure(row) {
+			count++
+		}
+	}
+	return count
+}