From 801bbe49706a6ef6df3b47c99468bdd05a0ddbc4 Mon Sep 17 00:00:00 2001
From: wenjinbo <599483010@qq.com>
Date: Wed, 17 Sep 2025 14:38:00 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=87=E4=BB=B6=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=9C=A8Dify=E8=A7=A3=E6=9E=90=E6=88=90=E5=8A=9F=E5=90=8E?=
 =?UTF-8?q?=EF=BC=8C=E5=9C=A8es=E6=9E=84=E5=BB=BA=E7=B4=A2=E5=BC=95?=
 =?UTF-8?q?=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../datasets/components/DocumentList.vue      |  7 +++++--
 .../mapper/opengauss/TDatasetFilesMapper.java |  2 ++
 .../dify/impl/DifyDatasetApiServiceImpl.java  |  6 ++++--
 .../task/IndexingStatusTaskService.java       | 20 ++++++++++++++++++-
 4 files changed, 30 insertions(+), 5 deletions(-)

diff --git a/chat-client/src/views/datasets/components/DocumentList.vue b/chat-client/src/views/datasets/components/DocumentList.vue
index 7cb17ce..8e0677a 100644
--- a/chat-client/src/views/datasets/components/DocumentList.vue
+++ b/chat-client/src/views/datasets/components/DocumentList.vue
@@ -119,10 +119,10 @@
                       <template v-if="row.type === 'file'">
                           <el-tag 
                               :type="getStatusTagType(row.status)"
-                              :class="{ 'rotating-tag': ['preprocessing', 'indexing', 'waiting'].includes(row.status) }"
+                              :class="{ 'rotating-tag': ['preprocessing', 'indexing', 'waiting', 'queued'].includes(row.status) }"
                           >
                               <el-icon 
-                                  :class="{ 'is-loading': ['preprocessing', 'indexing', 'waiting'].includes(row.status) }"
+                                  :class="{ 'is-loading': ['preprocessing', 'indexing', 'waiting', 'queued'].includes(row.status) }"
                               >
                                   <component :is="getStatusIcon(row.status)" />
                               </el-icon>
@@ -975,6 +975,7 @@ const statusMap: Record<string, string> = {
   'preprocessing': '预处理',
   'indexing': '解析中',
   'waiting': '等待中',
+  'queued': '排队中',
   'failed': '解析失败',
   'completed': '解析成功'
 }
@@ -987,6 +988,7 @@ const typeMap: Record<string, 'success' | 'primary' | 'warning' | 'info' | 'dang
   'preprocessing': 'info',
   'indexing': 'warning', 
   'waiting': 'info',
+  'queued': 'primary',
   'failed': 'danger',
   'completed': 'success'
 }
@@ -999,6 +1001,7 @@ const iconMap: Record<string, any> = {
   'preprocessing': Loading,
   'indexing': Loading,
   'waiting': Loading,
+  'queued': Loading,
   'failed': Close,
   'completed': Check
 }
diff --git a/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.java b/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.java
index 8e4bb84..dcfdaf3 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.java
@@ -181,4 +181,6 @@ public interface TDatasetFilesMapper {
      */
     List<TDatasetFiles> selectAll();
 
+
+
 } 
\ No newline at end of file
diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java
index 2ba02d2..cca2be7 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/service/dify/impl/DifyDatasetApiServiceImpl.java
@@ -232,7 +232,10 @@ public class DifyDatasetApiServiceImpl implements DifyDatasetApiService {
         String batch= (String) res.getBody().get("batch");
         String documentId = document.get("id");
         logger.info("获取文档ID完成: {}, 耗时: {} ms", documentId, System.currentTimeMillis() - stepStartTime);
-        
+
+
+
+
         // 8. 记录文件信息到助手服务数据库
         stepStartTime = System.currentTimeMillis();
         TDatasetFiles datasetFiles = new TDatasetFiles();
@@ -262,7 +265,6 @@ public class DifyDatasetApiServiceImpl implements DifyDatasetApiService {
         indexingTask.setFileName(file.getOriginalFilename());
         indexingTaskQueueService.addTaskToQueue(indexingTask);
         logger.info("文档任务已加入Redis队列，耗时: {} ms", System.currentTimeMillis() - stepStartTime);
-
         long totalTime = System.currentTimeMillis() - startTime;
         logger.info("文档上传处理全部完成，总耗时: {} ms，文件: {}", totalTime, originalFilename);
 
diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/task/IndexingStatusTaskService.java b/chat-server/src/main/java/com/bjtds/brichat/service/task/IndexingStatusTaskService.java
index 01e566c..668a232 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/service/task/IndexingStatusTaskService.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/service/task/IndexingStatusTaskService.java
@@ -5,6 +5,7 @@ import com.bjtds.brichat.entity.dto.IndexingTaskDto;
 import com.bjtds.brichat.enums.IndexingStatusEnum;
 import com.bjtds.brichat.mapper.postgresql.DifyDatasetsDocMapper;
 import com.bjtds.brichat.service.DatasetFilesService;
+import com.bjtds.brichat.service.EsKnowledgeService;
 import com.bjtds.brichat.service.IndexingTaskQueueService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +13,7 @@ import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.io.IOException;
 import java.util.List;
 
 /**
@@ -32,6 +34,9 @@ public class IndexingStatusTaskService {
 
     @Resource
     private DifyDatasetsDocMapper difyDatasetsDocMapper;
+
+    @Resource
+    private EsKnowledgeService esKnowledgeService;
     
     /**
      * 定时任务：每1秒检查一次文档索引状态
@@ -66,7 +71,7 @@ public class IndexingStatusTaskService {
     /**
      * 检查单个任务的状态
      */
-    private void checkSingleTaskStatus(IndexingTaskDto task) {
+    private void checkSingleTaskStatus(IndexingTaskDto task) throws IOException {
         try {
             logger.debug("检查任务状态: documentId={}, 当前状态={}", 
                         task.getDocumentId(), task.getCurrentStatus());
@@ -92,6 +97,19 @@ public class IndexingStatusTaskService {
             if (statusEnum != null && statusEnum.isFinalStatus()) {
                 indexingTaskQueueService.removeTaskFromQueue(task.getDocumentId());
                 logger.info("文档{}已达到最终状态{}，从队列中移除", task.getDocumentId(), newStatus);
+
+
+                //添加索引到ES
+                esKnowledgeService.createIndex(task.getDocumentId());
+                //修改文件状态
+                TDatasetFiles file = datasetFilesService.getFileById(task.getFileId());
+                if (file != null) {
+                    file.setIsEs(true);
+                    datasetFilesService.updateFile(file);
+                }
+                logger.info("文档{}解析完成,已添加索引到ES中", task.getDocumentId());
+
+
             } else {
                 // 更新任务信息
                 task.setCurrentStatus(newStatus);