From 147b3fd8f5e68c7161adec491ce9cba154a9451e Mon Sep 17 00:00:00 2001 From: ageer Date: Sat, 24 May 2025 20:06:19 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=9F=A5=E8=AF=A2ppt=20apikey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../org/ruoyi/service/IChatModelService.java | 5 ++ .../service/impl/ChatModelServiceImpl.java | 7 ++- ruoyi-modules-api/ruoyi-knowledge-api/pom.xml | 52 ++++--------------- .../org/ruoyi/chat/config/OkHttpConfig.java | 4 +- .../controller/chat/ChatModelController.java | 10 ++++ 5 files changed, 34 insertions(+), 44 deletions(-) diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatModelService.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatModelService.java index 4b1d9bd8..2b320102 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatModelService.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/IChatModelService.java @@ -3,6 +3,7 @@ package org.ruoyi.service; import org.ruoyi.core.page.TableDataInfo; import org.ruoyi.core.page.PageQuery; +import org.ruoyi.domain.ChatModel; import org.ruoyi.domain.bo.ChatModelBo; import org.ruoyi.domain.vo.ChatModelVo; @@ -53,4 +54,8 @@ public interface IChatModelService { */ ChatModelVo selectModelByName(String modelName); + /** + * 获取ppt模型信息 + */ + ChatModel getPPT(); } diff --git a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java index 553032ef..c08fcdbe 100644 --- a/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java +++ b/ruoyi-modules-api/ruoyi-chat-api/src/main/java/org/ruoyi/service/impl/ChatModelServiceImpl.java @@ -120,8 +120,11 @@ public class ChatModelServiceImpl implements IChatModelService { */ @Override public ChatModelVo selectModelByName(String modelName) { - return baseMapper.selectVoOne(Wrappers.lambdaQuery().eq(ChatModel::getModelName, modelName)); + return baseMapper.selectVoOne(Wrappers.lambdaQuery().eq(ChatModel::getModelName, modelName)); } - + @Override + public ChatModel getPPT() { + return baseMapper.selectOne(Wrappers.lambdaQuery().eq(ChatModel::getModelName, "ppt")); + } } diff --git a/ruoyi-modules-api/ruoyi-knowledge-api/pom.xml b/ruoyi-modules-api/ruoyi-knowledge-api/pom.xml index 4b4c1fe6..f7e91879 100644 --- a/ruoyi-modules-api/ruoyi-knowledge-api/pom.xml +++ b/ruoyi-modules-api/ruoyi-knowledge-api/pom.xml @@ -33,6 +33,17 @@ + + commons-io + commons-io + 2.17.0 + + + + org.ruoyi + ruoyi-system-api + + org.apache.pdfbox @@ -52,18 +63,11 @@ langchain4j - dev.langchain4j langchain4j-weaviate - - dev.langchain4j - langchain4j-embeddings-all-minilm-l6-v2 - - - org.testcontainers weaviate @@ -80,45 +84,11 @@ langchain4j-ollama - - dev.langchain4j - langchain4j-milvus - - - - org.testcontainers - milvus - 1.19.6 - - - - - dev.langchain4j - langchain4j-qdrant - - - - org.testcontainers - qdrant - 1.19.6 - - dev.langchain4j langchain4j-document-parser-apache-tika - - - commons-io - commons-io - 2.17.0 - - - org.ruoyi - ruoyi-system-api - - diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/config/OkHttpConfig.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/config/OkHttpConfig.java index 907569a1..bf5706ce 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/config/OkHttpConfig.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/config/OkHttpConfig.java @@ -25,11 +25,13 @@ public class OkHttpConfig { public void init() { initializeOkHttpUtil("suno"); initializeOkHttpUtil("luma"); - initializeOkHttpUtil("ppt"); } private void initializeOkHttpUtil(String modelName) { ChatModelVo chatModelVo = chatModelService.selectModelByName(modelName); + if(chatModelVo==null){ + return; + } OkHttpUtil okHttpUtil = new OkHttpUtil(); okHttpUtil.setApiHost(chatModelVo.getApiHost()); okHttpUtil.setApiKey(chatModelVo.getApiKey()); diff --git a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatModelController.java b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatModelController.java index e19cb1af..7e81ed19 100644 --- a/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatModelController.java +++ b/ruoyi-modules/ruoyi-chat/src/main/java/org/ruoyi/chat/controller/chat/ChatModelController.java @@ -10,6 +10,7 @@ import org.ruoyi.chat.enums.DisplayType; import org.ruoyi.common.excel.utils.ExcelUtil; import org.ruoyi.common.idempotent.annotation.RepeatSubmit; import org.ruoyi.core.page.TableDataInfo; +import org.ruoyi.domain.ChatModel; import org.ruoyi.domain.bo.ChatModelBo; import org.ruoyi.domain.vo.ChatModelVo; import org.ruoyi.service.IChatModelService; @@ -55,6 +56,15 @@ public class ChatModelController extends BaseController { return R.ok(chatModelService.queryList(bo)); } + + /** + * 查询ppt模型信息 + */ + @GetMapping("/getPPT") + public R getPPT() { + return R.ok(chatModelService.getPPT()); + } + /** * 导出聊天模型列表 */