添加未清选择改成动态引导语

qianbao
1 parent 3844bfb4
Showing 8 changed files with 32 additions and 27 deletions
src/main/java/com/xly/entity/SceneDto.java
src/main/java/com/xly/entity/ToolMeta.java
src/main/java/com/xly/mapper/SceneMapper.java
src/main/java/com/xly/mapper/ToolMetaMapper.java
src/main/java/com/xly/service/QuoService.java
src/main/java/com/xly/service/XlyErpService.java
src/main/java/com/xly/tool/DynamicToolProvider.java
src/main/resources/application.yml
@@ -42,6 +42,8 @@ public class SceneDto {
     private String sSceneContext;
+    private String sKnowledgeBase;
+
     private String sStatus;
@@ -52,7 +52,6 @@ public class ToolMeta {
     private String sVectorjson;
     private String sVectorfiledAll;
     private String sVectorfiledShow;
-    private String sKnowledgeBase;
     private String sTsMemo;
     private Boolean sQue = false;
     private Boolean bQuo = false;
@@ -11,6 +11,6 @@ import java.util.List;
 public interface SceneMapper {
     // XML配置方式
-    @Select("SELECT * FROM ai_agent order by iOrder")
+    @Select("SELECT A.*,fun_ai_getsKnowledgeBase(A.sId) AS sKnowledgeBase FROM ai_agent AS A order by iOrder")
     List<SceneDto> findAll();
 }
 \ No newline at end of file
@@ -13,6 +13,6 @@ import java.util.List;
 public interface ToolMetaMapper {
     // XML配置方式
-    @Select("SELECT A.*,fun_ai_getsKnowledgeBase(A.sId) AS sKnowledgeBase FROM ai_tool AS A order by iOrder")
+    @Select("SELECT A.* FROM ai_tool AS A order by iOrder")
     List<ToolMeta> findAll();
 }
 \ No newline at end of file
@@ -2,9 +2,7 @@ package com.xly.service;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.extra.pinyin.PinyinUtil;
 import cn.hutool.json.JSONUtil;
-import com.alibaba.fastjson2.JSONObject;
 import com.xly.entity.ParamRule;
 import com.xly.entity.UserSceneSession;
 import lombok.RequiredArgsConstructor;
@@ -40,7 +38,9 @@ public class QuoService {
             if(ObjectUtil.isEmpty(args)){
                 args = new HashMap<>();
             }
-            List<ParamRule> dataAll = session.getCurrentTool().getParamRuleListAll();
+            List<ParamRule> dataAllData = session.getCurrentTool().getParamRuleListAll();
+
+            List<ParamRule> dataAll = dataAllData.stream().filter(one->one.getBTipModel()).collect(Collectors.toList());
             //获取产品的参数
             List<ParamRule> dataProduct = dataAll.stream().filter(one-> "产品".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
             List<ParamRule> dataPart = dataAll.stream().filter(one-> "部件".equals(one.getSGroup()) && !one.getBDynamicParam()).collect(Collectors.toUnmodifiableList());
@@ -48,6 +48,7 @@ public class QuoService {
             List<Map<String,Object>> sAll = new ArrayList<>();
             List<Map<String,Object>> productList = new ArrayList<>();
             Map<String, Object> finalArgsOld = args;
+            List<ParamRule> finalDataAll = dataAll;
             dataProduct.forEach(p->{
                 Object sVal = getValue( p,finalArgsOld);
                 List<String> addValue = new ArrayList<>();
@@ -67,7 +68,7 @@ public class QuoService {
                     product.put("iOrder", p.getIOrder());
                     product.put("sParamConfigValue",p.getSParamConfigValue()==null?StrUtil.EMPTY:p.getSParamConfigValue());
                     //获取动态参数
-                    adddynamicData( sValue, dataAll, p,  finalArgsOld, sAll,  product);
+                    adddynamicData( sValue, finalDataAll, p,  finalArgsOld, sAll,  product);
                     if(  !"sDynamicPart".equals(p.getSParamValue())
                             &&!"sDynamicPartDel".equals(p.getSParamValue())
                     ){
@@ -356,9 +356,10 @@ public class XlyErpService {
                     && ObjectUtil.isNotEmpty(session.getCurrentTool().getSStructureMemo()))
             ){
                 String sSystemPrompt =AgentSystemPrompt.sSystemPrompt;
-                if(ObjectUtil.isNotEmpty(session) && ObjectUtil.isNotEmpty(session.getCurrentTool())&&session.getCurrentTool().getBQuo()){
+                if(ObjectUtil.isNotEmpty(session) && ObjectUtil.isNotEmpty(session.getCurrentScene())
+                        && "quotemanage".equals(session.getCurrentScene().getSSceneNo())){
                     sSystemPrompt =AgentSystemPrompt.sSystemPromptQuo;
-                    sSystemPrompt = StrUtil.format(sSystemPrompt,session.getCurrentTool().getSKnowledgeBase());
+                    sSystemPrompt = StrUtil.format(sSystemPrompt,session.getCurrentScene().getSKnowledgeBase());
                 }
                 //如果客户输入了确认/生成 切换引导语言
                 if(ObjectUtil.isNotEmpty(session.getSSystemPrompt()) && isConfirmed){
@@ -369,7 +370,7 @@ public class XlyErpService {
                 }
                 //报价每次定义参数
                 if(!isConfirmed && ObjectUtil.isNotEmpty(session) && ObjectUtil.isNotEmpty(session.getCurrentTool()) && session.getCurrentTool().getBQuo()){
-                    sSystemPrompt =  SystemPromptGenerator.generate(session.getCurrentTool().getSMethodName(),session,session.getCurrentTool().getSKnowledgeBase());
+                    sSystemPrompt =  SystemPromptGenerator.generate(session.getCurrentTool().getSMethodName(),session,session.getCurrentScene().getSKnowledgeBase());
                     aiAgent = createConfirmeAgent(session);
                 }
                 Result<String> rs = aiAgent.chat(userId, input,sSystemPrompt);
@@ -470,24 +470,25 @@ public class DynamicToolProvider implements ToolProvider {
                         }
                     }
                     // 移除不在 addValue 中的动态部件
-                    paramRuleDataAllNew = paramRuleDataAllNew.stream()
-                        .filter(p -> {
-                            // 如果不是动态部件参数，保留
-                            if (!p.getBDynamicParam() || !"sDynamicPart".equals(p.getSDynamicParamName())) {
-                                return true;
-                            }
-                            // 如果是动态部件参数，检查是否在有效值列表中
-                            return validDynamicPartValues.contains(p.getSDynamicParam());
-                        })
-                        .collect(Collectors.toList());
+//                    paramRuleDataAllNew = paramRuleDataAllNew.stream()
+//                        .filter(p -> {
+//                            // 如果不是动态部件参数，保留
+//                            if (!p.getBDynamicParam() || !"sDynamicPart".equals(p.getSDynamicParamName())) {
+//                                return true;
+//                            }
+//                            // 如果是动态部件参数，检查是否在有效值列表中
+//                            return validDynamicPartValues.contains(p.getSDynamicParam());
+//                        })
+//                        .collect(Collectors.toList());
                     log.info("移除无效动态部件后，列表大小: {}", paramRuleDataAllNew.size());
-                }else{
-                    //移除不是动态部件的
-                    paramRuleDataAllNew = paramRuleDataAllNew.stream()
-                            .filter(p -> !p.getBDynamicParam() || !"sDynamicPart".equals(p.getSDynamicParamName()))
-                            .collect(Collectors.toList());
-                    log.info("sValue为空，移除所有动态部件");
                 }
+//                else{
+//                    //移除不是动态部件的
+//                    paramRuleDataAllNew = paramRuleDataAllNew.stream()
+//                            .filter(p -> !p.getBDynamicParam() || !"sDynamicPart".equals(p.getSDynamicParamName()))
+//                            .collect(Collectors.toList());
+//                    log.info("sValue为空，移除所有动态部件");
+//                }
             }
             // 4. 合并所有参数
             List<ParamRule> dataAll = new ArrayList<>(paramRuleDataAllNew);
@@ -1002,7 +1003,7 @@ public class DynamicToolProvider implements ToolProvider {
                             args.put(sValue,((List<?>) args.get(sValue)).get(0));
                         }
                     }
-                    List<Map<String,Object>> dataListNew = dataList.stream().filter(one-> one.get(sValue).equals(args.get(name)) ||  one.get(sValue).equals(args.get(sValue))).collect(Collectors.toUnmodifiableList());
+                    List<Map<String,Object>> dataListNew = dataList.stream().filter(one-> ObjectUtil.isNotEmpty(one.get(sValue)) &&(one.get(sValue).equals(args.get(name)) ||  one.get(sValue).equals(args.get(sValue)))).collect(Collectors.toUnmodifiableList());
                     if("enum".equals(sType) && ObjectUtil.isEmpty(dataListNew)){
                         args.remove(name);
                         args.remove(sValue);
@@ -136,6 +136,7 @@ langchain4j:
     # 聊天模型配置（用于一般对话）
     base-url: http://112.82.245.194:41434
 #    chat-model-name: qwen2.5:7b-instruct
+#    chat-model-name: qwen3.6-27b-iq2:latest
     chat-model-name: qwen2.5:14b
 #    chat-model-name: qwen3:14b
 #    chat-model-name: qwen3.5:9b