전략 시간봉 오류 수정

This commit is contained in:
Macbook
2026-05-27 15:49:56 +09:00
parent 63693d47c0
commit e86142dad5
5 changed files with 139 additions and 11 deletions
@@ -71,11 +71,21 @@ public class StrategyConditionTimeframeService {
private void collectFromNode(JsonNode node, Set<String> out) {
if (node == null || node.isNull()) return;
if (collectTimeframesFromNode(node, out)) return;
// TIMEFRAME 래핑 없는 레거시 트리 — 기본 1m
out.add("1m");
}
/**
* 트리에서 TIMEFRAME 노드를 수집. 발견 시 true.
*/
private boolean collectTimeframesFromNode(JsonNode node, Set<String> out) {
if (node == null || node.isNull()) return false;
String type = node.path("type").asText("");
if ("TIMEFRAME".equals(type)) {
out.add(LiveStrategyTimeframeService.normalize(node.path("candleType").asText("1m")));
return;
return true;
}
if ("AND".equals(type) || "OR".equals(type)) {
@@ -85,23 +95,22 @@ public class StrategyConditionTimeframeService {
for (JsonNode tf : children) {
out.add(LiveStrategyTimeframeService.normalize(tf.path("candleType").asText("1m")));
}
return;
return true;
}
boolean found = false;
for (JsonNode child : children) {
collectFromNode(child, out);
found |= collectTimeframesFromNode(child, out);
}
return;
return found;
}
}
JsonNode child = node.path("child");
if (!child.isMissingNode() && !child.isNull()) {
collectFromNode(child, out);
return;
return collectTimeframesFromNode(child, out);
}
// 단일 START(기본 1m) 또는 TIMEFRAME 래핑 없는 트리
out.add("1m");
return false;
}
private static boolean allTimeframeChildren(JsonNode children) {