From 3fc181568374a45caf78a567c254c5b4bd9a279b Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Mon, 01 Mar 2021 10:59:47 +0800
Subject: [PATCH] modify
---
src/main/java/com/xcong/excoin/quartz/job/HuoBiDataUpdateJob.java | 38 +++++++++++++++++++++-----------------
src/main/java/com/xcong/excoin/quartz/job/KlineHistoryDataUpdateJob.java | 2 +-
src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java | 2 +-
src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java | 8 +-------
4 files changed, 24 insertions(+), 26 deletions(-)
diff --git a/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java
index 364f75d..1f9442b 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/DayLineDataUpdateJob.java
@@ -30,16 +30,10 @@
@Resource
private RedisUtils redisUtils;
- @Resource
- private SymbolsService symbolsService;
-
- @Resource
- private WebsocketPriceService websocketPriceService;
-
@Autowired
private SubscriptionClient subscriptionClient;
- @PostConstruct
+// @PostConstruct
public void initNewestPrice() {
log.info("#=======价格更新开启=======#");
// SubscriptionOptions subscriptionOptions = new SubscriptionOptions();
diff --git a/src/main/java/com/xcong/excoin/quartz/job/KLineDataJob.java b/src/main/java/com/xcong/excoin/quartz/job/HuoBiDataUpdateJob.java
similarity index 72%
rename from src/main/java/com/xcong/excoin/quartz/job/KLineDataJob.java
rename to src/main/java/com/xcong/excoin/quartz/job/HuoBiDataUpdateJob.java
index 2b7da4f..65fb664 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/KLineDataJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/HuoBiDataUpdateJob.java
@@ -2,42 +2,37 @@
import com.alibaba.fastjson.JSONObject;
import com.huobi.client.SubscriptionClient;
-import com.huobi.client.SubscriptionOptions;
import com.huobi.client.model.Candlestick;
import com.huobi.client.model.enums.CandlestickInterval;
-import com.huobi.client.model.enums.MBPLevelEnums;
-import com.huobi.client.model.event.PriceDepthEvent;
-import com.xcong.excoin.netty.server.TcpServer;
-import com.xcong.excoin.netty.server.WebSocketServer;
+import com.xcong.excoin.netty.common.NettyTools;
+import com.xcong.excoin.netty.common.ServerChannelManager;
import com.xcong.excoin.utils.CoinTypeConvert;
+import com.xcong.excoin.utils.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import javax.annotation.PostConstruct;
+import javax.annotation.Resource;
/**
+ * 火币实时数据获取
+ *
* @author wzy
* @date 2021-02-23
**/
@Slf4j
@Component
-public class KLineDataJob {
+public class HuoBiDataUpdateJob {
@Autowired
private SubscriptionClient subscriptionClient;
-// @PostConstruct
+ @Resource
+ private RedisUtils redisUtils;
+
+ @PostConstruct
public void data() throws Exception {
- log.info("==================");
- subscriptionClient.subscribeCandlestickEvent("btcusdt,ethusdt,eosusdt,etcusdt,ltcusdt,bchusdt,xrpusdt", CandlestickInterval.DAY1, (candlestickEvent) -> {
- Candlestick data = candlestickEvent.getData();
- });
-
-// subscriptionClient.subscribePriceDepthEvent("btcusdt", priceDepthEvent -> {
-// log.info("bids:{}", JSONObject.toJSONString(priceDepthEvent.getData().getBids()));
-// log.info("asks:{}", JSONObject.toJSONString(priceDepthEvent.getData().getAsks()));
-// });
-
+ log.info("========火币数据获取==========");
subscriptionClient.subscribeCandlestickEvent("btcusdt,ethusdt,eosusdt,etcusdt,ltcusdt,bchusdt,xrpusdt", CandlestickInterval.MIN1, (candlestickEvent) -> {
Candlestick data = candlestickEvent.getData();
});
@@ -60,10 +55,19 @@
subscriptionClient.subscribeCandlestickEvent("btcusdt,ethusdt,eosusdt,etcusdt,ltcusdt,bchusdt,xrpusdt", CandlestickInterval.DAY1, (candlestickEvent) -> {
Candlestick data = candlestickEvent.getData();
+ redisUtils.set(CoinTypeConvert.convert(candlestickEvent.getSymbol()), data);
});
subscriptionClient.subscribeCandlestickEvent("btcusdt,ethusdt,eosusdt,etcusdt,ltcusdt,bchusdt,xrpusdt", CandlestickInterval.WEEK1, (candlestickEvent) -> {
Candlestick data = candlestickEvent.getData();
});
+
+ // 最新价处理
+ subscriptionClient.subscribeTradeEvent("btcusdt,ethusdt,xrpusdt,ltcusdt,bchusdt,eosusdt,etcusdt", tradeEvent -> {
+ ServerChannelManager.getTcpGroup().writeAndFlush(NettyTools.textBytes(JSONObject.toJSONString(tradeEvent)));
+ });
+
+ subscriptionClient.subscribePriceDepthEvent("btcusdt,ethusdt,xrpusdt,ltcusdt,bchusdt,eosusdt,etcusdt", priceDepthEvent -> {
+ });
}
}
diff --git a/src/main/java/com/xcong/excoin/quartz/job/KlineDataUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/KlineHistoryDataUpdateJob.java
similarity index 98%
rename from src/main/java/com/xcong/excoin/quartz/job/KlineDataUpdateJob.java
rename to src/main/java/com/xcong/excoin/quartz/job/KlineHistoryDataUpdateJob.java
index ca41425..81f7290 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/KlineDataUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/KlineHistoryDataUpdateJob.java
@@ -15,7 +15,7 @@
**/
@Component
@ConditionalOnProperty(prefix = "app", name = "kline-update-job", havingValue = "true")
-public class KlineDataUpdateJob {
+public class KlineHistoryDataUpdateJob {
@Resource
private SymbolsService symbolsService;
diff --git a/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
index 1f62b16..735b99b 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/NewestPriceUpdateJob.java
@@ -42,7 +42,7 @@
@Autowired
private SubscriptionClient subscriptionClient;
- @PostConstruct
+// @PostConstruct
public void initNewestPrice() {
log.info("#=======价格更新开启=======#");
--
Gitblit v1.9.1