From 9219e18a9b2fb06b95b5c881b057d3fde7270ca3 Mon Sep 17 00:00:00 2001
From: zainali5120 <512061637@qq.com>
Date: Thu, 25 Feb 2021 10:28:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/whole_new' into whole_new

---
 src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java |   44 ++++++++++++++++++++++++++++++++++++++------
 1 files changed, 38 insertions(+), 6 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 4138bee..a0a266a 100644
--- a/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
+++ b/src/main/java/com/xcong/excoin/quartz/job/BlockCoinUpdateJob.java
@@ -1,11 +1,18 @@
 package com.xcong.excoin.quartz.job;
 
+import com.xcong.excoin.common.enumerates.CoinTypeEnum;
+import com.xcong.excoin.modules.blackchain.service.TrxUsdtUpdateService;
 import com.xcong.excoin.modules.coin.service.BlockCoinService;
+import com.xcong.excoin.modules.member.dao.MemberCoinAddressDao;
+import com.xcong.excoin.modules.member.entity.MemberCoinAddressEntity;
+import com.xcong.excoin.utils.RedisUtils;
+import org.apache.commons.collections.CollectionUtils;
 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;
 
 /**
  * 链上币种同步任务
@@ -20,11 +27,36 @@
     @Resource
     private BlockCoinService blockCoinService;
 
+    @Resource
+    private TrxUsdtUpdateService trxUsdtUpdateService;
+
+    @Resource
+    RedisUtils redisUtils;
+    /**
+     * TRC20_USDT 同步
+     */
+    @Scheduled(cron = "0/3 * * * * ? ")
+    public void usdtTc20Update() {
+        // 需要加锁
+        boolean lock = redisUtils.setNotExist("USDT_TRC20_UPDATE", 1, 30);
+        if(lock){
+            try{
+                trxUsdtUpdateService.monitorCoinListener();
+            } catch (Exception e){
+                e.printStackTrace();
+            }finally {
+                // 若异常 需要删除
+                redisUtils.del("USDT_TRC20_UPDATE");
+            }
+        }
+
+    }
 
     /**
-     * ETH_USDT 同步
+     * ETH_USDT 同步 使用扫块 废弃这个定时任务
      */
-    @Scheduled(cron = "0 0/10 * * * ? ")
+    //@Scheduled(cron = "0 0/10 * * * ? ")
+    @Deprecated
     public void ethUsdtUpdate() {
         blockCoinService.updateEthUsdt();
     }
@@ -40,22 +72,22 @@
     /**
      * BTC_USDT 同步
      */
-    @Scheduled(cron = "0 2/10 * * * ? ")
+//    @Scheduled(cron = "0 2/10 * * * ? ")
     public void btcUsdtUpdate() {
         blockCoinService.updateBtcUsdt();
     }
 
-    @Scheduled(cron = "0 3/20 * * * ? ")
+//    @Scheduled(cron = "0 3/20 * * * ? ")
     public void btcUpdate() {
         blockCoinService.updateBtc();
     }
 
-    @Scheduled(cron = "0 4/20 * * * ? ")
+//    @Scheduled(cron = "0 4/20 * * * ? ")
     public void eosUpdate() {
         blockCoinService.updateEos();
     }
 
-    @Scheduled(cron = "0 6/20 * * * ? ")
+//    @Scheduled(cron = "0 6/20 * * * ? ")
     public void xrpUpdate() {
         blockCoinService.updateXrp();
     }

--
Gitblit v1.9.1