From 095efe428ae2743386cb6f04656664e2e7fa2b1f Mon Sep 17 00:00:00 2001 From: chenxudong Date: Tue, 8 Apr 2025 11:58:52 +0800 Subject: [PATCH] refacotr code --- .../manage/pojo/models/AiQuestionRecord.java | 2 +- .../manage/service/serviceimpl/ChatService.java | 13 +++---------- .../service/serviceimpl/FileFormatServiceImpl.java | 1 - .../src/main/resources/application.properties | 1 - electrmangnetic/src/test/java/Test1.java | 8 ++++---- .../industry/software/common/pojo/PageFile.java | 6 +++--- 6 files changed, 11 insertions(+), 20 deletions(-) diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java index 1a09428..8ac1bf3 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/pojo/models/AiQuestionRecord.java @@ -10,7 +10,7 @@ import lombok.experimental.Accessors; @TableName(value = "ai_question_record") @Data @Accessors(chain = true) -public class AiQuestionRecord extends BaseModel{ +public class AiQuestionRecord extends BaseModel { private String id; 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 29187ba..dcae7a1 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 @@ -26,6 +26,7 @@ import org.springframework.ai.chat.client.ChatClient; import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor; import org.springframework.ai.chat.client.advisor.QuestionAnswerAdvisor; 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; @@ -35,7 +36,6 @@ import org.springframework.ai.reader.TextReader; import org.springframework.ai.reader.pdf.PagePdfDocumentReader; import org.springframework.ai.transformer.splitter.TokenTextSplitter; import org.springframework.ai.vectorstore.VectorStore; -import org.springframework.ai.chat.model.ChatResponse; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; @@ -52,32 +52,25 @@ import java.util.stream.Collectors; @Service public class ChatService { + private static final List ALLOWS_FILE_TYPES = List.of("doc", "docx", "txt", "csv", "xls", "xlsx", "pdf", "ppt", "pptx"); @Resource private VectorStore vectorStore; - @Resource private OllamaChatModel model; - @Resource private MessageChatMemoryAdvisor messageChatMemoryAdvisor; - @Resource private QuestionAnswerAdvisor questionAnswerAdvisor; - @Resource private AiFileUploadRecordMapper aiFileUploadRecordMapper; - @Resource private AiQuestionRecordMapper aiQuestionRecordMapper; - @Resource private ElePropertyConfig elePropertyConfig; - private static final List ALLOWS_FILE_TYPES = List.of("doc", "docx", "txt", "csv", "xls", "xlsx", "pdf", "ppt", "pptx"); - public ElectromagneticResult deleteDocument(List ids) { List vectorIds = aiFileUploadRecordMapper.selectList(Wrappers.lambdaQuery(AiFileUploadRecord.class) - .in(AiFileUploadRecord::getId, ids)) + .in(AiFileUploadRecord::getId, ids)) .stream() .map(AiFileUploadRecord::getVectorId) .collect(Collectors.toList()); diff --git a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java index 70a129b..4d7020d 100644 --- a/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java +++ b/electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/FileFormatServiceImpl.java @@ -15,7 +15,6 @@ import com.electromagnetic.industry.software.manage.service.FileFormatService; import org.springframework.stereotype.Service; import java.util.List; -import java.util.stream.Collectors; @Service public class FileFormatServiceImpl extends ServiceImpl implements FileFormatService { diff --git a/electrmangnetic/src/main/resources/application.properties b/electrmangnetic/src/main/resources/application.properties index 21cfb86..4822c69 100644 --- a/electrmangnetic/src/main/resources/application.properties +++ b/electrmangnetic/src/main/resources/application.properties @@ -10,7 +10,6 @@ spring.datasource.username=em_user_dev spring.datasource.password=Szsd#2O25$dev spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver spring.datasource.type=com.alibaba.druid.pool.DruidDataSource - # es spring.elasticsearch.password=123456 spring.elasticsearch.username=elastic diff --git a/electrmangnetic/src/test/java/Test1.java b/electrmangnetic/src/test/java/Test1.java index af8bc76..cd0032f 100644 --- a/electrmangnetic/src/test/java/Test1.java +++ b/electrmangnetic/src/test/java/Test1.java @@ -29,10 +29,10 @@ // documents = documents.subList(0, 200); // vectorStore.write(documents); // -//// Path tempFile = Paths.get(file.getAbsolutePath()); -//// DocumentReader documentReader = new TextReader(String.valueOf(tempFile.toUri().toURL())); -//// List documents = documentReader.get(); -//// vectorStore.write(documents); +/// / Path tempFile = Paths.get(file.getAbsolutePath()); +/// / DocumentReader documentReader = new TextReader(String.valueOf(tempFile.toUri().toURL())); +/// / List documents = documentReader.get(); +/// / vectorStore.write(documents); // } // //} diff --git a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/pojo/PageFile.java b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/pojo/PageFile.java index 9b0953c..16e49c9 100644 --- a/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/pojo/PageFile.java +++ b/electromagnetic-common/src/main/java/com/electromagnetic/industry/software/common/pojo/PageFile.java @@ -9,11 +9,11 @@ import lombok.NoArgsConstructor; @AllArgsConstructor public class PageFile { - private int pageNumber; + private int pageNumber; - private String content; + private String content; - private String fileName; + private String fileName; }