sync: 同步 v1.0.4 并脱敏配置与镜像

server/internal/logic/iot/simcardbatch/outbound/processor.go

@@ -2,6 +2,7 @@ package outbound
 
 import (
 	"context"
+	"fmt"
 	"strings"
 
 	"git.5iot.com/iotlcm-public/iotlcm-admin-svr/internal/consts"
@@ -211,10 +212,13 @@ func (p *Processor) validateExecuteContext(ctx context.Context, tx gdb.TX, in *m
 	if err := p.validateSelectablePackage(ctx, tx, in.PackageCode, operator.TenantId); err != nil {
 		return err
 	}
-	iccids, err := strictRowsToIccids(rows)
+	iccids, err := validateOutboundIdentifiers(rows)
 	if err != nil {
 		return err
 	}
+	if len(iccids) == 0 {
+		return errOutboundValidationRejected
+	}
 	stockByIccid, err := p.repo.LockStockCardsByIccids(ctx, tx, iccids)
 	if err != nil {
 		return gerror.Wrap(err, "校验出库库存卡失败")
@@ -237,11 +241,38 @@ func (p *Processor) validateExecuteContext(ctx context.Context, tx gdb.TX, in *m
 
 	if hasInvalidRows(rows) {
 		markRemainingRowsSkipped(rows)
-		return gerror.New("存在不满足出库条件的卡，本次未执行")
+		return errOutboundValidationRejected
 	}
 	return nil
 }
 
+func validateOutboundIdentifiers(rows []*Row) ([]string, error) {
+	seen := make(map[string]*Row, len(rows))
+	for _, row := range rows {
+		if row == nil {
+			return nil, gerror.New("出库行不能为空")
+		}
+		row.Iccid = strings.TrimSpace(row.Iccid)
+		if row.Iccid == "" {
+			row.AddReason("ICCID不能为空")
+			continue
+		}
+		if first, exists := seen[row.Iccid]; exists {
+			row.AddReason(fmt.Sprintf("ICCID与第%d行重复", first.RowNo))
+			first.AddReason(fmt.Sprintf("ICCID与第%d行重复", row.RowNo))
+			continue
+		}
+		seen[row.Iccid] = row
+	}
+	iccids := make([]string, 0, len(seen))
+	for iccid, row := range seen {
+		if row.Reason == "" {
+			iccids = append(iccids, iccid)
+		}
+	}
+	return iccids, nil
+}
+
 func (p *Processor) validateSelectablePackage(ctx context.Context, tx gdb.TX, packageCode, tenantId string) error {
 	pkg, err := p.repo.LoadPackage(ctx, tx, tenantId, packageCode)
 	if err != nil {
@@ -329,27 +360,28 @@ func (p *Processor) submitParams(params any) *model.TSimCardOutboundSubmitParam
 }
 
 func validateOutboundRow(row *Row, stock *entity.TSimCardStock, formalExists bool, operator batchimport.OperatorContext, strictStockIdentity bool, requiredSourceBatchNo string) string {
+	var reasons []string
 	if stock == nil {
 		return "ICCID不存在库存记录，不能出库"
 	}
 	if stock.CreatedDept != operator.DeptId {
-		return "ICCID不属于当前机构库存，不能出库"
+		reasons = append(reasons, "ICCID不属于当前机构库存，不能出库")
 	}
 	if requiredSourceBatchNo != "" && strings.TrimSpace(stock.BatchNo) != requiredSourceBatchNo {
-		return "ICCID不属于指定库存批次，不能出库"
+		reasons = append(reasons, "ICCID不属于指定库存批次，不能出库")
 	}
 	if formalExists {
-		return "ICCID已存在正式卡记录，不能出库"
+		reasons = append(reasons, "ICCID已存在正式卡记录，不能出库")
 	}
 	if strictStockIdentity {
 		if strings.TrimSpace(row.Msisdn) != strings.TrimSpace(stock.Msisdn) {
-			return "MSISDN与库存记录不一致，不能出库"
+			reasons = append(reasons, "MSISDN与库存记录不一致，不能出库")
 		}
 		if strings.TrimSpace(row.Imsi) != strings.TrimSpace(stock.Imsi) {
-			return "IMSI与库存记录不一致，不能出库"
+			reasons = append(reasons, "IMSI与库存记录不一致，不能出库")
 		}
 	}
-	return ""
+	return strings.Join(reasons, "；")
 }
 
 func hasInvalidRows(rows []*Row) bool {
@@ -364,7 +396,7 @@ func hasInvalidRows(rows []*Row) bool {
 func markRemainingRowsSkipped(rows []*Row) {
 	for _, row := range rows {
 		if row != nil && row.Reason == "" {
-			row.AddReason("同批存在不满足出库条件的卡，本行未执行")
+			row.AddReason(outboundNotExecutedReason)
 		}
 	}
 }