From 29c7b2a92029c8bf18b4203e7c8d0607abe7a51c Mon Sep 17 00:00:00 2001
From: JianYu Zheng <2375294554@qq.com>
Date: Wed, 23 Jul 2025 15:59:22 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=EF=BC=9A=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=99=BA=E8=83=BD=E4=BD=93=E9=85=8D=E7=BD=AE=E6=96=B9=E6=B3=95?=
 =?UTF-8?q?=20--AgentServiceImpl.java=20=E4=BF=9D=E5=AD=98=E6=99=BA?=
 =?UTF-8?q?=E8=83=BD=E4=BD=93=E9=85=8D=E7=BD=AE=E6=96=B9=E6=B3=95=EF=BC=8C?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0`=E5=A4=A7=E8=AF=AD=E8=A8=80=E6=A8=A1?=
 =?UTF-8?q?=E5=9E=8B=E5=92=8C=E6=84=8F=E5=9B=BE=E8=AF=86=E5=88=AB=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E7=AC=A6=E5=90=88=E5=8C=B9=E9=85=8D`=E7=9A=84?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E9=AA=8C=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../agent/service/impl/AgentServiceImpl.java  | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)

diff --git a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
index 36aa1192..f07b7c14 100644
--- a/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
+++ b/main/manager-api/src/main/java/xiaozhi/modules/agent/service/impl/AgentServiceImpl.java
@@ -41,6 +41,7 @@ import xiaozhi.modules.agent.service.AgentTemplateService;
 import xiaozhi.modules.agent.vo.AgentInfoVO;
 import xiaozhi.modules.device.service.DeviceService;
 import xiaozhi.modules.model.dto.ModelProviderDTO;
+import xiaozhi.modules.model.entity.ModelConfigEntity;
 import xiaozhi.modules.model.service.ModelConfigService;
 import xiaozhi.modules.model.service.ModelProviderService;
 import xiaozhi.modules.security.user.SecurityUser;
@@ -324,9 +325,31 @@ public class AgentServiceImpl extends BaseServiceImpl<AgentDao, AgentEntity> imp
             // 删除音频数据
             agentChatHistoryService.deleteByAgentId(existingEntity.getId(), true, false);
         }
+
+        boolean b = validateLLMIntentParams(dto.getLlmModelId(), dto.getIntentModelId());
+        if(!b){
+            throw new RenException("LLM大模型和Intent意图识别，选择参数不匹配");
+        }
         this.updateById(existingEntity);
     }
 
+    /**
+     * 验证大语言模型和意图识别的参数是否符合匹配
+     * @param llmModelId 大语言模型id
+     * @param intentModelId 意图识别id
+     * @return T 匹配 : F 不匹配
+     */
+    private boolean validateLLMIntentParams(String llmModelId,String intentModelId){
+        ModelConfigEntity llmModelData = modelConfigService.selectById(llmModelId);
+        String type = llmModelData.getConfigJson().get("type").toString();
+        // 如果查询大语言模型是openai或者ollama，意图识别选参数都可以
+        if("openai".equals(type) || "ollama".equals(type)){
+            return true;
+        }
+        // 除了openai和ollama的类型，不可以选择id为Intent_nointent（无意图识别）的意图识别
+        return !"Intent_nointent".equals(intentModelId);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public String createAgent(AgentCreateDTO dto) {