索引名: {{ selectedIndex?.indexName || '-' }}
-
别名: {{ selectedIndex?.aliases?.join(', ') || '-' }}
+
别名: {{ selectedIndex?.databaseName || '-' }}
文档数量: {{ selectedIndex?.docsCount || '-' }}
存储大小: {{ selectedIndex?.storeSize || '-' }}
健康状态:
@@ -112,7 +115,7 @@
import { ref, reactive, onMounted } from "vue"
import { ElMessage, ElMessageBox } from "element-plus"
import { Plus, Delete } from "@element-plus/icons-vue"
-import { getIndexInfo, createAllIndex ,deleteIndex,setIndextask,getIndexTask} from "@/api/dataset"
+import { getIndexInfo, createAllIndex ,deleteIndex,setIndextask,getIndexTask,deleteAllIndex} from "@/api/dataset"
const isFullscreen = ref(false) //是否全屏
const tableLoading = ref(false)
@@ -151,6 +154,7 @@ const loadIndexList = async () => {
try {
const res = await getIndexInfo(pagination.currentPage, pagination.pageSize, searchForm.indexName)
+ console.log(res.data)
indexList.value = res.data.content
pagination.total = res.data.total
@@ -162,8 +166,14 @@ const loadIndexList = async () => {
}
}
-const formatAliases = (row) =>
- row.aliases && row.aliases.length ? row.aliases.join(", ") : "-"
+const formatAliases = (row) => {
+ if (!row.databaseName) return "-";
+ if (Array.isArray(row.databaseName)) {
+ return row.databaseName.join(", ");
+ }
+ return row.databaseName; // 字符串直接返回
+};
+
const getStatusType = (health) => {
if (health === "green") return "success"
@@ -177,6 +187,19 @@ const handleSearch = () => {
loadIndexList()
}
+const handleDeleteAllIndex = async () => {
+ tableLoading.value = true
+ try {
+ await deleteAllIndex()
+ ElMessage.success("索引删除成功")
+ loadIndexList()
+ } catch (error) {
+ ElMessage.error(error.message)
+ } finally {
+ tableLoading.value = false
+ }
+}
+
const handleCurrentChange = (page) => {
pagination.currentPage = page
loadIndexList()
@@ -216,10 +239,10 @@ const pollTaskStatus = async (taskId) => {
if (total > 0) progress.value = Math.floor((finished / total) * 100)
if (status === "done") {
- ElMessage.success("索引构建完成")
+ ElMessage.success("索引构建完成"+`共构建${total}个文档，成功${finished}个`)
loadIndexList()
} else if (status === "failed") {
- ElMessage.error("索引构建失败")
+ ElMessage.error("索引构建失败"+`共构建${total}个文档，成功${finished}个`)
} else {
// 继续轮询
timer = setTimeout(() => pollTaskStatus(taskId), 200)
@@ -233,7 +256,7 @@ const handleCreateIndex = async () => {
try {
const res = await setIndextask()
const taskId = res.data
- ElMessage.success(`任务已提交，taskId=${ taskId}`)
+ ElMessage.success(`开始构建索引`)
progress.value = 0
taskStatus.value = "processing"
diff --git a/chat-server/src/main/java/com/bjtds/brichat/controller/KnowledgeBaseController.java b/chat-server/src/main/java/com/bjtds/brichat/controller/KnowledgeBaseController.java
index f421250..0e2d64b 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/controller/KnowledgeBaseController.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/controller/KnowledgeBaseController.java
@@ -40,16 +40,16 @@ public class KnowledgeBaseController {
@Autowired
private KnowledgeBaseService knowledgeBaseService;
- @Autowired
- private EsKnowledgeServiceImpl esKnowledgeService;
+// @Autowired
+// private EsKnowledgeServiceImpl esKnowledgeService;
@Autowired
private EsTDatasetFilesService esTDatasetFilesService;
- @Autowired
- private EsKnowledgeImporter esKnowledgeImporter;
+// @Autowired
+// private EsKnowledgeImporter esKnowledgeImporter;
@Autowired
private EsTDatasetFilesImporter esTDatasetFilesImporter;
@@ -99,7 +99,7 @@ public class KnowledgeBaseController {
public ResultUtils createIndex(@RequestParam("documentId") String documentId) throws Exception {
try{
- esKnowledgeImporter.importDocumentId(documentId);
+ esTDatasetFilesImporter.importDocumentId(documentId);
return ResultUtils.success("索引创建成功");
} catch (IOException e) {
return ResultUtils.error("索引创建失败: " + e.getMessage());
@@ -141,6 +141,26 @@ public class KnowledgeBaseController {
result.put("finished", finished);
return ResultUtils.success(result);
}
+ @ApiOperation("删除索引下的文件")
+ @DeleteMapping("/deleteFileIndex")
+ public ResultUtils deleteFileIndex(@RequestParam("documentId") String documentId,@RequestParam("datasetId")String datasetId) throws Exception {
+ try{
+ esTDatasetFilesService.deleteDocIndex(datasetId,documentId);
+ return ResultUtils.success("索引删除成功");
+ } catch (IOException e) {
+ return ResultUtils.error("索引删除失败: " + e.getMessage());
+ }
+ }
+ @ApiOperation("删除所有索引")
+ @DeleteMapping("/deleteAllIndex")
+ public ResultUtils deleteAllIndex() throws Exception {
+ try{
+ esTDatasetFilesService.deleteAllIndex();
+ return ResultUtils.success("索引删除成功");
+ } catch (IOException e) {
+ return ResultUtils.error("索引删除失败: " + e.getMessage());
+ }
+ }
@ApiOperation("返回关联表数据")
diff --git a/chat-server/src/main/java/com/bjtds/brichat/entity/dto/RetrievalDto.java b/chat-server/src/main/java/com/bjtds/brichat/entity/dto/RetrievalDto.java
index 7524caa..bb91868 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/entity/dto/RetrievalDto.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/entity/dto/RetrievalDto.java
@@ -17,4 +17,5 @@ public class RetrievalDto {
private String datasetId;
private String datasetName;
private String sourceUrl;
+ private String documentId;
}
diff --git a/chat-server/src/main/java/com/bjtds/brichat/entity/esmodel/IndexInfo.java b/chat-server/src/main/java/com/bjtds/brichat/entity/esmodel/IndexInfo.java
index aad3d68..d9a4cfe 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/entity/esmodel/IndexInfo.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/entity/esmodel/IndexInfo.java
@@ -10,6 +10,7 @@ import lombok.NoArgsConstructor;
@AllArgsConstructor
public class IndexInfo {
private String indexName;
+ private String databaseName;
private String health; // 健康状态
private String docsCount; // 文档数量
private String storeSize; //索引大小
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 dcfdaf3..794d8f6 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
@@ -182,5 +182,10 @@ public interface TDatasetFilesMapper {
List selectAll();
+ List selectByDatasetId(@Param("difyDatasetId") String difyDatasetId);
+
+ TDatasetFiles selectByDatasetIdAndDocId(@Param("difyDatasetId") String difyDatasetId, @Param("difyDocId") String difyDocId);
+
+
}
\ No newline at end of file
diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/DatasetFilesService.java b/chat-server/src/main/java/com/bjtds/brichat/service/DatasetFilesService.java
index 18e50f3..a592ac5 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/service/DatasetFilesService.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/service/DatasetFilesService.java
@@ -159,4 +159,19 @@ public interface DatasetFilesService {
* 获取所有文件
*/
List getAllFiles();
-}
\ No newline at end of file
+
+
+ /**
+ * 根据数据集ID更新所有文件的索引
+ */
+ void updateByDatasetId(String difyDatasetId);
+
+ /**
+ * 根据数据集ID和文档ID查询文件
+ */
+ void updateByDatasetIdAndDocId(String difyDatasetId, String difyDocId);
+
+
+
+
+}
\ No newline at end of file
diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/EsTDatasetFilesService.java b/chat-server/src/main/java/com/bjtds/brichat/service/EsTDatasetFilesService.java
index 002f88d..e7d30aa 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/service/EsTDatasetFilesService.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/service/EsTDatasetFilesService.java
@@ -17,4 +17,6 @@ public interface EsTDatasetFilesService {
List searchSingle(String keyword, String DatasetId) throws IOException;
List search(String keyword, List datasetIds) throws IOException;
Pagination getAllIndexInfos(Integer pageNo, Integer pageSize, String keyword) throws IOException;
+ void deleteDocIndex(String DatasetId, String documentId) throws IOException;
+ void deleteAllIndex() throws IOException;
}
diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/impl/DatasetFilesServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/impl/DatasetFilesServiceImpl.java
index 2fbd4d3..5dc30d3 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/service/impl/DatasetFilesServiceImpl.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/service/impl/DatasetFilesServiceImpl.java
@@ -4,7 +4,9 @@ import com.bjtds.brichat.entity.dataset.TDatasetFiles;
import com.bjtds.brichat.mapper.opengauss.TDatasetFilesMapper;
import com.bjtds.brichat.service.DatasetFilesService;
import com.bjtds.common.utils.Pagination;
+import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Async;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
@@ -17,6 +19,7 @@ import java.util.List;
*
* @author system
*/
+@Slf4j
@Service
public class DatasetFilesServiceImpl implements DatasetFilesService {
@@ -411,4 +414,39 @@ public class DatasetFilesServiceImpl implements DatasetFilesService {
public List getAllFiles() {
return datasetFilesMapper.selectAll();
}
-}
\ No newline at end of file
+
+ /**
+ * 根据数据集ID查询所有文件
+ */
+ @Override
+ @Async
+ public void updateByDatasetId(String difyDatasetId) {
+ List tDatasetFilesList = datasetFilesMapper.selectByDatasetId(difyDatasetId);
+ if (tDatasetFilesList != null) {
+ tDatasetFilesList.stream()
+ .peek(tDatasetFiles -> tDatasetFiles.setIsEs(false)) // 修改isEs
+ .forEach(tDatasetFiles -> {
+ datasetFilesMapper.updateById(tDatasetFiles); // 更新数据库
+ log.info("更新文件索引成功，文件ID：{}", tDatasetFiles.getId());
+ });
+ }
+ }
+
+
+ /**
+ * 根据数据集ID和文档ID查询文件
+ */
+ @Override
+ public void updateByDatasetIdAndDocId(String difyDatasetId, String difyDocId) {
+ TDatasetFiles tDatasetFiles=datasetFilesMapper.selectByDatasetIdAndDocId(difyDatasetId, difyDocId);
+ if(tDatasetFiles!=null){
+ tDatasetFiles.setIsEs(false);
+ datasetFilesMapper.updateById(tDatasetFiles);
+ log.info("更新文件索引成功，文件ID：{}", tDatasetFiles.getId());
+ }else{
+ log.info("未找到文件，数据集ID：{}，文档ID：{}", difyDatasetId, difyDocId);
+ }
+ }
+
+
+}
\ No newline at end of file
diff --git a/chat-server/src/main/java/com/bjtds/brichat/service/impl/EsTDatasetFilesServiceImpl.java b/chat-server/src/main/java/com/bjtds/brichat/service/impl/EsTDatasetFilesServiceImpl.java
index 7d1633c..24fdf69 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/service/impl/EsTDatasetFilesServiceImpl.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/service/impl/EsTDatasetFilesServiceImpl.java
@@ -2,8 +2,11 @@ package com.bjtds.brichat.service.impl;
import co.elastic.clients.elasticsearch.ElasticsearchClient;
+import co.elastic.clients.elasticsearch.core.DeleteByQueryResponse;
import co.elastic.clients.elasticsearch.core.SearchResponse;
import co.elastic.clients.elasticsearch.core.search.Hit;
+import co.elastic.clients.elasticsearch.indices.DeleteIndexResponse;
+import co.elastic.clients.elasticsearch.indices.GetIndexResponse;
import com.bjtds.brichat.entity.dataset.TDatasetFiles;
import co.elastic.clients.elasticsearch._types.mapping.DynamicMapping;
import com.bjtds.brichat.entity.dto.RecordDto;
@@ -11,6 +14,7 @@ import com.bjtds.brichat.entity.dto.RetrievalDto;
import com.bjtds.brichat.entity.esmodel.IndexInfo;
import com.bjtds.brichat.mapper.opengauss.TUserDatasetMapper;
import com.bjtds.brichat.mapper.postgresql.DifyDatasetsMapper;
+import com.bjtds.brichat.service.DatasetFilesService;
import com.bjtds.brichat.service.EsTDatasetFilesService;
import com.bjtds.brichat.util.EsFileSplitter;
import com.bjtds.common.utils.Pagination;
@@ -36,6 +40,12 @@ public class EsTDatasetFilesServiceImpl implements EsTDatasetFilesService {
@Autowired
private DifyDatasetsMapper difyDatasetsMapper;
+ @Autowired
+ private DatasetFilesService datasetFilesService;
+
+
+
+
// 清除索引
@Override
@@ -61,6 +71,7 @@ public class EsTDatasetFilesServiceImpl implements EsTDatasetFilesService {
.properties("dataset_id", p -> p.keyword(k -> k))
.properties("source_url", p -> p.keyword(k -> k))
.properties("dataset_name", p -> p.keyword(k -> k))
+ .properties("document_id", p -> p.keyword(k -> k))
)
);
@@ -264,7 +275,8 @@ public class EsTDatasetFilesServiceImpl implements EsTDatasetFilesService {
content,
d.getDifyDatasetId(),
datasetName,
- d.getSourceUrl()
+ d.getSourceUrl(),
+ d.getDifyDocId()
);
RecordDto recordDto = new RecordDto();
@@ -283,8 +295,14 @@ public class EsTDatasetFilesServiceImpl implements EsTDatasetFilesService {
@Override
public Pagination getAllIndexInfos(Integer pageNo, Integer pageSize, String keyword) throws IOException {
List indexInfos = new ArrayList<>();
+ List records= new ArrayList<>();
// 不使用 format()，直接调用 cat().indices()
- List records = client.cat().indices(r -> r).valueBody();
+ try {
+ records = client.cat().indices(r -> r).valueBody();
+ } catch (IOException e) {
+ log.error("获取索引列表失败", e);
+ return new Pagination<>();
+ }
if (keyword != null && !keyword.isEmpty()) {
records = records.stream()
.filter(r -> r.index() != null && r.index().contains(keyword))
@@ -300,7 +318,8 @@ public class EsTDatasetFilesServiceImpl implements EsTDatasetFilesService {
String health = record.health();
String docsCount = record.docsCount() != null ? record.docsCount() : "0";
String storeSize = record.storeSize() != null ? record.storeSize() : "0b";
- indexInfos.add(new IndexInfo(indexName, health, docsCount, storeSize));
+ String databaseName = difyDatasetsMapper.getDatasetNameById(indexName);
+ indexInfos.add(new IndexInfo(indexName, databaseName, health, docsCount, storeSize));
}
Pagination pagination = new Pagination<>();
pagination.setTotal(total);
@@ -310,6 +329,37 @@ public class EsTDatasetFilesServiceImpl implements EsTDatasetFilesService {
return pagination;
}
+ @Override
+ public void deleteDocIndex(String DatasetId, String documentId) throws IOException {
+ boolean exists = client.indices().exists(e -> e.index(DatasetId)).value();
+ if (exists) {
+ try {
+ DeleteByQueryResponse response = client.deleteByQuery(d -> d
+ .index(DatasetId)
+ .query(q -> q.term(t -> t.field("document_id").value(documentId))));
+ datasetFilesService.updateByDatasetIdAndDocId(DatasetId, documentId);
+ log.info("删除文档索引成功: {}, documentId: {}", DatasetId, documentId);
+ } catch (IOException e) {
+ log.error("删除文档索引失败: {}, documentId: {}", DatasetId, documentId, e);
+ }
+ } else {
+ log.warn("索引不存在: {}", DatasetId);
+ }
+ }
+
+ @Override
+ public void deleteAllIndex() throws IOException {
+ GetIndexResponse allIndices = client.indices().get(g -> g.index("*"));
+ allIndices.result().keySet().forEach(indexName -> {
+ try {
+ DeleteIndexResponse response = client.indices().delete(d -> d.index(indexName));
+ datasetFilesService.updateByDatasetId(indexName);
+ log.info("删除索引：{} -> {}", indexName, response.acknowledged());
+ } catch (Exception e) {
+ log.error("删除索引失败：{} -> {}", indexName, e.getMessage());
+ }
+ });
+ }
}
diff --git a/chat-server/src/main/java/com/bjtds/brichat/util/EsTDatasetFilesImporter.java b/chat-server/src/main/java/com/bjtds/brichat/util/EsTDatasetFilesImporter.java
index 5e2790a..8a4f512 100644
--- a/chat-server/src/main/java/com/bjtds/brichat/util/EsTDatasetFilesImporter.java
+++ b/chat-server/src/main/java/com/bjtds/brichat/util/EsTDatasetFilesImporter.java
@@ -28,13 +28,13 @@ public class EsTDatasetFilesImporter {
@Autowired
private StringRedisTemplate redisTemplate;
- public void importDocumentId(Integer documentId) throws IOException {
+ public void importDocumentId(String documentId) throws IOException {
// 一次性获取完整的文档信息
- TDatasetFiles datasetFiles = datasetFilesService.getFileById(documentId);
+ TDatasetFiles datasetFiles = datasetFilesService.getFileById(Integer.valueOf(documentId));
if (datasetFiles == null) {
throw new IllegalArgumentException("datasetFiles 不存在");
}
- String filePath = datasetFiles.getDifyStoragePath();
+ String filePath = datasetFiles.getSourceUrl();
File file = new File(filePath);
if (!file.exists()) {
throw new IllegalArgumentException(filePath + " 不存在");
@@ -60,9 +60,13 @@ public class EsTDatasetFilesImporter {
for (TDatasetFiles document : documents) {
if (document == null) continue;
String filePath = document.getDifyStoragePath();
+ if (filePath == null) {
+ log.debug("documentId=" + document.getId() + " 不存在difyStoragePath，跳过");
+ continue;
+ }
File file = new File(filePath);
if (!file.exists()) {
- log.debug(filePath + " 不存在，跳过");
+ log.debug(file.getAbsolutePath() + " 不存在，跳过");
continue;
}
if(document.getIsEs()){
diff --git a/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml
index 7b3f591..d4e842e 100644
--- a/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml
+++ b/chat-server/src/main/resources/com/bjtds/brichat/mapper/opengauss/TDatasetFilesMapper.xml
@@ -263,4 +263,22 @@
WHERE type = 'file'
ORDER BY created_at DESC
-
\ No newline at end of file
+
+
+
+
+
+
+
\ No newline at end of file