From 54a5b503d811f7ca3f356728c3ab1e04451a9a86 Mon Sep 17 00:00:00 2001
From: zyy <zyy@email.com>
Date: Sat, 20 Dec 2025 16:49:09 +0800
Subject: [PATCH] 1
---
trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java | 107 +++++++++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 98 insertions(+), 9 deletions(-)
diff --git a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
index 8a28e75..33eeaa9 100644
--- a/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
+++ b/trading-order-huobi/src/main/java/com.yami.trading.huobi/data/internal/CryptosKlineServiceImpl.java
@@ -37,6 +37,25 @@
@Autowired
private NamedParameterJdbcOperations namedParameterJdbcTemplate;
+ /*public static void main(String[] args) {
+ BigDecimal a = BigDecimal.valueOf(0.003);
+ BigDecimal b = BigDecimal.valueOf(7200);
+ BigDecimal c = a.divide(b, 10, BigDecimal.ROUND_HALF_UP);
+ System.out.println(c);
+ }*/
+ @Override
+ public void initBySql(String symbol) {
+ this.bulidBySql(symbol, Kline.PERIOD_1MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_5MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_15MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_30MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_60MIN);
+ this.bulidBySql(symbol, Kline.PERIOD_4HOUR);
+ this.bulidBySql(symbol, Kline.PERIOD_1DAY);
+ this.bulidBySql(symbol, Kline.PERIOD_1MON);
+ this.bulidBySql(symbol, Kline.PERIOD_1WEEK);
+ }
+
@Override
public void init(String symbol) {
this.bulid(symbol, Kline.PERIOD_1MIN);
@@ -70,10 +89,26 @@
}
+ public void bulidBySql(String symbol, String line) {
+ RequestDataHelper.set("symbol", symbol);
+ LambdaQueryWrapper<Kline> queryWrapper = new LambdaQueryWrapper<Kline>()
+ .eq(Kline::getSymbol, symbol)
+ .eq(Kline::getPeriod, line)
+ .orderByAsc(Kline::getTs);
+ List<Kline> list = klineDBService.list(queryWrapper);
+
+ KlineTimeObject model = new KlineTimeObject();
+ Collections.sort(list); // 按时间升序
+ model.setKline(list);
+ model.setLastTime(new Date());
+ DataCache.putKline(symbol, line, model);
+ RequestDataHelper.clear();
+
+ }
+
public void bulid(String symbol, String line) {
RequestDataHelper.set("symbol", symbol);
- List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, null,
- 0);
+ List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, null);
KlineTimeObject model = new KlineTimeObject();
Collections.sort(list); // 按时间升序
model.setKline(list);
@@ -101,7 +136,8 @@
@Override
public void saveOne(String symbol, String line) {
- RequestDataHelper.set("symbol", symbol);
+ saveOneByHuoBi(symbol, line);
+ /*RequestDataHelper.set("symbol", symbol);
Realtime realtime = DataCache.getRealtime(symbol);
if (realtime == null) {
logger.error("saveOne error, realtime is null,symbol [" + symbol + "]");
@@ -117,11 +153,11 @@
String key = symbol + "_" + line;
Kline hobiOne = DataCache.getKline_hobi().get(key);
- /*if (hobiOne == null || lastOne == null) {
+ *//*if (hobiOne == null || lastOne == null) {
logger.error("saveOne error, hobiOne is null,symbol [" + symbol + "]");
// 取不到远程数据，直接退出
return;
- }*/
+ }*//*
RequestDataHelper.set("symbol", symbol);
Kline kline = this.bulidKline(realtime, lastOne, null, line);
kline.setPeriod(line);
@@ -136,8 +172,61 @@
timeObject.getKline().add(kline);
timeObject.setLastTime(new Date());
DataCache.putKline(symbol, line, timeObject);
- RequestDataHelper.clear();
+ RequestDataHelper.clear();*/
+ }
+
+ @Override
+ public void saveOneByHuoBi(String symbol, String line) {
+ List<Kline> list = hobiDataService.kline(itemService.findBySymbol(symbol).getSymbol(), line, 2);
+ if (list == null || list.isEmpty()) {
+ return;
+ }
+ Kline kline = list.get(0);
+ BigDecimal currentValue = AdjustmentValueCache.getCurrentValue().get(symbol);
+ if (currentValue != null && currentValue.compareTo(BigDecimal.ZERO) != 0) {
+ if (!kline.isAdjusted()){
+ kline.setClose(kline.getClose().add(currentValue));
+ kline.setOpen(kline.getOpen().add(currentValue));
+ kline.setLow(kline.getLow().add(currentValue));
+ kline.setHigh(kline.getHigh().add(currentValue));
+ kline.setAdjusted(true);
+ }
+ }
+
+
+ //获取上一条数据
+ Kline lastKline = DataCache.getLastKline().get(symbol + line);;
+ if (lastKline == null) {
+ List<Kline> lastList = this.find(symbol, line, 1);
+ if (lastList.size() > 0) {
+ lastKline = lastList.get(0);
+ }
+ }
+ //补差
+ if (lastKline != null) {
+ BigDecimal diff = kline.getOpen().subtract(lastKline.getClose());
+ if (diff.compareTo(BigDecimal.ZERO) > 0) {
+ kline.setOpen(kline.getOpen().subtract(diff));
+ kline.setLow(kline.getLow().subtract(diff));
+ } else if (diff.compareTo(BigDecimal.ZERO) < 0) {
+ kline.setOpen(kline.getOpen().subtract(diff));
+ kline.setHigh(kline.getHigh().subtract(diff));
+ }
+ }
+
+
+ RequestDataHelper.set("symbol", symbol);
+ klineDBService.save(kline);
+ KlineTimeObject timeObject = DataCache.getKline(symbol, line);
+ if (timeObject == null) {
+ timeObject = new KlineTimeObject();
+ }
+ timeObject.getKline().add(kline);
+ timeObject.setLastTime(new Date());
+ DataCache.putKline(symbol, line, timeObject);
+ DataCache.getLastKline().put(symbol + line, kline);
+ RequestDataHelper.clear();
}
public Kline bulidKline(Realtime realtime, Kline lastOne, Kline hobiOne, String line) {
@@ -155,13 +244,13 @@
if (lastOne != null) {
kline.setOpen(lastOne.getClose());
- kline.setHigh(lastOne.getHigh());
- kline.setLow(lastOne.getLow());
+ kline.setHigh(lastOne.getClose());
+ kline.setLow(lastOne.getClose());
if (realtime.getClose().compareTo(kline.getHigh()) > 0) {
kline.setHigh(realtime.getClose());
}
- if (realtime.getClose().compareTo(kline.getOpen()) < 0) {
+ if (realtime.getClose().compareTo(kline.getLow()) < 0) {
kline.setLow(realtime.getClose());
}
}
--
Gitblit v1.9.3