fix

internal/application/product/ui_component_application_service.go

@@ -7,11 +7,13 @@ import (
 	"mime/multipart"
 	"path/filepath"
 	"strings"
+	"time"
 
 	"tyapi-server/internal/domains/product/entities"
 	"tyapi-server/internal/domains/product/repositories"
 
 	"github.com/shopspring/decimal"
+	"go.uber.org/zap"
 )
 
 // UIComponentApplicationService UI组件应用服务接口
@@ -93,6 +95,7 @@ type UIComponentApplicationServiceImpl struct {
 	productUIComponentRepo repositories.ProductUIComponentRepository
 	fileStorageService     FileStorageService
 	fileService            UIComponentFileService
+	logger                 *zap.Logger
 }
 
 // FileStorageService 文件存储服务接口
@@ -108,12 +111,14 @@ func NewUIComponentApplicationService(
 	productUIComponentRepo repositories.ProductUIComponentRepository,
 	fileStorageService FileStorageService,
 	fileService UIComponentFileService,
+	logger *zap.Logger,
 ) UIComponentApplicationService {
 	return &UIComponentApplicationServiceImpl{
 		uiComponentRepo:        uiComponentRepo,
 		productUIComponentRepo: productUIComponentRepo,
 		fileStorageService:     fileStorageService,
 		fileService:            fileService,
+		logger:                 logger,
 	}
 }
 
@@ -186,6 +191,10 @@ func (s *UIComponentApplicationServiceImpl) CreateUIComponentWithFile(ctx contex
 		createdComponent.FolderPath = &folderPath
 		createdComponent.FileType = &fileType
 
+		// 记录文件上传时间
+		now := time.Now()
+		createdComponent.FileUploadTime = &now
+
 		// 仅对ZIP文件设置已解压标记
 		if fileType == ".zip" {
 			createdComponent.IsExtracted = true
@@ -258,6 +267,10 @@ func (s *UIComponentApplicationServiceImpl) CreateUIComponentWithFiles(ctx conte
 		folderPath := "resources/Pure_Component/src/ui"
 		createdComponent.FolderPath = &folderPath
 
+		// 记录文件上传时间
+		now := time.Now()
+		createdComponent.FileUploadTime = &now
+
 		// 检查是否有ZIP文件
 		hasZipFile := false
 		for _, fileHeader := range files {
@@ -366,6 +379,10 @@ func (s *UIComponentApplicationServiceImpl) CreateUIComponentWithFilesAndPaths(c
 		folderPath := "resources/Pure_Component/src/ui"
 		createdComponent.FolderPath = &folderPath
 
+		// 记录文件上传时间
+		now := time.Now()
+		createdComponent.FileUploadTime = &now
+
 		// 检查是否有ZIP文件
 		hasZipFile := false
 		for _, fileHeader := range files {
@@ -450,11 +467,18 @@ func (s *UIComponentApplicationServiceImpl) DeleteUIComponent(ctx context.Contex
 		return ErrComponentNotFound
 	}
 
-	// 删除关联的文件
+	// 使用智能删除方法，根据组件编码和上传时间删除相关文件
+	if err := s.fileService.DeleteFilesByComponentCode(component.ComponentCode, component.FileUploadTime); err != nil {
+		// 记录错误但不阻止删除数据库记录
+		s.logger.Error("删除组件文件失败", zap.Error(err), zap.String("componentCode", component.ComponentCode))
+	}
+
+	// 删除关联的文件(FilePath指向的文件)
 	if component.FilePath != nil {
 		_ = s.fileStorageService.DeleteFile(ctx, *component.FilePath)
 	}
 
+	// 删除数据库记录
 	return s.uiComponentRepo.Delete(ctx, id)
 }
 
@@ -638,6 +662,10 @@ func (s *UIComponentApplicationServiceImpl) UploadAndExtractUIComponentFile(ctx
 	component.FolderPath = &folderPath
 	component.FileType = &fileType
 
+	// 记录文件上传时间
+	now := time.Now()
+	component.FileUploadTime = &now
+
 	// 仅对ZIP文件设置已解压标记
 	if fileType == ".zip" {
 		component.IsExtracted = true