智能助手bug修正

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.airag.app.entity.QuestionEmbedding;
 import org.jeecg.modules.airag.app.entity.QuestionEmbedding;
 
 
 import java.util.List;
 import java.util.List;

@@ -116,7 +116,9 @@ public class QuestionEmbeddingServiceImpl implements IQuestionEmbeddingService {
     @Override
     @Override
     public List<QuestionEmbedding> similaritySearchByQuestion(String question, int limit, Double minSimilarity, AiragChatsetting chatSetting) {
     public List<QuestionEmbedding> similaritySearchByQuestion(String question, int limit, Double minSimilarity, AiragChatsetting chatSetting) {
         Response<Embedding> embedding = aiModelUtils.getEmbedding(chatSetting.getEmbeddingId(), question);
         Response<Embedding> embedding = aiModelUtils.getEmbedding(chatSetting.getEmbeddingId(), question);
-        return questionEmbeddingMapper.similaritySearchByQuestion(embedding.content().vector(), limit, minSimilarity);
+
+
+        return  questionEmbeddingMapper.similaritySearchByQuestion(embedding.content().vector(), limit, 1-minSimilarity);
     }
     }
 
 
     @Override
     @Override

@@ -133,6 +133,11 @@ public class AiragResponseServiceImpl implements AiragResponseService {
      * @param emitter 流式返回
      * @param emitter 流式返回
      * @param questionEmbedding 问题向量
      * @param questionEmbedding 问题向量
      */
      */
+    /**
+     * 发送token
+     * @param emitter 流式返回
+     * @param questionEmbedding 问题向量
+     */
     private void sendQuestionEmbeddingResponse(SseEmitter emitter, QuestionEmbedding questionEmbedding) throws Exception {
     private void sendQuestionEmbeddingResponse(SseEmitter emitter, QuestionEmbedding questionEmbedding) throws Exception {
         ObjectMapper objectMapper = new ObjectMapper();
         ObjectMapper objectMapper = new ObjectMapper();
 
 
@@ -141,8 +146,11 @@ public class AiragResponseServiceImpl implements AiragResponseService {
         data.put("token", questionEmbedding.getAnswer());
         data.put("token", questionEmbedding.getAnswer());
         emitter.send(SseEmitter.event().data(objectMapper.writeValueAsString(data)));
         emitter.send(SseEmitter.event().data(objectMapper.writeValueAsString(data)));
 
 
-        // 发送END事件
-        Map<String, String> endData = createEndData(objectMapper.writeValueAsString(questionEmbedding.getMetadata()), String.valueOf(questionEmbedding.getSimilarity()));
+        // 发送END事件（改为直接传Map）
+        Map<String, String> endData = createEndData(
+                questionEmbedding.getMetadata(),
+                String.valueOf(1 - questionEmbedding.getSimilarity())
+        );
         emitter.send(SseEmitter.event().data(objectMapper.writeValueAsString(endData)));
         emitter.send(SseEmitter.event().data(objectMapper.writeValueAsString(endData)));
         emitter.complete();
         emitter.complete();
     }
     }
@@ -258,9 +266,27 @@ public class AiragResponseServiceImpl implements AiragResponseService {
      * @param fileName 文件名称
      * @param fileName 文件名称
      * @param storedFileName 本地存储文件名称
      * @param storedFileName 本地存储文件名称
      */
      */
-    private void processLLMResponse(SseEmitter emitter, AiragLog logRecord, String modelId, 
-                                  String systemPrompt, String userPrompt, 
-                                  Map<String, Object> firstMatch, String fileName, String storedFileName) {
+    /**
+     * 对llm模型进行提问
+     * @param emitter 流式返回
+     * @param logRecord 日志对象
+     * @param modelId 模型id
+     * @param systemPrompt 系统提示词
+     * @param userPrompt 用户提示词
+     * @param firstMatch 最相似的数据
+     * @param fileName 文件名称
+     * @param storedFileName 本地存储文件名称
+     */
+    private void processLLMResponse(
+            SseEmitter emitter,
+            AiragLog logRecord,
+            String modelId,
+            String systemPrompt,
+            String userPrompt,
+            Map<String, Object> firstMatch,
+            String fileName,
+            String storedFileName
+    ) {
         StringBuilder answerBuilder = new StringBuilder();
         StringBuilder answerBuilder = new StringBuilder();
         List<ChatMessage> messages = new ArrayList<>();
         List<ChatMessage> messages = new ArrayList<>();
         messages.add(new SystemMessage(systemPrompt));
         messages.add(new SystemMessage(systemPrompt));
@@ -281,8 +307,14 @@ public class AiragResponseServiceImpl implements AiragResponseService {
 
 
         tokenStream.onComplete(response -> {
         tokenStream.onComplete(response -> {
             try {
             try {
-                Map<String, String> endData = createEndData(firstMatch.get("metadata").toString(), 
-                        firstMatch.get("score").toString());
+                // 把metadata先转成Map
+                ObjectMapper objectMapper = new ObjectMapper();
+                Map<String, Object> metadata = objectMapper.readValue(firstMatch.get("metadata").toString(), Map.class);
+
+                Map<String, String> endData = createEndData(
+                        metadata,
+                        firstMatch.get("score").toString()
+                );
                 endData.put("fileName", fileName);
                 endData.put("fileName", fileName);
                 endData.put("fileBase64", FileToBase64Util.fileToBase64(uploadPath + storedFileName));
                 endData.put("fileBase64", FileToBase64Util.fileToBase64(uploadPath + storedFileName));
 
 
@@ -305,23 +337,27 @@ public class AiragResponseServiceImpl implements AiragResponseService {
         tokenStream.start();
         tokenStream.start();
     }
     }
 
 
+
     /**
     /**
      * 创建结束标志，发送结束token
      * 创建结束标志，发送结束token
      * @param metadataJson 元数据
      * @param metadataJson 元数据
      * @param similarity 相似度
      * @param similarity 相似度
      */
      */
-    private Map<String, String> createEndData(String metadataJson, String similarity) throws IOException {
+    /**
+     * 创建结束标志，发送结束token
+     * @param metadata 元数据（直接Map）
+     * @param similarity 相似度
+     */
+    private Map<String, String> createEndData(Map<String, Object> metadata, String similarity) throws IOException {
         Map<String, String> endData = new HashMap<>();
         Map<String, String> endData = new HashMap<>();
         endData.put("event", "END");
         endData.put("event", "END");
         endData.put("similarity", similarity);
         endData.put("similarity", similarity);
 
 
-        if (StringUtils.isNotBlank(metadataJson)) {
-            ObjectMapper objectMapper = new ObjectMapper();
-            Map<String, String> metadata = objectMapper.readValue(metadataJson, Map.class);
-            String docName = metadata.get("docName");
+        if (metadata != null && !metadata.isEmpty()) {
+            String docName = metadata.get("docName").toString();
             endData.put("fileName", docName);
             endData.put("fileName", docName);
 
 
-            String fileName = generateFilePath(metadataJson);
+            String fileName = metadata.get("storedFileName").toString();
             if (StringUtils.isNotBlank(fileName)) {
             if (StringUtils.isNotBlank(fileName)) {
                 endData.put("fileBase64", FileToBase64Util.fileToBase64(uploadPath + fileName));
                 endData.put("fileBase64", FileToBase64Util.fileToBase64(uploadPath + fileName));
             }
             }