aidev/goldenChart
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

다중 시간봉 전략 설정기능 추가

Browse Source
This commit is contained in:
Macbook
2026-05-25 02:49:39 +09:00
parent cc01f311bc
commit 30dedc4abc
17 changed files with 1903 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/goldenchart/service/LiveStrategyEvaluator.java
+5 -4
View File
@@ -307,8 +307,8 @@ public class LiveStrategyEvaluator {
log.debug("[Evaluator] Strategy 빌드: strategyId={} market={} barCount={}", strategyId, market, barCount);
try {
Rule entryRule = buildRule(strategy.getBuyConditionJson(), series, indicatorParams);
Rule exitRule = buildRule(strategy.getSellConditionJson(), series, indicatorParams);
Rule entryRule = buildRule(strategy.getBuyConditionJson(), series, indicatorParams, market);
Rule exitRule = buildRule(strategy.getSellConditionJson(), series, indicatorParams, market);
BaseStrategy builtStrategy = new BaseStrategy(entryRule, exitRule);
return builtStrategy;
} catch (Exception e) {
@@ -318,11 +318,12 @@ public class LiveStrategyEvaluator {
}
private Rule buildRule(String conditionJson, BarSeries series,
Map<String, Map<String, Object>> params) {
Map<String, Map<String, Object>> params,
String market) {
if (conditionJson == null || conditionJson.isBlank()) return new BooleanRule(false);
try {
JsonNode node = objectMapper.readTree(conditionJson);
return adapter.toRule(node, series, params);
return adapter.toRule(node, series, params, market, ta4jStorage);
} catch (Exception e) {
log.warn("[Evaluator] 조건 JSON 파싱 실패: {}", e.getMessage());
return new BooleanRule(false);