From ab806a6f7373d528330381b0028e7ca1073e7dfa Mon Sep 17 00:00:00 2001
From: wzy <wzy19931122ai@163.com>
Date: Sun, 30 Oct 2022 21:49:50 +0800
Subject: [PATCH] fix

---
 src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java |    1 
 src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java |   83 +++++++++++++++++++++++++++++++++++++++++
 2 files changed, 83 insertions(+), 1 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java b/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java
index 79875ae..99f9b28 100644
--- a/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java
+++ b/src/main/java/cc/mrbird/febs/job/BlockCoinUpdateJob.java
@@ -66,7 +66,6 @@
 
     @Scheduled(cron = "0 0/1 * * * ? ")
     public void usdtTc20UpdateQueue() {
-        System.out.println(1111);
         // 查询最新区块号
         long getnowblock = trxUsdtUpdateService.getnowblockFromTronScan() - 25;
         // 拿到redis里最新区块
diff --git a/src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java b/src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java
new file mode 100644
index 0000000..c5342b1
--- /dev/null
+++ b/src/main/java/cc/mrbird/febs/job/NotionalPoolingJob.java
@@ -0,0 +1,83 @@
+package cc.mrbird.febs.job;
+
+import cc.mrbird.febs.common.utils.RedisUtils;
+import cc.mrbird.febs.dapp.chain.TrxUsdtUpdateService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+import javax.annotation.Resource;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+/**
+ * 归集定时任务
+ *
+ * @author wzy
+ * @date 2020-07-02
+ **/
+
+@Slf4j
+@Component
+@ConditionalOnProperty(prefix = "app", name = "block-job", havingValue = "true")
+public class NotionalPoolingJob {
+//
+//    @Resource
+//    private UsdtEthService usdtEthService;
+
+    @Resource
+    private RedisUtils redisUtils;
+
+    @Resource
+    private TrxUsdtUpdateService trxUsdtUpdateService;
+
+//    /**
+//     * usdt 归集
+//     */
+//    @Scheduled(cron = "0 5/30 * * * ? ")
+//    public void poolUsdtEth() {
+//        try {
+//            log.info("USDT归集开始");
+//            usdtEthService.pool();
+//            log.info("USDT归集结束");
+//        } catch (ExecutionException | InterruptedException e) {
+//            log.error("#usdt归集错误#", e);
+//        }
+//    }
+//
+//    /**
+//     * 使用扫块 不需要这个
+//     */
+//    //@Scheduled(cron = "0 2/8 * * * ? ")
+//    @Deprecated
+//    public void usdtEthPoolCheck() {
+//        log.info("USDTETH归集结果扫描开始");
+//        usdtEthService.usdtEthPoolCheck();
+//    }
+//
+//    @Scheduled(cron = "0 2/30 * * * ? ")
+//    public void poolEth() {
+//        try {
+//            usdtEthService.ethPool();
+//        } catch (ExecutionException | InterruptedException e) {
+//            log.info("#ETH归集错误#", e);
+//        }
+//    }
+
+    /**
+     *  归集TRC20
+     */
+    @Scheduled(cron = "0 1/5 * * * ? ")
+    public void poolUsdtTrc20() {
+        log.info("归集TRC20执行");
+        Object trc20_pool = redisUtils.get("TRC20_POOL");
+        if(trc20_pool==null){
+            return;
+        }
+        List<String> list = (List)trc20_pool;
+        for(String address: list){
+           trxUsdtUpdateService.poolByAddress(address);
+        }
+    }
+}

--
Gitblit v1.9.1