diff --git a/electrmangnetic/pom.xml b/electrmangnetic/pom.xml index 8c1d21a..c598d41 100644 --- a/electrmangnetic/pom.xml +++ b/electrmangnetic/pom.xml @@ -47,10 +47,6 @@ org.springframework.ai spring-ai-starter-vector-store-mariadb - - org.springframework.ai - spring-ai-pdf-document-reader - com.baomidou mybatis-plus-spring-boot3-starter diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java index b2f9d42..e5c9c7c 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java @@ -1,8 +1,8 @@ package com.electromagnetic.industry.software.manage.service.serviceimpl; import cn.hutool.core.io.FileUtil; +import cn.hutool.core.io.IoUtil; import cn.hutool.core.text.StrFormatter; -import cn.hutool.core.util.IdUtil; import cn.hutool.core.util.StrUtil; import cn.hutool.crypto.digest.DigestUtil; import com.baomidou.mybatisplus.core.toolkit.Wrappers; @@ -26,10 +26,8 @@ import org.springframework.ai.chat.messages.UserMessage; import org.springframework.ai.chat.model.ChatResponse; import org.springframework.ai.chat.prompt.Prompt; import org.springframework.ai.document.Document; -import org.springframework.ai.document.DocumentReader; import org.springframework.ai.ollama.OllamaChatModel; import org.springframework.ai.ollama.api.OllamaOptions; -import org.springframework.ai.reader.TextReader; import org.springframework.ai.transformer.splitter.TokenTextSplitter; import org.springframework.ai.vectorstore.SearchRequest; import org.springframework.ai.vectorstore.VectorStore; @@ -40,8 +38,6 @@ import reactor.core.publisher.Flux; import java.io.File; import java.nio.charset.Charset; -import java.nio.file.Path; -import java.nio.file.Paths; import java.util.*; @Slf4j @@ -107,12 +103,8 @@ public class ChatService { List documents = new ArrayList<>(); switch (Objects.requireNonNull(fileType)) { case "txt", "csv", "text" -> { - String tmpPath = elePropertyConfig.getEleTmpPath() + File.separator + IdUtil.fastSimpleUUID() + "." + fileType; - FileUtil.writeFromStream(file.getInputStream(), tmpPath); - Path tempFile = Paths.get(tmpPath); - DocumentReader documentReader = new TextReader(String.valueOf(tempFile.toUri().toURL())); - documents = documentReader.get(); - FileUtil.del(tempFile); + String content = IoUtil.read(file.getInputStream(), Charset.defaultCharset()); + documents.add(new Document(content)); } case "xls", "xlsx" -> { String filePath = elePropertyConfig.getEleTmpPath() + File.separator + fileMd5 + "." + fileType;