From 77afee148e77d429e74408ede5905b16cf803256 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 11 Aug 2023 11:09:21 +0800
Subject: [PATCH] 数据修改
---
src/main/java/cc/mrbird/febs/job/ChainListenerJob.java | 62 ++++++++++++-------------------
1 files changed, 24 insertions(+), 38 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
index 4a25c8a..cc656a5 100644
--- a/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
+++ b/src/main/java/cc/mrbird/febs/job/ChainListenerJob.java
@@ -2,11 +2,14 @@
import cc.mrbird.febs.common.contants.AppContants;
import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.dapp.chain.BaseCoinService;
import cc.mrbird.febs.dapp.chain.ChainEnum;
import cc.mrbird.febs.dapp.chain.ChainService;
import cc.mrbird.febs.dapp.chain.ContractEventService;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.ApplicationArguments;
+import org.springframework.boot.ApplicationRunner;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
import org.springframework.scheduling.annotation.Async;
import org.springframework.scheduling.annotation.Scheduled;
@@ -18,48 +21,13 @@
@Slf4j
@Component
@ConditionalOnProperty(prefix = "system", name = "chain-listener", havingValue = "true")
-public class ChainListenerJob {
+public class ChainListenerJob implements ApplicationRunner {
@Autowired
- private ContractEventService bscCoinContractEvent;
-
- @Autowired
- private ContractEventService bscUsdtContractEvent;
+ private BaseCoinService baseCoinService;
@Autowired
private RedisUtils redisUtils;
-
- @PostConstruct
- public void chainListenerJob() {
- long start = System.currentTimeMillis();
- log.info("区块链监听开始启动");
- Object incrementObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM);
- BigInteger newest = ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber();
- BigInteger block;
- if (incrementObj == null) {
- block = newest;
- } else {
- block = (BigInteger) incrementObj;
- }
-
- BigInteger section = BigInteger.valueOf(5000);
- while (newest.subtract(block).compareTo(section) > -1) {
- BigInteger end = block.add(section);
- log.info("监听:[{} - {}]", block, end);
- ChainService.contractEventListener(block, end, bscUsdtContractEvent, ChainEnum.BSC_USDT.name());
- ChainService.contractEventListener(block, end, bscCoinContractEvent, ChainEnum.BSC_TFC.name());
-
- block = block.add(section);
- if (block.compareTo(newest) > 0) {
- block = newest;
- }
- }
- ChainService.contractEventListener(block, bscUsdtContractEvent, ChainEnum.BSC_USDT.name());
- ChainService.contractEventListener(block, bscCoinContractEvent, ChainEnum.BSC_TFC.name());
-
- long end = System.currentTimeMillis();
- log.info("区块链监听启动完成, 消耗时间{}", end - start);
- }
@Scheduled(cron = "0 0/5 * * * ? ")
public void chainBlockUpdate() {
@@ -86,7 +54,7 @@
BigInteger incrementBlock = (BigInteger) incrementObj;
// 最新区块小于增加区块
- if (newestBlock.compareTo(incrementBlock) < 0) {
+ if (newestBlock.compareTo(incrementBlock) <= 0) {
return;
}
toIncrement = incrementBlock.add(BigInteger.ONE);
@@ -95,4 +63,22 @@
redisUtils.set(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM, toIncrement);
}
+ @Override
+ public void run(ApplicationArguments args) throws Exception {
+ long start = System.currentTimeMillis();
+ log.info("区块链监听开始启动");
+ Object incrementObj = redisUtils.get(AppContants.REDIS_KEY_BLOCK_ETH_INCREMENT_NUM);
+ BigInteger newest = ChainService.getInstance(ChainEnum.BSC_TFC.name()).blockNumber();
+ BigInteger block = null;
+ if (incrementObj == null) {
+ block = newest;
+ } else {
+ block = (BigInteger) incrementObj;
+ }
+
+ ChainService.wssBaseCoinEventListener(block, baseCoinService);
+
+ long end = System.currentTimeMillis();
+ log.info("区块链监听启动完成, 消耗时间{}", end - start);
+ }
}
--
Gitblit v1.9.1