更新

internal/service/iot_card/audit.go

@@ -3,8 +3,8 @@ package iot_card
 import (
 	"context"
 
-	assetAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_audit"
 	"github.com/break/junhong_cmp_fiber/internal/model"
+	assetAuditSvc "github.com/break/junhong_cmp_fiber/internal/service/asset_audit"
 	"github.com/break/junhong_cmp_fiber/pkg/constants"
 )
 
@@ -23,6 +23,7 @@ func (s *Service) logCardAudit(ctx context.Context, p assetAuditSvc.BuildLogPara
 	if p.AssetType == "" {
 		p.AssetType = constants.AssetTypeIotCard
 	}
+	p.BeforeData, p.AfterData = normalizeCardAuditPayload(p.BeforeData, p.AfterData)
 	s.assetAuditService.LogOperation(ctx, assetAuditSvc.BuildLog(ctx, p))
 }
 
@@ -36,23 +37,58 @@ func (s *StopResumeService) logCardAudit(ctx context.Context, p assetAuditSvc.Bu
 	if p.AssetType == "" {
 		p.AssetType = constants.AssetTypeIotCard
 	}
+	p.BeforeData, p.AfterData = normalizeCardAuditPayload(p.BeforeData, p.AfterData)
 	s.assetAuditService.LogOperation(ctx, assetAuditSvc.BuildLog(ctx, p))
 }
 
+func normalizeCardAuditPayload(beforeData, afterData map[string]any) (map[string]any, map[string]any) {
+	snapshot := map[string]any(nil)
+	if raw, ok := beforeData["card"]; ok {
+		if m, ok := raw.(map[string]any); ok {
+			snapshot = m
+		}
+	}
+	if snapshot == nil {
+		if raw, ok := afterData["card"]; ok {
+			if m, ok := raw.(map[string]any); ok {
+				snapshot = m
+			}
+		}
+	}
+	return assetAuditSvc.WrapOperationContent(stripCardOperationMeta(beforeData), stripCardOperationMeta(afterData), snapshot)
+}
+
+func stripCardOperationMeta(data map[string]any) map[string]any {
+	if len(data) == 0 {
+		return nil
+	}
+	out := make(map[string]any, len(data))
+	for k, v := range data {
+		if k == "device" || k == "card" || k == "cards" || k == "asset_snapshot" || k == "operation_content" {
+			continue
+		}
+		out[k] = v
+	}
+	if len(out) == 0 {
+		return nil
+	}
+	return out
+}
+
 func cardSnapshot(card *model.IotCard) map[string]any {
 	if card == nil {
 		return nil
 	}
 	return map[string]any{
-		"id":              card.ID,
-		"iccid":           card.ICCID,
-		"shop_id":         card.ShopID,
-		"status":          card.Status,
-		"series_id":       card.SeriesID,
-		"enable_polling":  card.EnablePolling,
-		"realname_policy": card.RealnamePolicy,
+		"id":               card.ID,
+		"iccid":            card.ICCID,
+		"shop_id":          card.ShopID,
+		"status":           card.Status,
+		"series_id":        card.SeriesID,
+		"enable_polling":   card.EnablePolling,
+		"realname_policy":  card.RealnamePolicy,
 		"real_name_status": card.RealNameStatus,
-		"network_status":  card.NetworkStatus,
-		"stop_reason":     card.StopReason,
+		"network_status":   card.NetworkStatus,
+		"stop_reason":      card.StopReason,
 	}
 }