From 4fc2e0257cf4f6ff91fc098d4438a8faf6a3c6a6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 15 Jun 2021 14:37:25 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
index 6f114b0..58fd0fa 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/CoinTradeInitJob.java
@@ -33,6 +33,7 @@
import java.math.BigDecimal;
import java.text.ParseException;
import java.util.ArrayList;
+import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -44,7 +45,7 @@
**/
@Slf4j
@Component
-@ConditionalOnProperty(prefix = "app", name = "trade", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "exchange-trade", havingValue = "true")
public class CoinTradeInitJob {
@Resource
@@ -87,6 +88,12 @@
List<OrderCoinsEntity> tradingOrders = new ArrayList<>();
List<OrderCoinsEntity> completedOrders = new ArrayList<>();
orders.forEach(order -> {
+ if(order.getDealCnt()==null){
+ order.setDealCnt(BigDecimal.ZERO);
+ }
+ if(order.getDealAmount()==null){
+ order.setDealAmount(BigDecimal.ZERO);
+ }
tradingOrders.add(order);
});
try {
@@ -101,6 +108,7 @@
// 创建K线生成器
CoinProcessor processor = new DefaultCoinProcessor(symbol, "USDT");
processor.setMarketService(marketService);
+ processor.setRedisUtils(redisUtils);
//processor.setExchangeRate(exchangeRate);
processor.initializeThumb();
//processor.initializeUsdRate();
@@ -117,6 +125,18 @@
if(o!=null){
Map<String, Candlestick> currentKlineMap = (Map<String, Candlestick> )o;
((DefaultCoinProcessor) processor).setCurrentKlineMap(currentKlineMap);
+ }else{
+ // 当最新K线不存在时 需要初始化
+ // 1min 5min 15min 30min 1hour 4hour 1day 1week
+ String[] rang = {"1min","5min","15min","30min","1hour","4hour","1day","1week"};
+ Map<String, Candlestick> currentKlineMap = new HashMap<>();
+ long currentTimeMillis = System.currentTimeMillis();
+ for (String s : rang) {
+ Candlestick candlestick = new Candlestick();
+ candlestick.setTimestamp(currentTimeMillis);
+ currentKlineMap.put(s,candlestick);
+ }
+ redisUtils.set(key,currentKlineMap);
}
processorFactory.addProcessor(symbol, processor);
--
Gitblit v1.9.1