Commit cbcf8d53f91fe5a9a59cc3b1580bf87cd661d67f
1 parent
7fa54e4a
添加未清选择 改成动态引导语
Showing
1 changed file
with
47 additions
and
45 deletions
src/main/java/com/xly/tool/DynamicToolProvider.java
| @@ -301,57 +301,59 @@ public class DynamicToolProvider implements ToolProvider { | @@ -301,57 +301,59 @@ public class DynamicToolProvider implements ToolProvider { | ||
| 301 | } | 301 | } |
| 302 | 302 | ||
| 303 | for (String sVaule : addValue) { | 303 | for (String sVaule : addValue) { |
| 304 | - List<ParamRule> paramRuleDataD = paramRuleDataAllNew.stream() | ||
| 305 | - .filter(d -> d.getBDynamicParam() | ||
| 306 | - && sVaule.equals(d.getSDynamicParam()) | ||
| 307 | - && one.getSParam().equals(d.getSDynamicParamName())) | ||
| 308 | - .collect(Collectors.toList()); | ||
| 309 | - | ||
| 310 | - // 如果不存在，则添加 | ||
| 311 | - if (ObjectUtil.isEmpty(paramRuleDataD)) { | ||
| 312 | - searMap.put("sRuleId", one.getSId()); | ||
| 313 | - searMap.put("sTooId", one.getSParentId()); | ||
| 314 | - searMap.put("sParam", one.getSParam()); | ||
| 315 | - searMap.put("sParamValue", sVaule); | ||
| 316 | - searMap.put("sParamName", one.getSParam()); | ||
| 317 | - searMap.put("argsNew", JSONObject.toJSONString(args)); | ||
| 318 | - searMap.put("argsAll", JSONObject.toJSONString(finalArgsOld)); | ||
| 319 | - | ||
| 320 | - String sSql = one.getSDynamicParamRuleSql(); | ||
| 321 | - List<Map<String, Object>> dynamicParamRuleOne = new ArrayList<>(); | ||
| 322 | - | ||
| 323 | - if (sSql.replaceAll(" ", "").toLowerCase().startsWith("select") | ||
| 324 | - || sSql.replaceAll(" ", "").toLowerCase().startsWith("call")) { | ||
| 325 | - try { | ||
| 326 | - List<Map<String, Object>> selectData = | ||
| 327 | - this.dynamicExeDbService.findSql(searMap, sSql); | ||
| 328 | - if (ObjectUtil.isNotEmpty(selectData)) { | ||
| 329 | - String sData = (ObjectUtil.isNotEmpty(selectData) | ||
| 330 | - && ObjectUtil.isNotEmpty(selectData.get(0).get("sData"))) | ||
| 331 | - ? selectData.get(0).get("sData").toString() | ||
| 332 | - : StrUtil.EMPTY; | ||
| 333 | - if (ObjectUtil.isNotEmpty(sData)) { | ||
| 334 | - dynamicParamRuleOne = JsonUtils.toList(sData, Map.class); | 304 | + if(ObjectUtil.isNotEmpty(sVaule) && StrUtil.isNotEmpty(sVaule)){ |
| 305 | + List<ParamRule> paramRuleDataD = paramRuleDataAllNew.stream() | ||
| 306 | + .filter(d -> d.getBDynamicParam() | ||
| 307 | + && sVaule.equals(d.getSDynamicParam()) | ||
| 308 | + && one.getSParam().equals(d.getSDynamicParamName())) | ||
| 309 | + .collect(Collectors.toList()); | ||
| 310 | + | ||
| 311 | + // 如果不存在，则添加 | ||
| 312 | + if (ObjectUtil.isEmpty(paramRuleDataD)) { | ||
| 313 | + searMap.put("sRuleId", one.getSId()); | ||
| 314 | + searMap.put("sTooId", one.getSParentId()); | ||
| 315 | + searMap.put("sParam", one.getSParam()); | ||
| 316 | + searMap.put("sParamValue", sVaule); | ||
| 317 | + searMap.put("sParamName", one.getSParam()); | ||
| 318 | + searMap.put("argsNew", JSONObject.toJSONString(args)); | ||
| 319 | + searMap.put("argsAll", JSONObject.toJSONString(finalArgsOld)); | ||
| 320 | + | ||
| 321 | + String sSql = one.getSDynamicParamRuleSql(); | ||
| 322 | + List<Map<String, Object>> dynamicParamRuleOne = new ArrayList<>(); | ||
| 323 | + | ||
| 324 | + if (sSql.replaceAll(" ", "").toLowerCase().startsWith("select") | ||
| 325 | + || sSql.replaceAll(" ", "").toLowerCase().startsWith("call")) { | ||
| 326 | + try { | ||
| 327 | + List<Map<String, Object>> selectData = | ||
| 328 | + this.dynamicExeDbService.findSql(searMap, sSql); | ||
| 329 | + if (ObjectUtil.isNotEmpty(selectData)) { | ||
| 330 | + String sData = (ObjectUtil.isNotEmpty(selectData) | ||
| 331 | + && ObjectUtil.isNotEmpty(selectData.get(0).get("sData"))) | ||
| 332 | + ? selectData.get(0).get("sData").toString() | ||
| 333 | + : StrUtil.EMPTY; | ||
| 334 | + if (ObjectUtil.isNotEmpty(sData)) { | ||
| 335 | + dynamicParamRuleOne = JsonUtils.toList(sData, Map.class); | ||
| 336 | + } | ||
| 335 | } | 337 | } |
| 338 | + } catch (Exception e) { | ||
| 339 | + log.error("执行动态参数SQL失败", e); | ||
| 336 | } | 340 | } |
| 337 | - } catch (Exception e) { | ||
| 338 | - log.error("执行动态参数SQL失败", e); | ||
| 339 | } | 341 | } |
| 340 | - } | ||
| 341 | 342 | ||
| 342 | - if (ObjectUtil.isNotEmpty(dynamicParamRuleOne)) { | ||
| 343 | - for (Map<String, Object> dynamicParamRuleData : dynamicParamRuleOne) { | ||
| 344 | - ParamRule paramRule = BeanUtil.toBean(dynamicParamRuleData, ParamRule.class); | ||
| 345 | - if (!RuleCode.CONST.getCode().equals(paramRule.getSRule()) | ||
| 346 | - && ObjectUtil.isNotEmpty(paramRule.getSParamConfig()) | ||
| 347 | - && JSONUtil.isTypeJSON(paramRule.getSParamConfig())) { | ||
| 348 | - try { | ||
| 349 | - getConstMeg(paramRule); | ||
| 350 | - } catch (Exception e) { | ||
| 351 | - log.error("获取常量配置失败", e); | 343 | + if (ObjectUtil.isNotEmpty(dynamicParamRuleOne)) { |
| 344 | + for (Map<String, Object> dynamicParamRuleData : dynamicParamRuleOne) { | ||
| 345 | + ParamRule paramRule = BeanUtil.toBean(dynamicParamRuleData, ParamRule.class); | ||
| 346 | + if (!RuleCode.CONST.getCode().equals(paramRule.getSRule()) | ||
| 347 | + && ObjectUtil.isNotEmpty(paramRule.getSParamConfig()) | ||
| 348 | + && JSONUtil.isTypeJSON(paramRule.getSParamConfig())) { | ||
| 349 | + try { | ||
| 350 | + getConstMeg(paramRule); | ||
| 351 | + } catch (Exception e) { | ||
| 352 | + log.error("获取常量配置失败", e); | ||
| 353 | + } | ||
| 352 | } | 354 | } |
| 355 | + dynamicParamRule.add(paramRule); | ||
| 353 | } | 356 | } |
| 354 | - dynamicParamRule.add(paramRule); | ||
| 355 | } | 357 | } |
| 356 | } | 358 | } |
| 357 | } | 359 | } |