전략 시간봉 오류 수정
This commit is contained in:
@@ -100,9 +100,35 @@ public class StrategyTriggerBranchEvaluator {
|
||||
}
|
||||
}
|
||||
|
||||
JsonNode wrapped = findTimeframeWrapper(node);
|
||||
if (wrapped != null) {
|
||||
String ct = LiveStrategyTimeframeService.normalize(wrapped.path("candleType").asText("1m"));
|
||||
JsonNode sub = firstChild(wrapped);
|
||||
return new BranchScope("SINGLE", List.of(new BranchDef(ct, sub != null && !sub.isNull() ? sub : node)));
|
||||
}
|
||||
|
||||
return new BranchScope("SINGLE", List.of(new BranchDef("1m", node)));
|
||||
}
|
||||
|
||||
/** 레거시 DSL — 루트가 TIMEFRAME이 아닐 때 하위 TIMEFRAME 래퍼 탐색 */
|
||||
private static JsonNode findTimeframeWrapper(JsonNode node) {
|
||||
if (node == null || node.isNull()) return null;
|
||||
if ("TIMEFRAME".equals(node.path("type").asText(""))) return node;
|
||||
|
||||
JsonNode children = node.path("children");
|
||||
if (children.isArray()) {
|
||||
for (JsonNode child : children) {
|
||||
JsonNode found = findTimeframeWrapper(child);
|
||||
if (found != null) return found;
|
||||
}
|
||||
}
|
||||
JsonNode child = node.path("child");
|
||||
if (!child.isMissingNode() && !child.isNull()) {
|
||||
return findTimeframeWrapper(child);
|
||||
}
|
||||
return null;
|
||||
}
|
||||
|
||||
private static JsonNode firstChild(JsonNode timeframeNode) {
|
||||
JsonNode children = timeframeNode.path("children");
|
||||
if (children.isArray() && !children.isEmpty()) return children.get(0);
|
||||
|
||||
Reference in New Issue
Block a user