|
|
|
@ -41,8 +41,16 @@ public class RiskScoreRuleService extends ServiceImpl<RiskScoreRuleMapper, RiskS |
|
|
|
List<RiskTree> children = models.stream().filter( |
|
|
|
List<RiskTree> children = models.stream().filter( |
|
|
|
model -> { |
|
|
|
model -> { |
|
|
|
for (RiskClassModel riskClassModel : treeList) { |
|
|
|
for (RiskClassModel riskClassModel : treeList) { |
|
|
|
return item.getId().equals(riskClassModel.getPid()) && riskClassModel.getId().equals(model.getRiskScoreRuleId()); |
|
|
|
boolean b = item.getId().equals(riskClassModel.getPid()) && riskClassModel.getId().equals(model.getRiskScoreRuleId()); |
|
|
|
|
|
|
|
System.out.println("测试1当前item:【id:" + item.getId() + ",pid:" + item.getPid() |
|
|
|
|
|
|
|
+ "】,当前model:【id:" + model.getId() + ",risk_id:" + model.getRiskScoreRuleId() |
|
|
|
|
|
|
|
+ "】,当前riskClassModel:【id:" + riskClassModel.getId() + ",pid:" + riskClassModel.getPid() |
|
|
|
|
|
|
|
+ ",name:" + riskClassModel.getName() + ",size:" + riskClassModel.getSize()); |
|
|
|
|
|
|
|
return b; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
System.out.println("测试2当前item:【id:" + item.getId() + ",pid:" + item.getPid() |
|
|
|
|
|
|
|
+ "】,当前model:【id:" + model.getId() + ",risk_id:" + model.getRiskScoreRuleId() |
|
|
|
|
|
|
|
+ "】"); |
|
|
|
return false; |
|
|
|
return false; |
|
|
|
} |
|
|
|
} |
|
|
|
).map(RiskTree::of).toList(); |
|
|
|
).map(RiskTree::of).toList(); |
|
|
|
@ -50,23 +58,6 @@ public class RiskScoreRuleService extends ServiceImpl<RiskScoreRuleMapper, RiskS |
|
|
|
return node; |
|
|
|
return node; |
|
|
|
}).toList()); |
|
|
|
}).toList()); |
|
|
|
return list; |
|
|
|
return list; |
|
|
|
// List<RiskScoreRule> scoreRules = list(new LambdaQueryWrapper<RiskScoreRule>().orderByAsc(RiskScoreRule::getSortId));
|
|
|
|
|
|
|
|
// Map<Integer, List<RiskScoreRuleTree>> childMap = new HashMap<>();
|
|
|
|
|
|
|
|
// List<RiskScoreRuleTree> tree = new ArrayList<>();
|
|
|
|
|
|
|
|
// for (RiskScoreRule rule: scoreRules) {
|
|
|
|
|
|
|
|
// RiskScoreRuleTree node = new RiskScoreRuleTree();
|
|
|
|
|
|
|
|
// BeanUtils.copyProperties(rule, node);
|
|
|
|
|
|
|
|
// List<RiskScoreRuleTree> children = childMap.computeIfAbsent(node.getPid(), k -> new ArrayList<>());
|
|
|
|
|
|
|
|
// children.add(node);
|
|
|
|
|
|
|
|
// Integer pid = node.getPid();
|
|
|
|
|
|
|
|
// if (AppConstants.TREE_ROOT_ID.equals(pid)) {
|
|
|
|
|
|
|
|
// tree.add(node);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// for (RiskScoreRuleTree node : tree) {
|
|
|
|
|
|
|
|
// buildTreeRecursive(node, childMap);
|
|
|
|
|
|
|
|
// }
|
|
|
|
|
|
|
|
// return tree;
|
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
public List<RiskScoreRuleTree> oldBuildTree() { |
|
|
|
public List<RiskScoreRuleTree> oldBuildTree() { |
|
|
|
|