diff --git a/src/main/java/com/project/information/application/KnowledgePointApplicationService.java b/src/main/java/com/project/information/application/KnowledgePointApplicationService.java index e01244d..ac82b70 100644 --- a/src/main/java/com/project/information/application/KnowledgePointApplicationService.java +++ b/src/main/java/com/project/information/application/KnowledgePointApplicationService.java @@ -8,5 +8,5 @@ import java.util.Map; public interface KnowledgePointApplicationService { Result getStatistics(Long subLineId) throws Exception; - void parse(Map fileMap); + void parse(Map fileMap,Map fileNameMa); } diff --git a/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java b/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java index ba92427..d3c94bd 100644 --- a/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java +++ b/src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java @@ -73,15 +73,16 @@ public class KnowledgePointApplicationServiceImpl implements KnowledgePointAppli @Override @Async("asycExecutor") - public void parse(Map fileIdPathMap) { + public void parse(Map fileIdPathMap,Map fileNameMap) { for (Map.Entry entry : fileIdPathMap.entrySet()) { Long id = entry.getKey(); String path = entry.getValue(); + String filename = fileNameMap.get(id); try { // 从 MinIO 获取流再发给 Python try (InputStream inputStream = minIoUtils.getObject(path)) { - uploadToPython(inputStream, path , id); + uploadToPython(inputStream, filename , id); } // 成功后更新状态 updateStatusInformation(null, InformationParseStatusEnum.InProgress.getValue(), id); diff --git a/src/main/java/com/project/information/domain/service/impl/UploadInformationDomainServiceImpl.java b/src/main/java/com/project/information/domain/service/impl/UploadInformationDomainServiceImpl.java index 22fedbb..5452bc9 100644 --- a/src/main/java/com/project/information/domain/service/impl/UploadInformationDomainServiceImpl.java +++ b/src/main/java/com/project/information/domain/service/impl/UploadInformationDomainServiceImpl.java @@ -5,6 +5,7 @@ import cn.hutool.core.date.DateUtil; import cn.hutool.core.io.FileUtil; import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.util.IdUtil; +import cn.hutool.db.handler.StringHandler; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.project.base.config.CustomIdGenerator; import com.project.base.domain.exception.BusinessErrorException; @@ -109,6 +110,7 @@ public class UploadInformationDomainServiceImpl implements UploadInformationDoma List successFiles = new ArrayList<>(); Map fileMap = new HashMap<>(); + Map fileNameMap = new HashMap<>(); for (MultipartFile file : files) { String fileName = file.getOriginalFilename(); @@ -142,10 +144,11 @@ public class UploadInformationDomainServiceImpl implements UploadInformationDoma //收集file fileMap.put(entity.getId(), filePath); + fileNameMap.put(entity.getId(), fileName); } //发起解析文档知识点 - knowledgePointApplicationService.parse(fileMap); + knowledgePointApplicationService.parse(fileMap,fileNameMap); return Result.success(String.format("上传成功:【%s】" , String.join("," , successFiles)));