Browse Source

bug修复

master
luogw 1 month ago
parent
commit
c8726ad244
  1. 2
      src/main/java/com/project/information/application/KnowledgePointApplicationService.java
  2. 5
      src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java
  3. 5
      src/main/java/com/project/information/domain/service/impl/UploadInformationDomainServiceImpl.java

2
src/main/java/com/project/information/application/KnowledgePointApplicationService.java

@ -8,5 +8,5 @@ import java.util.Map;
public interface KnowledgePointApplicationService { public interface KnowledgePointApplicationService {
Result<KnowledgePointStatisticsDTO> getStatistics(Long subLineId) throws Exception; Result<KnowledgePointStatisticsDTO> getStatistics(Long subLineId) throws Exception;
void parse(Map<Long, String> fileMap); void parse(Map<Long, String> fileMap,Map<Long, String> fileNameMa);
} }

5
src/main/java/com/project/information/application/impl/KnowledgePointApplicationServiceImpl.java

@ -73,15 +73,16 @@ public class KnowledgePointApplicationServiceImpl implements KnowledgePointAppli
@Override @Override
@Async("asycExecutor") @Async("asycExecutor")
public void parse(Map<Long, String> fileIdPathMap) { public void parse(Map<Long, String> fileIdPathMap,Map<Long, String> fileNameMap) {
for (Map.Entry<Long, String> entry : fileIdPathMap.entrySet()) { for (Map.Entry<Long, String> entry : fileIdPathMap.entrySet()) {
Long id = entry.getKey(); Long id = entry.getKey();
String path = entry.getValue(); String path = entry.getValue();
String filename = fileNameMap.get(id);
try { try {
// 从 MinIO 获取流再发给 Python // 从 MinIO 获取流再发给 Python
try (InputStream inputStream = minIoUtils.getObject(path)) { try (InputStream inputStream = minIoUtils.getObject(path)) {
uploadToPython(inputStream, path , id); uploadToPython(inputStream, filename , id);
} }
// 成功后更新状态 // 成功后更新状态
updateStatusInformation(null, InformationParseStatusEnum.InProgress.getValue(), id); updateStatusInformation(null, InformationParseStatusEnum.InProgress.getValue(), id);

5
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.FileUtil;
import cn.hutool.core.io.file.FileNameUtil; import cn.hutool.core.io.file.FileNameUtil;
import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.IdUtil;
import cn.hutool.db.handler.StringHandler;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.project.base.config.CustomIdGenerator; import com.project.base.config.CustomIdGenerator;
import com.project.base.domain.exception.BusinessErrorException; import com.project.base.domain.exception.BusinessErrorException;
@ -109,6 +110,7 @@ public class UploadInformationDomainServiceImpl implements UploadInformationDoma
List<String> successFiles = new ArrayList<>(); List<String> successFiles = new ArrayList<>();
Map<Long, String> fileMap = new HashMap<>(); Map<Long, String> fileMap = new HashMap<>();
Map<Long, String> fileNameMap = new HashMap<>();
for (MultipartFile file : files) { for (MultipartFile file : files) {
String fileName = file.getOriginalFilename(); String fileName = file.getOriginalFilename();
@ -142,10 +144,11 @@ public class UploadInformationDomainServiceImpl implements UploadInformationDoma
//收集file //收集file
fileMap.put(entity.getId(), filePath); 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))); return Result.success(String.format("上传成功:【%s】" , String.join("," , successFiles)));

Loading…
Cancel
Save