diff --git a/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java b/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java index cb7fb8e..599316a 100644 --- a/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java +++ b/radar-admin/src/main/java/com/pgmmers/radar/controller/ActivationApiController.java @@ -77,7 +77,7 @@ public class ActivationApiController { return activationService.query(query); } - @GetMapping("/datacolumns/{modelId}") + @GetMapping("/feature/columns/{modelId}") public CommonResult getDataColumns(@PathVariable Long modelId) { List list = new ArrayList(); // 1、Data @@ -124,7 +124,7 @@ public class ActivationApiController { return result; } - @GetMapping("/absColumns/{modelId}") + @GetMapping("/abstraction/columns/{modelId}") public CommonResult getAbstractionColumns(@PathVariable Long modelId) { CommonResult result = new CommonResult(); result.setSuccess(true); @@ -140,7 +140,7 @@ public class ActivationApiController { return result; } - @GetMapping("/rulecolumns/{modelId}") + @GetMapping("/rule/columns/{modelId}") public CommonResult getRuleColumns(@PathVariable Long modelId) { List list = new ArrayList<>(); List listActivation=activationService.listActivation(modelId); diff --git a/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/engine/AntiFraudEngineImpl.java b/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/engine/AntiFraudEngineImpl.java index 65eae35..ead3ea9 100644 --- a/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/engine/AntiFraudEngineImpl.java +++ b/radar-service-impl/src/main/java/com/pgmmers/radar/service/impl/engine/AntiFraudEngineImpl.java @@ -362,17 +362,19 @@ public class AntiFraudEngineImpl implements AntiFraudEngine { default: } BigDecimal amount = initScore.add(extra); + // 规则得分设置最大值. + if (maxScore.compareTo(BigDecimal.ZERO) > 0 && amount.compareTo(maxScore) > 0) { + amount = maxScore; + } + sum = sum.add(amount); + + // hit detail HitObject hit = new HitObject(); hit.setKey(rule.getId().toString()); hit.setDesc(rule.getLabel()); hit.setValue(amount.setScale(2, 4).doubleValue()); result.getHitRulesMap().get(act.getActivationName()).add(hit); result.getHitRulesMap2().get(act.getActivationName()).put("rule_"+ hit.getKey(), hit); - // 规则得分设置最大值. - if (maxScore.compareTo(BigDecimal.ZERO) > 0 && amount.compareTo(maxScore) > 0) { - amount = maxScore; - } - sum = sum.add(amount); } }