From c6835ddd111011c1e02e41c82450ae00e59124d1 Mon Sep 17 00:00:00 2001
From: hrz <1710360675@qq.com>
Date: Mon, 10 Nov 2025 12:24:32 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E5=88=A0=E9=99=A4=E7=9F=A5=E8=AF=86?=
 =?UTF-8?q?=E5=BA=93=E6=97=B6=EF=BC=8C=E9=9C=80=E8=A6=81=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/KnowledgeBaseService.java         |  7 ---
 .../impl/KnowledgeBaseServiceImpl.java        | 54 +------------------
 .../impl/KnowledgeFilesServiceImpl.java       |  2 -
 3 files changed, 2 insertions(+), 61 deletions(-)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java
index 75f1f5ba..2cf64cf0 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/KnowledgeBaseService.java
@@ -47,13 +47,6 @@ public interface KnowledgeBaseService extends BaseService<KnowledgeBaseEntity> {
      */
     KnowledgeBaseDTO update(KnowledgeBaseDTO knowledgeBaseDTO);
 
-    /**
-     * 根据ID删除知识库
-     * 
-     * @param id 知识库ID
-     */
-    void delete(String id);
-
     /**
      * 根据知识库ID查询知识库
      * 
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
index 24fbd19d..56a404dc 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeBaseServiceImpl.java
@@ -206,7 +206,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
 
         // 删除缓存
         if (entity.getDatasetId() != null) {
-            redisUtils.delete(RedisKeys.getKnowledgeBaseCacheKey(entity.getDatasetId()));
+            redisUtils.delete(RedisKeys.getKnowledgeBaseCacheKey(entity.getId()));
         }
 
         // 调用RAGFlow API更新数据集
@@ -228,57 +228,6 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
         return ConvertUtils.sourceToTarget(entity, KnowledgeBaseDTO.class);
     }
 
-    @Override
-    public void delete(String id) {
-        if (StringUtils.isBlank(id)) {
-            throw new RenException(ErrorCode.IDENTIFIER_NOT_NULL);
-        }
-
-        // 先获取实体以获取datasetId用于删除缓存
-        KnowledgeBaseEntity tempEntity = knowledgeBaseDao.selectById(id);
-        if (tempEntity != null && tempEntity.getDatasetId() != null) {
-            redisUtils.delete(RedisKeys.getKnowledgeBaseCacheKey(tempEntity.getDatasetId()));
-        }
-
-        log.info("=== 开始删除操作 ===");
-        log.info("删除ID: {}", id);
-
-        KnowledgeBaseEntity entity = knowledgeBaseDao.selectById(id);
-        if (entity == null) {
-            log.warn("记录不存在，ID: {}", id);
-            throw new RenException(ErrorCode.Knowledge_Base_RECORD_NOT_EXISTS);
-        }
-
-        log.info("找到记录: ID={}, datasetId={}, ragModelId={}",
-                entity.getId(), entity.getDatasetId(), entity.getRagModelId());
-
-        // 先调用RAGFlow API删除数据集
-        boolean apiDeleteSuccess = false;
-        if (StringUtils.isNotBlank(entity.getDatasetId()) && StringUtils.isNotBlank(entity.getRagModelId())) {
-            try {
-                log.info("开始调用RAGFlow API删除数据集");
-                Map<String, Object> ragConfig = getValidatedRAGConfig(entity.getRagModelId());
-                deleteDatasetInRAGFlow(entity.getDatasetId(), ragConfig);
-                log.info("RAGFlow API删除调用完成");
-                apiDeleteSuccess = true;
-            } catch (Exception e) {
-                log.error("删除RAGFlow数据集失败: {}", e.getMessage());
-                throw new RenException(ErrorCode.RAG_API_ERROR, "删除RAGFlow数据集失败: " + e.getMessage());
-            }
-        } else {
-            log.warn("datasetId或ragModelId为空，跳过RAGFlow删除");
-            apiDeleteSuccess = true; // 没有RAG数据集，视为成功
-        }
-
-        // API删除成功后再删除本地记录
-        if (apiDeleteSuccess) {
-            int deleteCount = knowledgeBaseDao.deleteById(id);
-            log.info("本地数据库删除结果: {}", deleteCount > 0 ? "成功" : "失败");
-        }
-
-        log.info("=== 删除操作结束 ===");
-    }
-
     @Override
     public KnowledgeBaseDTO getByDatasetId(String datasetId) {
         if (StringUtils.isBlank(datasetId)) {
@@ -311,6 +260,7 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
             log.warn("记录不存在，datasetId: {}", datasetId);
             throw new RenException(ErrorCode.Knowledge_Base_RECORD_NOT_EXISTS);
         }
+        redisUtils.delete(RedisKeys.getKnowledgeBaseCacheKey(entity.getId()));
 
         log.info("找到记录: ID={}, datasetId={}, ragModelId={}",
                 entity.getId(), entity.getDatasetId(), entity.getRagModelId());
diff --git a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java
index 43f58295..458ef063 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/knowledge/service/impl/KnowledgeFilesServiceImpl.java
@@ -37,7 +37,6 @@ import xiaozhi.common.constant.Constant;
 import xiaozhi.common.exception.ErrorCode;
 import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
-import xiaozhi.common.redis.RedisUtils;
 import xiaozhi.modules.knowledge.dto.KnowledgeFilesDTO;
 import xiaozhi.modules.knowledge.service.KnowledgeFilesService;
 import xiaozhi.modules.model.dao.ModelConfigDao;
@@ -51,7 +50,6 @@ public class KnowledgeFilesServiceImpl implements KnowledgeFilesService {
 
     private final ModelConfigService modelConfigService;
     private final ModelConfigDao modelConfigDao;
-    private final RedisUtils redisUtils;
     private RestTemplate restTemplate = new RestTemplate();
     private ObjectMapper objectMapper = new ObjectMapper();