update:优化rag模型列表接口

2026-07-21 22:53:56 +08:00 · 2025-11-08 23:44:40 +08:00
parent 75807c5845
commit dc5ff21002
8 changed files with 328 additions and 486 deletions
@@ -17,5 +17,5 @@ docker build -t xiaozhi-esp32-server:web_latest -f ./Dockerfile-web .
 # 编译完成后，可以使用docker-compose启动项目
 # docker-compose.yml你需要修改成自己编译的镜像版本
 cd main/xiaozhi-server
-docker-compose up -d
+docker compose up -d
 ```
@@ -82,8 +82,12 @@ public class AgentPluginMappingServiceImpl extends ServiceImpl<AgentPluginMappin
                paramInfo.put("api_key", modelConfigEntity.getConfigJson().getStr("api_key"));
                paramInfo.put("dataset_ids",
                        knowledgeBaseList.stream().map(KnowledgeBaseEntity::getDatasetId).toList());
-                paramInfo.put("description",
-                        String.join(",", knowledgeBaseList.stream().map(KnowledgeBaseEntity::getDescription).toList()));
+
+                String description = "如果用户询问与【"
+                        + String.join(",", knowledgeBaseList.stream().map(KnowledgeBaseEntity::getName).toList())
+                        + "】相关的问题应调用本方法，用于查询：" + String.join(",",
+                                knowledgeBaseList.stream().map(KnowledgeBaseEntity::getDescription).toList());
+                paramInfo.put("description", description);
                agentPluginMapping.setParamInfo(JsonUtils.toJsonString(paramInfo));
                list.add(agentPluginMapping);
            }
@@ -1,5 +1,9 @@
 package xiaozhi.modules.knowledge.controller;

+import java.util.List;
+import java.util.Map;
+
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
@@ -11,19 +15,18 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
-import org.apache.commons.lang3.StringUtils;
-import xiaozhi.common.exception.ErrorCode;
-import xiaozhi.common.exception.RenException;
-import xiaozhi.modules.security.user.SecurityUser;

 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.Parameter;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.AllArgsConstructor;
+import xiaozhi.common.exception.ErrorCode;
+import xiaozhi.common.exception.RenException;
 import xiaozhi.common.page.PageData;
 import xiaozhi.common.utils.Result;
 import xiaozhi.modules.knowledge.dto.KnowledgeBaseDTO;
 import xiaozhi.modules.knowledge.service.KnowledgeBaseService;
+import xiaozhi.modules.security.user.SecurityUser;

@AllArgsConstructor
@RestController
@@ -145,4 +148,12 @@ public class KnowledgeBaseController {
        }
        return new Result<>();
    }
+
+    @GetMapping("/rag-models")
+    @Operation(summary = "获取RAG模型列表")
+    @RequiresPermissions("sys:role:normal")
+    public Result<List<Map<String, Object>>> getRAGModels() {
+        List<Map<String, Object>> result = knowledgeBaseService.getRAGModels();
+        return new Result<List<Map<String, Object>>>().ok(result);
+    }
 }
@@ -1,5 +1,6 @@
 package xiaozhi.modules.knowledge.service;

+import java.util.List;
 import java.util.Map;

 import xiaozhi.common.page.PageData;
@@ -82,4 +83,11 @@ public interface KnowledgeBaseService extends BaseService<KnowledgeBaseEntity> {
     * @return 默认RAG配置信息
     */
    Map<String, Object> getDefaultRAGConfig();
+
+    /**
+     * 获取RAG模型列表
+     * 
+     * @return RAG模型列表
+     */
+    List<Map<String, Object>> getRAGModels();
 }
@@ -1,7 +1,7 @@
 package xiaozhi.modules.knowledge.service.impl;

-import java.io.IOException;
 import java.io.Serializable;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -13,9 +13,6 @@ import org.springframework.http.HttpMethod;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Service;
-import org.springframework.web.client.HttpClientErrorException;
-import org.springframework.web.client.HttpServerErrorException;
-import org.springframework.web.client.ResourceAccessException;
 import org.springframework.web.client.RestTemplate;

 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -88,8 +85,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,

        // 添加查询条件
        if (knowledgeBaseDTO != null) {
-            queryWrapper.like(StringUtils.isNotBlank(knowledgeBaseDTO.getName()), "name", knowledgeBaseDTO.getName())
-                    .eq(knowledgeBaseDTO.getStatus() != null, "status", knowledgeBaseDTO.getStatus());
+            queryWrapper.like(StringUtils.isNotBlank(knowledgeBaseDTO.getName()), "name", knowledgeBaseDTO.getName());
+            queryWrapper.eq(knowledgeBaseDTO.getStatus() != null, "status", knowledgeBaseDTO.getStatus());
+            queryWrapper.eq("creator", knowledgeBaseDTO.getCreator());
        }

        // 添加排序规则：按创建时间降序
@@ -382,6 +380,27 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
        return config;
    }

+    @Override
+    public List<Map<String, Object>> getRAGModels() {
+        // 查询RAG类型的模型配置
+        QueryWrapper<ModelConfigEntity> queryWrapper = new QueryWrapper<>();
+        queryWrapper.eq("model_type", Constant.RAG_CONFIG_TYPE)
+                .eq("is_enabled", 1)
+                .orderByDesc("is_default")
+                .orderByDesc("create_date");
+
+        List<ModelConfigEntity> modelConfigs = modelConfigDao.selectList(queryWrapper);
+
+        List<Map<String, Object>> modelList = new ArrayList<>();
+        for (ModelConfigEntity modelConfig : modelConfigs) {
+            Map<String, Object> modelInfo = new HashMap<>();
+            modelInfo.put("id", modelConfig.getId());
+            modelInfo.put("modelName", modelConfig.getModelName());
+            modelList.add(modelInfo);
+        }
+        return modelList;
+    }
+
    /**
     * 验证RAG配置中是否包含必要的参数
     */
@@ -405,106 +424,90 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
     */
    private String createDatasetInRAGFlow(String name, String description, Map<String, Object> ragConfig) {
        String datasetId = null;
-        try {
-            String baseUrl = (String) ragConfig.get("base_url");
-            String apiKey = (String) ragConfig.get("api_key");
+        String baseUrl = (String) ragConfig.get("base_url");
+        String apiKey = (String) ragConfig.get("api_key");

-            log.info("开始调用RAGFlow API创建数据集, name: {}", name);
-            log.debug("RAGFlow配置 - baseUrl: {}, apiKey: {}", baseUrl, StringUtils.isBlank(apiKey) ? "未配置" : "已配置");
+        log.info("开始调用RAGFlow API创建数据集, name: {}", name);
+        log.debug("RAGFlow配置 - baseUrl: {}, apiKey: {}", baseUrl, StringUtils.isBlank(apiKey) ? "未配置" : "已配置");

-            // 构建请求URL
-            String url = baseUrl + "/api/v1/datasets";
-            log.debug("请求URL: {}", url);
+        // 构建请求URL
+        String url = baseUrl + "/api/v1/datasets";
+        log.debug("请求URL: {}", url);

-            // 构建请求体
-            Map<String, Object> requestBody = new HashMap<>();
-            requestBody.put("name", name);
-            if (StringUtils.isNotBlank(description)) {
-                requestBody.put("description", description);
-            }
-            log.debug("请求体: {}", requestBody);
-
-            // 设置请求头
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.set("Authorization", "Bearer " + apiKey);
-
-            HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
-
-            // 发送POST请求
-            log.info("发送POST请求到RAGFlow API...");
-            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
-
-            log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
-            log.debug("RAGFlow API响应内容: {}", response.getBody());
-
-            if (!response.getStatusCode().is2xxSuccessful()) {
-                log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
-                throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
-            }
-
-            // 解析响应体，提取datasetId
-            String responseBody = response.getBody();
-            if (StringUtils.isNotBlank(responseBody)) {
-                try {
-                    // 解析RAGFlow API响应，支持多种可能的字段名
-                    ObjectMapper objectMapper = new ObjectMapper();
-                    Map<String, Object> responseMap = objectMapper.readValue(responseBody, Map.class);
-
-                    log.debug("RAGFlow API响应解析结果: {}", responseMap);
-
-                    // 首先检查响应码
-                    Integer code = (Integer) responseMap.get("code");
-                    if (code != null && code == 0) {
-                        // 响应码为0表示成功，从data字段中获取datasetId
-                        Object dataObj = responseMap.get("data");
-                        if (dataObj instanceof Map) {
-                            Map<String, Object> dataMap = (Map<String, Object>) dataObj;
-                            datasetId = (String) dataMap.get("id");
-
-                            if (StringUtils.isBlank(datasetId)) {
-                                // 如果id字段为空，尝试其他可能的字段名
-                                datasetId = (String) dataMap.get("dataset_id");
-                                datasetId = (String) dataMap.get("datasetId");
-                            }
-                        }
-                    } else {
-                        // 如果响应码不为0，说明API调用失败
-                        log.error("RAGFlow API调用失败，响应码: {}, 响应内容: {}", code, responseBody);
-                        throw new RenException(ErrorCode.RAG_API_ERROR, "RAGFlow API调用失败，响应码: " + code);
-                    }
-
-                    log.info("从RAGFlow API响应中解析出datasetId: {}", datasetId);
-                    log.debug("完整响应内容: {}", responseBody);
-                } catch (Exception e) {
-                    log.error("解析RAGFlow API响应失败: {}, 响应内容: {}", e.getMessage(), responseBody);
-                    throw new RenException(ErrorCode.RAG_API_ERROR, "解析RAGFlow响应失败: " + e.getMessage());
-                }
-            }
-
-            if (StringUtils.isBlank(datasetId)) {
-                log.error("无法从RAGFlow API响应中获取datasetId，响应内容: {}", responseBody);
-                throw new RenException(ErrorCode.RAG_API_ERROR, "RAGFlow API响应中未包含datasetId");
-            }
-            log.info("RAGFlow数据集创建成功，datasetId: {}", datasetId);
-
-        } catch (HttpClientErrorException e) {
-            log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR,
-                    "创建RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
-        } catch (HttpServerErrorException e) {
-            log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR,
-                    "创建RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
-        } catch (ResourceAccessException e) {
-            log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "创建RAGFlow数据集失败: 网络连接错误 - " + e.getMessage());
-        } catch (Exception e) {
-            log.error("RAGFlow API调用失败 - 未知错误: {}", e.getMessage(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "创建RAGFlow数据集失败: " + e.getMessage());
+        // 构建请求体
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("name", name);
+        if (StringUtils.isNotBlank(description)) {
+            requestBody.put("description", description);
        }
+        log.debug("请求体: {}", requestBody);
+
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("Authorization", "Bearer " + apiKey);
+
+        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
+
+        // 发送POST请求
+        log.info("发送POST请求到RAGFlow API...");
+        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.POST, requestEntity, String.class);
+
+        log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+        log.debug("RAGFlow API响应内容: {}", response.getBody());
+
+        if (!response.getStatusCode().is2xxSuccessful()) {
+            log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
+            throw new RenException(ErrorCode.RAG_API_ERROR, response.getStatusCode().toString());
+        }
+
+        // 解析响应体，提取datasetId
+        String responseBody = response.getBody();
+        if (StringUtils.isNotBlank(responseBody)) {
+            try {
+                // 解析RAGFlow API响应，支持多种可能的字段名
+                ObjectMapper objectMapper = new ObjectMapper();
+                Map<String, Object> responseMap = objectMapper.readValue(responseBody, Map.class);
+
+                log.debug("RAGFlow API响应解析结果: {}", responseMap);
+
+                // 首先检查响应码
+                Integer code = (Integer) responseMap.get("code");
+                String message = (String) responseMap.get("message");
+                if (code != null && code == 0) {
+                    // 响应码为0表示成功，从data字段中获取datasetId
+                    Object dataObj = responseMap.get("data");
+                    if (dataObj instanceof Map) {
+                        Map<String, Object> dataMap = (Map<String, Object>) dataObj;
+                        datasetId = (String) dataMap.get("id");
+
+                        if (StringUtils.isBlank(datasetId)) {
+                            // 如果id字段为空，尝试其他可能的字段名
+                            datasetId = (String) dataMap.get("dataset_id");
+                            datasetId = (String) dataMap.get("datasetId");
+                        }
+                    }
+                } else {
+                    // 如果响应码不为0，说明API调用失败
+                    log.error("RAGFlow API调用失败，响应码: {}, 响应内容: {}", code, message);
+                    throw new RenException(ErrorCode.RAG_API_ERROR,
+                            "RAGFlow API调用失败，响应码: " + code + ", 消息: " + message);
+                }
+
+                log.info("从RAGFlow API响应中解析出datasetId: {}", datasetId);
+                log.debug("完整响应内容: {}", responseBody);
+            } catch (Exception e) {
+                log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e);
+                throw new RenException(ErrorCode.RAG_API_ERROR, "解析响应失败: " + e.getMessage());
+            }
+        }
+
+        if (StringUtils.isBlank(datasetId)) {
+            log.error("无法从RAGFlow API响应中获取datasetId，响应内容: {}", responseBody);
+            throw new RenException(ErrorCode.RAG_API_ERROR, "RAGFlow API响应中未包含datasetId");
+        }
+        log.info("RAGFlow数据集创建成功，datasetId: {}", datasetId);
+
        return datasetId;
    }

@@ -513,124 +516,88 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
     */
    private void updateDatasetInRAGFlow(String datasetId, String name, String description,
            Map<String, Object> ragConfig) {
-        try {
-            String baseUrl = (String) ragConfig.get("base_url");
-            String apiKey = (String) ragConfig.get("api_key");
+        String baseUrl = (String) ragConfig.get("base_url");
+        String apiKey = (String) ragConfig.get("api_key");

-            log.info("开始调用RAGFlow API更新数据集，datasetId: {}, name: {}", datasetId, name);
-            log.debug("RAGFlow配置 - baseUrl: {}, apiKey: {}", baseUrl, StringUtils.isBlank(apiKey) ? "未配置" : "已配置");
+        log.info("开始调用RAGFlow API更新数据集，datasetId: {}, name: {}", datasetId, name);
+        log.debug("RAGFlow配置 - baseUrl: {}, apiKey: {}", baseUrl, StringUtils.isBlank(apiKey) ? "未配置" : "已配置");

-            // 构建请求URL
-            String url = baseUrl + "/api/v1/datasets/" + datasetId;
-            log.debug("请求URL: {}", url);
+        // 构建请求URL
+        String url = baseUrl + "/api/v1/datasets/" + datasetId;
+        log.debug("请求URL: {}", url);

-            // 构建请求体
-            Map<String, Object> requestBody = new HashMap<>();
-            requestBody.put("dataset_id", datasetId);
-            requestBody.put("name", name);
-            if (StringUtils.isNotBlank(description)) {
-                requestBody.put("description", description);
-            }
-            log.debug("请求体: {}", requestBody);
-
-            // 设置请求头
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.set("Authorization", "Bearer " + apiKey);
-
-            HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
-
-            // 发送PUT请求
-            log.info("发送PUT请求到RAGFlow API...");
-            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.PUT, requestEntity, String.class);
-
-            log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
-            log.debug("RAGFlow API响应内容: {}", response.getBody());
-
-            if (!response.getStatusCode().is2xxSuccessful()) {
-                log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
-                throw new RenException(ErrorCode.RAG_API_ERROR);
-            }
-
-            log.info("RAGFlow数据集更新成功，datasetId: {}", datasetId);
-
-        } catch (HttpClientErrorException e) {
-            log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR,
-                    "更新RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
-        } catch (HttpServerErrorException e) {
-            log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR,
-                    "更新RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
-        } catch (ResourceAccessException e) {
-            log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "更新RAGFlow数据集失败: 网络连接错误 - " + e.getMessage());
-        } catch (Exception e) {
-            log.error("RAGFlow API调用失败 - 未知错误: {}", e.getMessage(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "更新RAGFlow数据集失败: " + e.getMessage());
+        // 构建请求体
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("dataset_id", datasetId);
+        requestBody.put("name", name);
+        if (StringUtils.isNotBlank(description)) {
+            requestBody.put("description", description);
        }
+        log.debug("请求体: {}", requestBody);
+
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("Authorization", "Bearer " + apiKey);
+
+        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
+
+        // 发送PUT请求
+        log.info("发送PUT请求到RAGFlow API...");
+        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.PUT, requestEntity, String.class);
+
+        log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+        log.debug("RAGFlow API响应内容: {}", response.getBody());
+
+        if (!response.getStatusCode().is2xxSuccessful()) {
+            log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
+            throw new RenException(ErrorCode.RAG_API_ERROR);
+        }
+
+        log.info("RAGFlow数据集更新成功，datasetId: {}", datasetId);
+
    }

    /**
     * 调用RAGFlow API删除数据集
     */
    private void deleteDatasetInRAGFlow(String datasetId, Map<String, Object> ragConfig) {
-        try {
-            String baseUrl = (String) ragConfig.get("base_url");
-            String apiKey = (String) ragConfig.get("api_key");
+        String baseUrl = (String) ragConfig.get("base_url");
+        String apiKey = (String) ragConfig.get("api_key");

-            log.info("开始调用RAGFlow API删除数据集，datasetId: {}", datasetId);
-            log.debug("RAGFlow配置 - baseUrl: {}, apiKey: {}", baseUrl, StringUtils.isBlank(apiKey) ? "未配置" : "已配置");
+        log.info("开始调用RAGFlow API删除数据集，datasetId: {}", datasetId);
+        log.debug("RAGFlow配置 - baseUrl: {}, apiKey: {}", baseUrl, StringUtils.isBlank(apiKey) ? "未配置" : "已配置");

-            // 构建请求URL
-            String url = baseUrl + "/api/v1/datasets";
-            log.debug("请求URL: {}", url);
+        // 构建请求URL
+        String url = baseUrl + "/api/v1/datasets";
+        log.debug("请求URL: {}", url);

-            // 构建请求体
-            Map<String, Object> requestBody = new HashMap<>();
-            requestBody.put("ids", List.of(datasetId));
-            log.debug("请求体: {}", requestBody);
+        // 构建请求体
+        Map<String, Object> requestBody = new HashMap<>();
+        requestBody.put("ids", List.of(datasetId));
+        log.debug("请求体: {}", requestBody);

-            // 设置请求头
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.set("Authorization", "Bearer " + apiKey);
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("Authorization", "Bearer " + apiKey);

-            HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);
+        HttpEntity<Map<String, Object>> requestEntity = new HttpEntity<>(requestBody, headers);

-            // 发送DELETE请求
-            log.info("发送DELETE请求到RAGFlow API...");
-            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity,
-                    String.class);
+        // 发送DELETE请求
+        log.info("发送DELETE请求到RAGFlow API...");
+        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.DELETE, requestEntity,
+                String.class);

-            log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
-            log.debug("RAGFlow API响应内容: {}", response.getBody());
+        log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+        log.debug("RAGFlow API响应内容: {}", response.getBody());

-            if (!response.getStatusCode().is2xxSuccessful()) {
-                log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
-                throw new RenException(ErrorCode.RAG_API_ERROR);
-            }
-            log.info("RAGFlow数据集删除成功，datasetId: {}", datasetId);
-
-        } catch (HttpClientErrorException e) {
-            log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR,
-                    "删除RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
-        } catch (HttpServerErrorException e) {
-            log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR,
-                    "删除RAGFlow数据集失败: " + e.getMessage() + ", 响应: " + e.getResponseBodyAsString());
-        } catch (ResourceAccessException e) {
-            log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "删除RAGFlow数据集失败: 网络连接错误 - " + e.getMessage());
-        } catch (Exception e) {
-            log.error("RAGFlow API调用失败 - 未知错误: {}", e.getMessage(), e);
-            throw new RenException(ErrorCode.RAG_API_ERROR, "删除RAGFlow数据集失败: " + e.getMessage());
+        if (!response.getStatusCode().is2xxSuccessful()) {
+            log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
+            throw new RenException(ErrorCode.RAG_API_ERROR);
        }
+        log.info("RAGFlow数据集删除成功，datasetId: {}", datasetId);
+
    }

    /**
@@ -688,40 +655,40 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
            return 0;
        }

+        log.info("开始获取知识库 {} 的文档数量", datasetId);
+
+        // 获取RAG配置
+        Map<String, Object> ragConfig = getValidatedRAGConfig(ragModelId);
+        String baseUrl = (String) ragConfig.get("base_url");
+        String apiKey = (String) ragConfig.get("api_key");
+
+        // 构建请求URL - 调用RAGFlow API获取文档列表，但不返回文档详情，只获取总数
+        String url = baseUrl + "/api/v1/datasets/" + datasetId + "/documents?page=1&size=1";
+        log.debug("请求URL: {}", url);
+
+        // 设置请求头
+        HttpHeaders headers = new HttpHeaders();
+        headers.setContentType(MediaType.APPLICATION_JSON);
+        headers.set("Authorization", "Bearer " + apiKey);
+
+        HttpEntity<String> requestEntity = new HttpEntity<>(headers);
+
+        // 发送GET请求
+        log.info("发送GET请求到RAGFlow API获取文档数量...");
+        ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, requestEntity, String.class);
+
+        log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
+
+        if (!response.getStatusCode().is2xxSuccessful()) {
+            log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
+            return 0;
+        }
+
+        String responseBody = response.getBody();
+        log.debug("RAGFlow API响应内容: {}", responseBody);
+
+        // 解析响应
        try {
-            log.info("开始获取知识库 {} 的文档数量", datasetId);
-
-            // 获取RAG配置
-            Map<String, Object> ragConfig = getValidatedRAGConfig(ragModelId);
-            String baseUrl = (String) ragConfig.get("base_url");
-            String apiKey = (String) ragConfig.get("api_key");
-
-            // 构建请求URL - 调用RAGFlow API获取文档列表，但不返回文档详情，只获取总数
-            String url = baseUrl + "/api/v1/datasets/" + datasetId + "/documents?page=1&size=1";
-            log.debug("请求URL: {}", url);
-
-            // 设置请求头
-            HttpHeaders headers = new HttpHeaders();
-            headers.setContentType(MediaType.APPLICATION_JSON);
-            headers.set("Authorization", "Bearer " + apiKey);
-
-            HttpEntity<String> requestEntity = new HttpEntity<>(headers);
-
-            // 发送GET请求
-            log.info("发送GET请求到RAGFlow API获取文档数量...");
-            ResponseEntity<String> response = restTemplate.exchange(url, HttpMethod.GET, requestEntity, String.class);
-
-            log.info("RAGFlow API响应状态码: {}", response.getStatusCode());
-
-            if (!response.getStatusCode().is2xxSuccessful()) {
-                log.error("RAGFlow API调用失败，状态码: {}, 响应内容: {}", response.getStatusCode(), response.getBody());
-                return 0;
-            }
-
-            String responseBody = response.getBody();
-            log.debug("RAGFlow API响应内容: {}", responseBody);
-
-            // 解析响应
            ObjectMapper objectMapper = new ObjectMapper();
            Map<String, Object> responseMap = objectMapper.readValue(responseBody, Map.class);
            Integer code = (Integer) responseMap.get("code");
@@ -744,21 +711,9 @@ public class KnowledgeBaseServiceImpl extends BaseServiceImpl<KnowledgeBaseDao,
            } else {
                log.error("RAGFlow API调用失败，响应码: {}, 响应内容: {}", code, responseBody);
            }
-
-        } catch (IOException e) {
-            log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e);
-        } catch (HttpClientErrorException e) {
-            log.error("RAGFlow API调用失败 - HTTP错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-        } catch (HttpServerErrorException e) {
-            log.error("RAGFlow API调用失败 - 服务器错误: {}, 状态码: {}, 响应内容: {}",
-                    e.getMessage(), e.getStatusCode(), e.getResponseBodyAsString(), e);
-        } catch (ResourceAccessException e) {
-            log.error("RAGFlow API调用失败 - 网络连接错误: {}", e.getMessage(), e);
        } catch (Exception e) {
-            log.error("获取文档数量失败: {}", e.getMessage(), e);
+            log.error("解析RAGFlow API响应失败: {}", e.getMessage(), e);
        }
-
        return 0;
    }

@@ -338,11 +338,11 @@ export default {
        })
      }).send()
  },
-  
+
  // 获取RAG模型列表
  getRAGModels(callback) {
    RequestService.sendRequest()
-      .url(`${getServiceUrl()}/models/list?modelType=RAG&page=0&limit=100`)
+      .url(`${getServiceUrl()}/datasets/rag-models`)
      .method('GET')
      .success((res) => {
        RequestService.clearRequestTime()
@@ -9,82 +9,50 @@

      <!-- 中间导航菜单 -->
      <div class="header-center">
-        <div
-          class="equipment-management"
-          :class="{
-            'active-tab':
+        <div class="equipment-management" :class="{
+          'active-tab':
+            $route.path === '/home' ||
+            $route.path === '/role-config' ||
+            $route.path === '/device-management',
+        }" @click="goHome">
+          <img loading="lazy" alt="" src="@/assets/header/robot.png" :style="{
+            filter:
              $route.path === '/home' ||
-              $route.path === '/role-config' ||
-              $route.path === '/device-management',
-          }"
-          @click="goHome"
-        >
-          <img
-            loading="lazy"
-            alt=""
-            src="@/assets/header/robot.png"
-            :style="{
-              filter:
-                $route.path === '/home' ||
                $route.path === '/role-config' ||
                $route.path === '/device-management'
-                  ? 'brightness(0) invert(1)'
-                  : 'None',
-            }"
-          />
+                ? 'brightness(0) invert(1)'
+                : 'None',
+          }" />
          <span class="nav-text">{{ $t("header.smartManagement") }}</span>
        </div>
        <!-- 普通用户显示音色克隆 -->
-        <div
-          v-if="!isSuperAdmin"
-          class="equipment-management"
-          :class="{ 'active-tab': $route.path === '/voice-clone-management' }"
-          @click="goVoiceCloneManagement"
-        >
-          <img
-            loading="lazy"
-            alt=""
-            src="@/assets/header/voice.png"
-            :style="{
-              filter:
-                $route.path === '/voice-clone-management'
-                  ? 'brightness(0) invert(1)'
-                  : 'None',
-            }"
-          />
+        <div v-if="!isSuperAdmin" class="equipment-management"
+          :class="{ 'active-tab': $route.path === '/voice-clone-management' }" @click="goVoiceCloneManagement">
+          <img loading="lazy" alt="" src="@/assets/header/voice.png" :style="{
+            filter:
+              $route.path === '/voice-clone-management'
+                ? 'brightness(0) invert(1)'
+                : 'None',
+          }" />
          <span class="nav-text">{{ $t("header.voiceCloneManagement") }}</span>
        </div>

        <!-- 超级管理员显示音色克隆下拉菜单 -->
-        <el-dropdown
-          v-if="isSuperAdmin"
-          trigger="click"
-          class="equipment-management more-dropdown"
-          :class="{
-            'active-tab':
-              $route.path === '/voice-clone-management' ||
-              $route.path === '/voice-resource-management',
-          }"
-          @visible-change="handleVoiceCloneDropdownVisibleChange"
-        >
+        <el-dropdown v-if="isSuperAdmin" trigger="click" class="equipment-management more-dropdown" :class="{
+          'active-tab':
+            $route.path === '/voice-clone-management' ||
+            $route.path === '/voice-resource-management',
+        }" @visible-change="handleVoiceCloneDropdownVisibleChange">
          <span class="el-dropdown-link">
-            <img
-              loading="lazy"
-              alt=""
-              src="@/assets/header/voice.png"
-              :style="{
-                filter:
-                  $route.path === '/voice-clone-management' ||
+            <img loading="lazy" alt="" src="@/assets/header/voice.png" :style="{
+              filter:
+                $route.path === '/voice-clone-management' ||
                  $route.path === '/voice-resource-management'
-                    ? 'brightness(0) invert(1)'
-                    : 'None',
-              }"
-            />
+                  ? 'brightness(0) invert(1)'
+                  : 'None',
+            }" />
            <span class="nav-text">{{ $t("header.voiceCloneManagement") }}</span>
-            <i
-              class="el-icon-arrow-down el-icon--right"
-              :class="{ 'rotate-down': voiceCloneDropdownVisible }"
-            ></i>
+            <i class="el-icon-arrow-down el-icon--right" :class="{ 'rotate-down': voiceCloneDropdownVisible }"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item @click.native="goVoiceCloneManagement">
@@ -96,84 +64,56 @@
          </el-dropdown-menu>
        </el-dropdown>

-        <div
-          v-if="isSuperAdmin"
-          class="equipment-management"
-          :class="{ 'active-tab': $route.path === '/model-config' }"
-          @click="goModelConfig"
-        >
-          <img
-            loading="lazy"
-            alt=""
-            src="@/assets/header/model_config.png"
-            :style="{
-              filter:
-                $route.path === '/model-config' ? 'brightness(0) invert(1)' : 'None',
-            }"
-          />
+        <div v-if="isSuperAdmin" class="equipment-management" :class="{ 'active-tab': $route.path === '/model-config' }"
+          @click="goModelConfig">
+          <img loading="lazy" alt="" src="@/assets/header/model_config.png" :style="{
+            filter:
+              $route.path === '/model-config' ? 'brightness(0) invert(1)' : 'None',
+          }" />
          <span class="nav-text">{{ $t("header.modelConfig") }}</span>
        </div>
-        <div
-          v-if="isSuperAdmin"
-          class="equipment-management"
+        <div class="equipment-management"
          :class="{ 'active-tab': $route.path === '/knowledge-base-management' || $route.path === '/knowledge-file-upload' }"
-          @click="goKnowledgeBaseManagement"
-        >
-          <img
-            loading="lazy"
-            alt=""
-            src="@/assets/header/knowledge_base.png"
-            :style="{
-              filter:
-                $route.path === '/knowledge-base-management' || $route.path === '/knowledge-file-upload' ? 'brightness(0) invert(1)' : 'None',
-            }"
-          />
+          @click="goKnowledgeBaseManagement">
+          <img loading="lazy" alt="" src="@/assets/header/knowledge_base.png" :style="{
+            filter:
+              $route.path === '/knowledge-base-management' || $route.path === '/knowledge-file-upload' ? 'brightness(0) invert(1)' : 'None',
+          }" />
          <span class="nav-text">{{ $t("header.knowledgeBase") }}</span>
        </div>
-        <el-dropdown
-          v-if="isSuperAdmin"
-          trigger="click"
-          class="equipment-management more-dropdown"
-          :class="{
-            'active-tab':
-              $route.path === '/dict-management' ||
-              $route.path === '/params-management' ||
-              $route.path === '/provider-management' ||
-              $route.path === '/server-side-management' ||
-              $route.path === '/agent-template-management' ||
-              $route.path === '/ota-management' ||
-              $route.path === '/user-management',
-          }"
-          @visible-change="handleParamDropdownVisibleChange"
-        >
+        <el-dropdown v-if="isSuperAdmin" trigger="click" class="equipment-management more-dropdown" :class="{
+          'active-tab':
+            $route.path === '/dict-management' ||
+            $route.path === '/params-management' ||
+            $route.path === '/provider-management' ||
+            $route.path === '/server-side-management' ||
+            $route.path === '/agent-template-management' ||
+            $route.path === '/ota-management' ||
+            $route.path === '/user-management',
+        }" @visible-change="handleParamDropdownVisibleChange">
          <span class="el-dropdown-link">
-            <img
-              loading="lazy"
-              alt=""
-              src="@/assets/header/param_management.png"
-              :style="{
-                filter:
-                  $route.path === '/dict-management' ||
+            <img loading="lazy" alt="" src="@/assets/header/param_management.png" :style="{
+              filter:
+                $route.path === '/dict-management' ||
                  $route.path === '/params-management' ||
                  $route.path === '/provider-management' ||
                  $route.path === '/server-side-management' ||
                  $route.path === '/agent-template-management' ||
                  $route.path === '/ota-management' ||
                  $route.path === '/user-management'
-                    ? 'brightness(0) invert(1)'
-                    : 'None',
-              }"
-            />
+                  ? 'brightness(0) invert(1)'
+                  : 'None',
+            }" />
            <span class="nav-text">{{ $t("header.paramDictionary") }}</span>
-            <i
-              class="el-icon-arrow-down el-icon--right"
-              :class="{ 'rotate-down': paramDropdownVisible }"
-            ></i>
+            <i class="el-icon-arrow-down el-icon--right" :class="{ 'rotate-down': paramDropdownVisible }"></i>
          </span>
          <el-dropdown-menu slot="dropdown">
            <el-dropdown-item @click.native="goParamManagement">
              {{ $t("header.paramManagement") }}
            </el-dropdown-item>
+            <el-dropdown-item @click.native="goUserManagement">
+              {{ $t("header.userManagement") }}
+            </el-dropdown-item>
            <el-dropdown-item @click.native="goOtaManagement">
              {{ $t("header.otaManagement") }}
            </el-dropdown-item>
@@ -189,94 +129,46 @@
            <el-dropdown-item @click.native="goServerSideManagement">
              {{ $t("header.serverSideManagement") }}
            </el-dropdown-item>
-            <el-dropdown-item @click.native="goUserManagement">
-              {{ $t("header.userManagement") }}
-            </el-dropdown-item>
          </el-dropdown-menu>
        </el-dropdown>
      </div>

      <!-- 右侧元素 -->
      <div class="header-right">
-        <div
-          class="search-container"
-          v-if="$route.path === '/home' && !(isSuperAdmin && isSmallScreen)"
-        >
+        <div class="search-container" v-if="$route.path === '/home' && !(isSuperAdmin && isSmallScreen)">
          <div class="search-wrapper">
-            <el-input
-              v-model="search"
-              :placeholder="$t('header.searchPlaceholder')"
-              class="custom-search-input"
-              @keyup.enter.native="handleSearch"
-              @focus="showSearchHistory"
-              @blur="hideSearchHistory"
-              clearable
-              ref="searchInput"
-            >
-              <i
-                slot="suffix"
-                class="el-icon-search search-icon"
-                @click="handleSearch"
-              ></i>
+            <el-input v-model="search" :placeholder="$t('header.searchPlaceholder')" class="custom-search-input"
+              @keyup.enter.native="handleSearch" @focus="showSearchHistory" @blur="hideSearchHistory" clearable
+              ref="searchInput">
+              <i slot="suffix" class="el-icon-search search-icon" @click="handleSearch"></i>
            </el-input>
            <!-- 搜索历史下拉框 -->
-            <div
-              v-if="showHistory && searchHistory.length > 0"
-              class="search-history-dropdown"
-            >
+            <div v-if="showHistory && searchHistory.length > 0" class="search-history-dropdown">
              <div class="search-history-header">
                <span>{{ $t("header.searchHistory") }}</span>
-                <el-button
-                  type="text"
-                  size="small"
-                  class="clear-history-btn"
-                  @click="clearSearchHistory"
-                >
+                <el-button type="text" size="small" class="clear-history-btn" @click="clearSearchHistory">
                  {{ $t("header.clearHistory") }}
                </el-button>
              </div>
              <div class="search-history-list">
-                <div
-                  v-for="(item, index) in searchHistory"
-                  :key="index"
-                  class="search-history-item"
-                  @click.stop="selectSearchHistory(item)"
-                >
+                <div v-for="(item, index) in searchHistory" :key="index" class="search-history-item"
+                  @click.stop="selectSearchHistory(item)">
                  <span class="history-text">{{ item }}</span>
-                  <i
-                    class="el-icon-close clear-item-icon"
-                    @click.stop="removeSearchHistory(index)"
-                  ></i>
+                  <i class="el-icon-close clear-item-icon" @click.stop="removeSearchHistory(index)"></i>
                </div>
              </div>
            </div>
          </div>
        </div>

-        <img
-          loading="lazy"
-          alt=""
-          src="@/assets/home/avatar.png"
-          class="avatar-img"
-          @click="handleAvatarClick"
-        />
+        <img loading="lazy" alt="" src="@/assets/home/avatar.png" class="avatar-img" @click="handleAvatarClick" />
        <span class="el-dropdown-link" @click="handleAvatarClick">
          {{ userInfo.username || "加载中..." }}
-          <i
-            class="el-icon-arrow-down el-icon--right"
-            :class="{ 'rotate-down': userMenuVisible }"
-          ></i>
+          <i class="el-icon-arrow-down el-icon--right" :class="{ 'rotate-down': userMenuVisible }"></i>
        </span>
-        <el-cascader
-          :options="userMenuOptions"
-          trigger="click"
-          :props="cascaderProps"
-          style="width: 0px; overflow: hidden"
-          :show-all-levels="false"
-          @change="handleCascaderChange"
-          @visible-change="handleUserMenuVisibleChange"
-          ref="userCascader"
-        >
+        <el-cascader :options="userMenuOptions" trigger="click" :props="cascaderProps"
+          style="width: 0px; overflow: hidden" :show-all-levels="false" @change="handleCascaderChange"
+          @visible-change="handleUserMenuVisibleChange" ref="userCascader">
          <template slot-scope="{ data }">
            <span>{{ data.label }}</span>
          </template>
@@ -871,7 +763,7 @@ export default {
  color: #ff4949;
 }

-.custom-search-input >>> .el-input__inner {
+.custom-search-input>>>.el-input__inner {
  height: 18px;
  border-radius: 9px;
  background-color: #fff;
@@ -941,6 +833,7 @@ export default {
  color: #606266;
  white-space: nowrap;
 }
+
 /* 添加倒三角旋转样式 */
 .rotate-down {
  transform: rotate(180deg);
@@ -1,46 +1,17 @@
 <template>
-  <el-dialog
-    :title="title"
-    :visible="dialogVisible"
-    width="600px"
-    class="knowledge-base-dialog"
-    @close="handleClose">
-    <el-form
-      ref="knowledgeBaseForm"
-      :model="form"
-      :rules="rules"
-      label-width="100px"
-      size="medium">
+  <el-dialog :title="title" :visible="dialogVisible" width="600px" class="knowledge-base-dialog" @close="handleClose">
+    <el-form ref="knowledgeBaseForm" :model="form" :rules="rules" label-width="100px" size="medium">
      <el-form-item :label="$t('knowledgeBaseDialog.name')" prop="name">
-        <el-input
-          v-model="form.name"
-          :placeholder="$t('knowledgeBaseDialog.namePlaceholder')"
-          clearable></el-input>
+        <el-input v-model="form.name" :placeholder="$t('knowledgeBaseDialog.namePlaceholder')" clearable></el-input>
      </el-form-item>
      <el-form-item :label="$t('knowledgeBaseDialog.description')" prop="description">
-        <el-input
-          v-model="form.description"
-          :placeholder="$t('knowledgeBaseDialog.descriptionPlaceholder')"
-          type="textarea"
-          :rows="4"
-          maxlength="200"
-          show-word-limit></el-input>
+        <el-input v-model="form.description" :placeholder="$t('knowledgeBaseDialog.descriptionPlaceholder')"
+          type="textarea" :rows="4" maxlength="200" show-word-limit></el-input>
      </el-form-item>
      <el-form-item :label="$t('knowledgeBaseDialog.ragModel')" prop="ragModelId">
-        <el-select
-          v-model="form.ragModelId"
-          :placeholder="$t('knowledgeBaseDialog.ragModelPlaceholder')"
-          clearable
-          filterable
-          style="width: 100%"
-          @focus="loadRAGModels">
-          <el-option
-            v-for="model in ragModels"
-            :key="model.id"
-            :label="model.modelName"
-            :value="model.id">
-            <span style="float: left">{{ model.modelName }}</span>
-            <span style="float: right; color: #8492a6; font-size: 13px">{{ model.providerCode }}</span>
+        <el-select v-model="form.ragModelId" :placeholder="$t('knowledgeBaseDialog.ragModelPlaceholder')" clearable
+          filterable style="width: 100%" @focus="loadRAGModels">
+          <el-option v-for="model in ragModels" :key="model.id" :label="model.modelName" :value="model.id">
          </el-option>
        </el-select>
      </el-form-item>
@@ -123,12 +94,12 @@ export default {
      if (val) {
        // 对话框显示时加载RAG模型列表
        this.loadRAGModels();
-        
+
        // 如果是新增知识库且没有设置ragModelId，则默认选择第一个RAG模型
        if (!this.form.id && !this.form.ragModelId && this.ragModels.length > 0) {
          this.$set(this.form, 'ragModelId', this.ragModels[0].id);
        }
-        
+
        if (this.$refs.knowledgeBaseForm) {
          this.$refs.knowledgeBaseForm.clearValidate();
        }
@@ -170,14 +141,14 @@ export default {
      if (this.ragModels.length > 0) {
        return; // 已经加载过，避免重复加载
      }
-      
+
      console.log('开始加载RAG模型列表');
      Api.model.getRAGModels((res) => {
        console.log('RAG模型列表响应:', res);
        if (res.data && res.data.code === 0) {
-          this.ragModels = res.data.data?.list || [];
+          this.ragModels = res.data.data || [];
          console.log('RAG模型列表加载成功，共', this.ragModels.length, '个模型');
-          
+
          // 如果是新增知识库且没有设置ragModelId，则默认选择第一个RAG模型
          if (!this.form.id && !this.form.ragModelId && this.ragModels.length > 0) {
            this.$set(this.form, 'ragModelId', this.ragModels[0].id);
@@ -199,7 +170,7 @@ export default {
    border-radius: 20px;
    overflow: hidden;
  }
-  
+
  ::v-deep .el-dialog__body {
    padding: 20px 30px;
  }