From 14bf9ee7665cf043d70d6f08f4f06d0a7042c293 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 28 May 2021 14:58:25 +0800
Subject: [PATCH] 20210528

---
 src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java |   31 ++++++++++++++++++++-----------
 1 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
index d5a56cc..1ad0f32 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -1,9 +1,12 @@
 package com.xcong.excoin.quartz.job;
 
+import cn.hutool.http.HttpException;
 import com.xcong.excoin.modules.blackchain.service.TrxUsdtUpdateService;
 import com.xcong.excoin.modules.coin.service.BlockCoinService;
+import com.xcong.excoin.rabbit.producer.UsdtUpdateProducer;
 import com.xcong.excoin.utils.RedisUtils;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.scheduling.annotation.Scheduled;
@@ -21,7 +24,7 @@
  **/
 @Slf4j
 @Component
-//@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
+@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
 public class BlockCoinUpdateJob {
 
     @Resource
@@ -33,6 +36,9 @@
     @Resource
     RedisUtils redisUtils;
 
+    @Autowired
+    private UsdtUpdateProducer usdtUpdateProducer;
+
 
     public static ConcurrentLinkedQueue<Long> TRC_BLOCK = new ConcurrentLinkedQueue<>();
 
@@ -40,23 +46,25 @@
      * TRC20_USDT 同步
      */
     @Scheduled(cron = "0/2 * * * * ? ")
-    @Async
+//    @Async
     public void usdtTc20Update() {
         // 波场3秒出一个块
         Long blocnNum = TRC_BLOCK.poll();
         if (blocnNum == null) {
             return;
         }
+        log.info("=====>>{}", blocnNum);
+        usdtUpdateProducer.sendTrc20BlockMsg(blocnNum.toString());
         redisUtils.set("USDT_TRC20_CURRENT_BLOCK_NUM", blocnNum);
-        try {
-            trxUsdtUpdateService.monitorCoinListener(blocnNum);
-        } catch (RestClientException e) {
-            //  此时是连接问题 这个块需要重新扫描
-            log.info("查询区块超时:" + blocnNum);
-            TRC_BLOCK.add(blocnNum);
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
+//        try {
+//            trxUsdtUpdateService.monitorCoinListener(blocnNum);
+//        } catch (RestClientException | HttpException e) {
+//            //  此时是连接问题 这个块需要重新扫描
+//            log.info("查询区块超时:" + blocnNum);
+//            TRC_BLOCK.add(blocnNum);
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
 
     }
 
@@ -64,6 +72,7 @@
     public void usdtTc20UpdateQueue() {
         // 查询最新区块号
         long getnowblock = trxUsdtUpdateService.getnowblockFromTronScan() - 25;
+        log.info("=======>{}", getnowblock);
         // 拿到redis里最新区块
         Object trc20BlockNum = redisUtils.get("USDT_TRC20_BLOCK_NUM");
         if (trc20BlockNum == null) {

--
Gitblit v1.9.1