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

qianbao
1 parent 6953c605
Showing 2 changed files with 97 additions and 86 deletions
src/main/java/com/xly/tool/DynamicToolProvider.java
src/main/java/com/xly/util/Validator.java
@@ -250,94 +250,103 @@ public class DynamicToolProvider implements ToolProvider {
      **/
     private List<ParamRule> doSetParamgetArgsAfter(Map<String,Object> argsNew,UserSceneSession session){
         //获取当前方法
-        ToolMeta tool = session.getCurrentTool();
-        Map<String, Object> argsOld = session.getArgs();
-        Map<String, Object> args = DeepCopyUtils.deepCopy(argsNew);
-        if(ObjectUtil.isEmpty(argsOld)){
-            argsOld = new HashMap<>();
-        }
-        //根据新录入的参数获取规则
-        List<ParamRule> paramRuleDataAll = tool.getParamRuleListAll();
-        //动态参数
-        List<ParamRule> paramRuleData = paramRuleDataAll.stream().filter(one->
-                ( ObjectUtil.isNotEmpty(args.get(one.getSParam()))  || ObjectUtil.isNotEmpty(args.get(one.getSParamValue())))
-                        && ObjectUtil.isNotEmpty(one.getSDynamicParamRuleSql())
-        ).collect(Collectors.toUnmodifiableList());
-        //为空的时候需要重新插入不为空 表示之前已经放过了
         //根据新参数获取需要填写参数
         List<ParamRule> dynamicParamRule = new ArrayList<>();
-        AtomicReference<List<ParamRule>> paramRuleDataAllNew = new AtomicReference<>(paramRuleDataAll);
-        if(ObjectUtil.isNotEmpty(paramRuleData)){
-            Map<String, Object> finalArgsOld = argsOld;
-            paramRuleData.forEach(one->{
-                Map<String,Object> searMap = new HashMap<>();
-                searMap.putAll(args);
-                //新参数如果值变了移除掉之前插入的
-                 paramRuleDataAllNew.set(paramRuleDataAll.stream().filter(d ->
-                         !one.getSParam().equals(d.getSDynamicParam())
-                                 || (one.getSParam().equals(d.getSDynamicParam()) && one.getSParamValue().equals(d.getSParamValue()))
-                 ).collect(Collectors.toUnmodifiableList()));
-
-                String sValue = searMap.get(one.getSParam()).toString();
-                List<String> addValue = new ArrayList<>();
-                if(JSONUtil.isTypeJSONArray(sValue)){
-                    addValue = JSONUtil.toList(sValue,String.class);
-                }else{
-                    addValue.add(sValue);
-                }
-                for(String sVaule:addValue){
-                    //根据值获取动态部件
-                    List<ParamRule> paramRuleDataD = paramRuleDataAllNew.get().stream().filter(d ->
-                            d.getBDynamicParam()
-                                    && sValue.equals(d.getSDynamicParam())
-                                    && one.getSParam().equals(d.getSDynamicParamName())
-                    ).collect(Collectors.toUnmodifiableList());
-
-                    //如果不存在的加入方法参数中
-                    if(ObjectUtil.isEmpty(paramRuleDataD)){
-                        searMap.put("sRuleId",one.getSId());
-                        searMap.put("sTooId",one.getSParentId());
-                        searMap.put("sParam",one.getSParam());
-                        searMap.put("sParamValue",sVaule);
+        try{
+            ToolMeta tool = session.getCurrentTool();
+            Map<String, Object> argsOld = session.getArgs();
+            Map<String, Object> args = DeepCopyUtils.deepCopy(argsNew);
+            if(ObjectUtil.isEmpty(argsOld)){
+                argsOld = new HashMap<>();
+            }
+            //根据新录入的参数获取规则
+            List<ParamRule> paramRuleDataAll = tool.getParamRuleListAll();
+            //动态参数
+            List<ParamRule> paramRuleData = paramRuleDataAll.stream().filter(one->
+                    ( ObjectUtil.isNotEmpty(args.get(one.getSParam()))  || ObjectUtil.isNotEmpty(args.get(one.getSParamValue())))
+                            && ObjectUtil.isNotEmpty(one.getSDynamicParamRuleSql())
+            ).collect(Collectors.toUnmodifiableList());
+            //为空的时候需要重新插入不为空 表示之前已经放过了
+            AtomicReference<List<ParamRule>> paramRuleDataAllNew = new AtomicReference<>(paramRuleDataAll);
+            if(ObjectUtil.isNotEmpty(paramRuleData)){
+                Map<String, Object> finalArgsOld = argsOld;
+                paramRuleData.forEach(one->{
+                    Map<String,Object> searMap = new HashMap<>();
+                    searMap.putAll(args);
+                    //新参数如果值变了移除掉之前插入的
+                    paramRuleDataAllNew.set(paramRuleDataAll.stream().filter(d ->
+                            !one.getSParam().equals(d.getSDynamicParam())
+                                    || (one.getSParam().equals(d.getSDynamicParam()) && one.getSParamValue().equals(d.getSParamValue()))
+                    ).collect(Collectors.toUnmodifiableList()));
+
+                    String sValue = searMap.get(one.getSParam()).toString();
+                    List<String> addValue = new ArrayList<>();
+                    if(JSONUtil.isTypeJSONArray(sValue)){
+                        addValue = JSONUtil.toList(sValue,String.class);
+                    }else{
+                        addValue.add(sValue);
+                    }
+                    for(String sVaule:addValue){
+                        //根据值获取动态部件
+                        List<ParamRule> paramRuleDataD = paramRuleDataAllNew.get().stream().filter(d ->
+                                d.getBDynamicParam()
+                                        && sValue.equals(d.getSDynamicParam())
+                                        && one.getSParam().equals(d.getSDynamicParamName())
+                        ).collect(Collectors.toUnmodifiableList());
+
+                        //如果不存在的加入方法参数中
+                        if(ObjectUtil.isEmpty(paramRuleDataD)){
+                            searMap.put("sRuleId",one.getSId());
+                            searMap.put("sTooId",one.getSParentId());
+                            searMap.put("sParam",one.getSParam());
+                            searMap.put("sParamValue",sVaule);
 //                        searMap.put("sParamValue",one.getSParamValue());
-                        searMap.put("sParamName",one.getSParam());
-                        String sSql = one.getSDynamicParamRuleSql();
-                        searMap.put("argsNew",JSONObject.toJSONString(args));
-                        searMap.put("argsAll",JSONObject.toJSONString(finalArgsOld));
-                        //如果不是SELECT 开头
-                        List<Map<String,Object>> selectData = new ArrayList<>();
-                        List<Map<String,Object>> dynamicParamRuleOne = new ArrayList<>();
-                        if(sSql.replaceAll(" ","").toLowerCase().startsWith("select")
-                                || sSql.replaceAll(" ","").toLowerCase().startsWith("call")){
-                            selectData = this.dynamicExeDbService.findSql(searMap, sSql);
-                            String sData = (ObjectUtil.isNotEmpty(selectData)
-                                    && ObjectUtil.isNotEmpty(selectData.get(0).get("sData")))?selectData.get(0).get("sData").toString():StrUtil.EMPTY;
-                            if(ObjectUtil.isNotEmpty(sData)){
-                                dynamicParamRuleOne = JsonUtils.toList(sData,Map.class);
+                            searMap.put("sParamName",one.getSParam());
+                            String sSql = one.getSDynamicParamRuleSql();
+                            searMap.put("argsNew",JSONObject.toJSONString(args));
+                            searMap.put("argsAll",JSONObject.toJSONString(finalArgsOld));
+                            //如果不是SELECT 开头
+                            List<Map<String,Object>> selectData = new ArrayList<>();
+                            List<Map<String,Object>> dynamicParamRuleOne = new ArrayList<>();
+                            if(sSql.replaceAll(" ","").toLowerCase().startsWith("select")
+                                    || sSql.replaceAll(" ","").toLowerCase().startsWith("call")){
+                                try{
+                                    selectData = this.dynamicExeDbService.findSql(searMap, sSql);
+                                    if(ObjectUtil.isNotEmpty(selectData)){
+                                        String sData = (ObjectUtil.isNotEmpty(selectData)
+                                                && ObjectUtil.isNotEmpty(selectData.get(0).get("sData")))?selectData.get(0).get("sData").toString():StrUtil.EMPTY;
+                                        if(ObjectUtil.isNotEmpty(sData)){
+                                            dynamicParamRuleOne = JsonUtils.toList(sData,Map.class);
+                                        }
+                                    }
+                                }catch (Exception e){}
+                            }else{
+                                //表示过程走自定义参数
+                            }
+                            if(ObjectUtil.isNotEmpty(dynamicParamRuleOne)){
+                                dynamicParamRuleOne.forEach(dynamicParamRuleData->{
+                                    ParamRule paramRule =  BeanUtil.toBean(dynamicParamRuleData,ParamRule.class);
+                                    dynamicParamRule.add(paramRule);
+                                });
                             }
-                        }else{
-                            //表示过程走自定义参数
-                        }
-                        if(ObjectUtil.isNotEmpty(dynamicParamRuleOne)){
-                            dynamicParamRuleOne.forEach(dynamicParamRuleData->{
-                                ParamRule paramRule =  BeanUtil.toBean(dynamicParamRuleData,ParamRule.class);
-                                dynamicParamRule.add(paramRule);
-                            });
                         }
                     }
-                }
-            });
+                });
+            }
+            List<ParamRule> dataAll = new ArrayList<>(paramRuleDataAllNew.get());
+            dataAll.addAll(dynamicParamRule);
+            paramRuleDataAllNew.set(dataAll);
+            List<ParamRule> newList = new ArrayList<>(paramRuleDataAllNew.get());
+            List<ParamRule> dynamicParamRuleAll = Validator.deduplicateByParamValue(newList);
+            List<ParamRule> paramRuleList = dynamicParamRuleAll.stream().filter(one-> one.getBTipModel()).collect(Collectors.toUnmodifiableList());
+            List<ParamRule> paramRuleListCheck = dynamicParamRuleAll.stream().filter(one->one.getBEmpty()).collect(Collectors.toUnmodifiableList());
+            session.getCurrentTool().setParamRuleListAll(dynamicParamRuleAll);
+            session.getCurrentTool().setParamRuleListCheck(paramRuleListCheck);
+            session.getCurrentTool().setParamRuleList(paramRuleList);
+        }catch (Exception e){
+
         }
-        List<ParamRule> dataAll = new ArrayList<>(paramRuleDataAllNew.get());
-        dataAll.addAll(dynamicParamRule);
-        paramRuleDataAllNew.set(dataAll);
-        List<ParamRule> newList = new ArrayList<>(paramRuleDataAllNew.get());
-        List<ParamRule> dynamicParamRuleAll = Validator.deduplicateByParamValue(newList);
-        List<ParamRule> paramRuleList = dynamicParamRuleAll.stream().filter(one-> one.getBTipModel()).collect(Collectors.toUnmodifiableList());
-        List<ParamRule> paramRuleListCheck = dynamicParamRuleAll.stream().filter(one->one.getBEmpty()).collect(Collectors.toUnmodifiableList());
-        session.getCurrentTool().setParamRuleListAll(dynamicParamRuleAll);
-        session.getCurrentTool().setParamRuleListCheck(paramRuleListCheck);
-        session.getCurrentTool().setParamRuleList(paramRuleList);
+
         return dynamicParamRule;
     }
  
@@ -4,10 +4,7 @@ import cn.hutool.core.util.ObjectUtil;
 import com.xly.entity.ParamRule;
  
 import java.lang.reflect.Array;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
  
@@ -78,7 +75,11 @@ public class Validator {
         }
         return source.stream()
                 .collect(Collectors.toMap(
-                        ParamRule::getSParamValue,  // 根据 sParamValue 去重
+                        rule -> Arrays.asList(
+                                rule.getSParamValue(),
+                                rule.getSDynamicParam(),
+                                rule.getSDynamicParamName()
+                        ),
                         Function.identity(),
                         (existing, replacement) -> existing  // 保留第一个
                 ))
@@ -86,4 +87,5 @@ public class Validator {
                 .stream()
                 .collect(Collectors.toList());
     }
+
 }
 \ No newline at end of file