更新配置文件

electrmangnetic/pom.xml

@@ -41,11 +41,11 @@
         </dependency>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-elasticsearch-store-spring-boot-starter</artifactId>
+            <artifactId>spring-ai-starter-model-ollama</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.ai</groupId>
-            <artifactId>spring-ai-ollama-spring-boot-starter</artifactId>
+            <artifactId>spring-ai-starter-vector-store-mariadb</artifactId>
         </dependency>
         <dependency>
             <groupId>org.springframework.ai</groupId>
@@ -71,6 +71,7 @@
         <dependency>
             <groupId>org.mariadb.jdbc</groupId>
             <artifactId>mariadb-java-client</artifactId>
+            <version>3.5.1</version>
         </dependency>
         <dependency>
             <groupId>com.electromagnetic.data</groupId>

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/config/AiAdvisor.java

@@ -1,24 +1,13 @@
 package com.electromagnetic.industry.software.manage.config;
 
-import jakarta.annotation.Resource;
 import org.springframework.ai.chat.client.advisor.MessageChatMemoryAdvisor;
-import org.springframework.ai.chat.client.advisor.QuestionAnswerAdvisor;
 import org.springframework.ai.chat.memory.InMemoryChatMemory;
-import org.springframework.ai.vectorstore.VectorStore;
 import org.springframework.context.annotation.Bean;
 import org.springframework.stereotype.Component;
 
 @Component
 public class AiAdvisor {
 
-    @Resource
-    private VectorStore vectorStore;
-
-    @Bean
-    public QuestionAnswerAdvisor questionAnswerAdvisor() {
-        return new QuestionAnswerAdvisor(vectorStore);
-    }
-
     @Bean
     public MessageChatMemoryAdvisor messageChatMemoryAdvisor() {
         return new MessageChatMemoryAdvisor(new InMemoryChatMemory());

electrmangnetic/src/main/java/com/electromagnetic/industry/software/manage/service/serviceimpl/ChatService.java

@@ -24,7 +24,6 @@ import jakarta.annotation.Resource;
 import lombok.extern.slf4j.Slf4j;
 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;
@@ -56,29 +55,24 @@ public class ChatService {
     @Resource
     private MessageChatMemoryAdvisor messageChatMemoryAdvisor;
     @Resource
-    private QuestionAnswerAdvisor questionAnswerAdvisor;
-    @Resource
     private AiFileUploadRecordMapper aiFileUploadRecordMapper;
     @Resource
     private AiQuestionRecordMapper aiQuestionRecordMapper;
     @Resource
     private ElePropertyConfig elePropertyConfig;
 
-    public ElectromagneticResult<?> deleteDocument(List<String> ids) {
-        List<String> vectorIds = aiFileUploadRecordMapper.selectList(Wrappers.lambdaQuery(AiFileUploadRecord.class)
-                        .in(AiFileUploadRecord::getId, ids))
-                .stream()
-                .map(AiFileUploadRecord::getVectorId)
-                .toList();
-        Optional<Boolean> delete = vectorStore.delete(vectorIds);
-        if (null != delete && delete.isPresent() && delete.get()) {
-            aiFileUploadRecordMapper.update(Wrappers.lambdaUpdate(AiFileUploadRecord.class)
-                    .in(AiFileUploadRecord::getId, ids)
-                    .set(AiFileUploadRecord::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
-            return ElectromagneticResultUtil.success(true);
-        }
-        return ElectromagneticResultUtil.fail("-1", "删除失败。");
-    }
+//    public ElectromagneticResult<?> deleteDocument(List<String> ids) {
+//        List<String> vectorIds = aiFileUploadRecordMapper.selectList(Wrappers.lambdaQuery(AiFileUploadRecord.class)
+//                        .in(AiFileUploadRecord::getId, ids))
+//                .stream()
+//                .map(AiFileUploadRecord::getVectorId)
+//                .toList();
+//        vectorStore.delete(vectorIds);
+//        aiFileUploadRecordMapper.update(Wrappers.lambdaUpdate(AiFileUploadRecord.class)
+//                .in(AiFileUploadRecord::getId, ids)
+//                .set(AiFileUploadRecord::getEffectFlag, EffectFlagEnum.NOT_EFFECTIVE.code));
+//        return ElectromagneticResultUtil.success(true);
+//    }
 
     @Transactional(rollbackFor = Exception.class)
     public ElectromagneticResult<?> addFromUpload(MultipartFile file) throws Exception {
@@ -172,15 +166,17 @@ public class ChatService {
         UserThreadLocal.set(userLoginInfo);
         aiQuestionRecordMapper.insert(record);
         UserThreadLocal.remove();
+        List<Document> documents = vectorStore.similaritySearch(queryDTO.getMsg());
+        String augmentedPrompt = "基于以下信息回答：" + documents + "\n\n" + queryDTO.getMsg();
         return ChatClient.builder(model)
                 .defaultSystem("必须用中文回答")
-                .defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor)
+                .defaultAdvisors(messageChatMemoryAdvisor)
                 .defaultOptions(OllamaOptions
                         .builder()
                         .temperature(0.3)
                         .build())
                 .build()
-                .prompt(queryDTO.getMsg())
+                .prompt(augmentedPrompt)
                 .stream()
                 .content();
     }
@@ -192,15 +188,17 @@ public class ChatService {
         UserThreadLocal.set(userLoginInfo);
         aiQuestionRecordMapper.insert(record);
         UserThreadLocal.remove();
+        List<Document> documents = vectorStore.similaritySearch(queryDTO.getMsg());
+        String augmentedPrompt = "基于以下信息回答：" + documents + "\n\n" + queryDTO.getMsg();
         return ChatClient.builder(model)
                 .defaultSystem("必须用中文回答")
-                .defaultAdvisors(messageChatMemoryAdvisor, questionAnswerAdvisor)
+                .defaultAdvisors(messageChatMemoryAdvisor)
                 .defaultOptions(OllamaOptions
                         .builder()
                         .temperature(0.3)
                         .build())
                 .build()
-                .prompt(new Prompt(new UserMessage(queryDTO.getMsg())))
+                .prompt(new Prompt(new UserMessage(augmentedPrompt)))
                 .stream()
                 .chatResponse();
     }

electrmangnetic/src/main/resources/application.properties

@@ -5,27 +5,21 @@ spring.servlet.multipart.max-file-size=500MB
 spring.servlet.multipart.max-request-size=500MB
 spring.mvc.async.request-timeout=3600000
 #mysql
-spring.datasource.url=jdbc:mariadb://139.196.179.195:3306/em_data_dev?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&sslModel=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
+spring.datasource.url=jdbc:mariadb://139.196.179.195:3506/em_data_dev?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&sslModel=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
 spring.datasource.driver-class-name=org.mariadb.jdbc.Driver
-#spring.datasource.url=jdbc:mysql://139.196.179.195:3306/em_data_dev?serverTimezone=UTC&useUnicode=true&characterEncoding=utf-8&useSSL=true&serverTimezone=GMT%2B8&allowMultiQueries=true&rewriteBatchedStatements=true
-#spring.datasource.driver-class-name=com.mysql.cj.jdbc.Driver
 spring.datasource.username=em_user_dev
 spring.datasource.password=123456
 spring.datasource.type=com.alibaba.druid.pool.DruidDataSource
-# es
-spring.elasticsearch.password=123456
-spring.elasticsearch.username=elastic
-spring.elasticsearch.uris=http://139.196.179.195:9200
 #ai
 spring.ai.ollama.base-url=http://localhost:11434
 spring.ai.ollama.chat.options.model=gemma3:latest
 spring.ai.ollama.chat.options.num-g-p-u=1
-spring.ai.ollama.embedding.enabled=true
-spring.ai.ollama.embedding.model=nomic-embed-text
-spring.ai.vectorstore.elasticsearch.initialize-schema=true
-spring.ai.vectorstore.elasticsearch.index-name=rag
-spring.ai.vectorstore.elasticsearch.dimensions=768
-spring.ai.vectorstore.elasticsearch.similarity=cosine
+spring.ai.ollama.embedding.options.internal-tool-execution-enabled=true
+spring.ai.ollama.embedding.options.model=nomic-embed-text
+spring.ai.vectorstore.mariadb.initialize-schema=true
+spring.ai.vectorstore.mariadb.distance-type=COSINE
+spring.ai.vectorstore.mariadb.dimensions=1536
+spring.ai.vectorstore.mariadb.table-name=rag
 allow.upload.file.types=doc, docx, txt, csv, xls, xlsx, pdf, ppt, pptx
 # mybatis
 mybatis-plus.mapper-locations=classpath:sqlmapper/*.xml

pom.xml

@@ -20,7 +20,7 @@
         <maven.compiler.target>17</maven.compiler.target>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <spring.boot.version>3.3.8</spring.boot.version>
-        <spring.ai.version>1.0.0-M5</spring.ai.version>
+        <spring.ai.version>1.0.0-M7</spring.ai.version>
     </properties>
 
     <dependencyManagement>