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

internal/service/batchresult/generator.go

@@ -3,6 +3,7 @@ package batchresult
 import (
 	"context"
 	"crypto/md5"
+	"crypto/rand"
 	"encoding/hex"
 	"fmt"
 	"io"
@@ -11,6 +12,8 @@ import (
 	"strings"
 	"time"
 
+	"git.5iot.com/iotlcm-public/iotlcm-worker-svr/internal/consts"
+
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/xuri/excelize/v2"
@@ -32,7 +35,9 @@ type Row struct {
 	TargetStatus   int
 	Operation      string
 	ApnName        string
+	DetailStatus   int
 	Success        bool
+	Status         string
 	Reason         string
 	UpstreamCode   int
 	OrderNum       string
@@ -88,13 +93,27 @@ func (gtr *generator) Create(ctx context.Context, request Request) (Artifact, er
 	if err = os.MkdirAll(directory, 0o755); err != nil {
 		return Artifact{}, gerror.Wrap(err, "create batch result directory")
 	}
-	fileName := request.BatchNo + "-result.xlsx"
+	originalName := request.BatchNo + "-result.xlsx"
+	var nonce [16]byte
+	if _, err = rand.Read(nonce[:]); err != nil {
+		return Artifact{}, gerror.Wrap(err, "generate batch result file name")
+	}
+	fileName := request.BatchNo + "-result-" + hex.EncodeToString(nonce[:]) + ".xlsx"
 	filePath := filepath.Join(directory, fileName)
+	file, err := os.OpenFile(filePath, os.O_CREATE|os.O_EXCL|os.O_WRONLY, 0o666)
+	if err != nil {
+		return Artifact{}, gerror.Wrap(err, "reserve batch result file")
+	}
+	if err = file.Close(); err != nil {
+		_ = os.Remove(filePath)
+		return Artifact{}, gerror.Wrap(err, "close reserved result file")
+	}
 	logicalPath := filepath.Join(uploadPath, objectDir, fileName)
 	if err = writeWorkbook(filePath, request); err != nil {
+		_ = os.Remove(filePath)
 		return Artifact{}, err
 	}
-	artifact, err := inspectArtifact(ctx, filePath, logicalPath, fileName, tenantID)
+	artifact, err := inspectArtifact(ctx, filePath, logicalPath, fileName, originalName, tenantID)
 	if err != nil {
 		_ = os.Remove(filePath)
 		return Artifact{}, err
@@ -262,6 +281,9 @@ func writeAllocateWorkbook(file *excelize.File, sheet, path string, request Requ
 		if row.Success {
 			status = "成功"
 		}
+		if row.Status != "" {
+			status = row.Status
+		}
 		values := []interface{}{row.RowNo, row.ICCID, row.MSISDN, row.IMSI, row.TargetDeptName, status, row.Reason}
 		cell, err := excelize.CoordinatesToCellName(1, index+2)
 		if err != nil {
@@ -387,6 +409,9 @@ func writeInboundWorkbook(file *excelize.File, sheet, path string, request Reque
 		if row.Success {
 			status = "成功"
 		}
+		if row.Status != "" {
+			status = row.Status
+		}
 		values := []interface{}{row.RowNo, row.ICCID, status, row.Reason}
 		cell, err := excelize.CoordinatesToCellName(1, index+2)
 		if err != nil {
@@ -480,13 +505,15 @@ func writeCancelWorkbook(file *excelize.File, sheet, path string, request Reques
 }
 
 func writeDataServiceWorkbook(file *excelize.File, sheet, path string, request Request) error {
-	headers := []interface{}{"行号", "ICCID", "MSISDN", "IMSI", "操作", "APN", "执行结果", "失败原因", "上游状态码", "上游订单号"}
+	headers := []interface{}{"行号", "ICCID", "MSISDN", "IMSI", "操作", "APN", "执行结果", "失败/待核查原因", "上游状态码", "上游订单号"}
 	if err := file.SetSheetRow(sheet, "A1", &headers); err != nil {
 		return gerror.Wrap(err, "write data service result headers")
 	}
 	for index, row := range request.Rows {
 		status := "失败"
-		if row.Success {
+		if row.DetailStatus == consts.BatchDetailStatusUnknown {
+			status = "待核查"
+		} else if row.Success {
 			status = "成功"
 		}
 		values := []interface{}{row.RowNo, row.ICCID, row.MSISDN, row.IMSI, row.Operation, row.ApnName, status, row.Reason, row.UpstreamCode, row.OrderNum}
@@ -513,7 +540,7 @@ func writeDataServiceWorkbook(file *excelize.File, sheet, path string, request R
 	return nil
 }
 
-func inspectArtifact(ctx context.Context, localPath, logicalPath, fileName string, tenantID string) (Artifact, error) {
+func inspectArtifact(ctx context.Context, localPath, logicalPath, fileName, originalName, tenantID string) (Artifact, error) {
 	file, err := os.Open(localPath)
 	if err != nil {
 		return Artifact{}, gerror.Wrap(err, "open result file")
@@ -526,7 +553,7 @@ func inspectArtifact(ctx context.Context, localPath, logicalPath, fileName strin
 	}
 	return Artifact{
 		FileName:     fileName,
-		OriginalName: fileName,
+		OriginalName: originalName,
 		FileSuffix:   "xlsx",
 		Path:         logicalPath,
 		LocalPath:    localPath,