2023年11月29日15:24:04 解决并发上报数据导致的问题

王明元
1 parent fa315aa0
Showing 1 changed file with 8 additions and 4 deletions
src/main/java/cn/fw/freya/service/CrawlBizService.java
@@ -306,11 +306,15 @@ public class CrawlBizService {
         CrawlStrategy crawlStrategy = crawlStrategyMap.get(typeEnum);
         List<LivePool> yesterdayLiveMsg;
         int tryGetDataCnt = 0;
-        do {
-            LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(5));// 线程挂起5秒, 防止并发上报, 旧数据覆盖新数据
-            yesterdayLiveMsg = crawlStrategy.getLiveMsg(accountNo);// 获取昨日直播信息
+        while (autoExpireLocalCache.containsKey(account.getCrawlIngLockKey())) {// 务必等待capture主线程完成数据抓取上报逻辑
+            LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(1));
+        }
+        yesterdayLiveMsg = crawlStrategy.getLiveMsg(accountNo);// 获取昨日直播信息
+        while (tryGetDataCnt < 12 && !this.checkHasPlayback(yesterdayLiveMsg)) {
+            LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(5));// 线程挂起5秒
+            yesterdayLiveMsg = crawlStrategy.getLiveMsg(accountNo);// 再次获取昨日直播信息
             tryGetDataCnt++;
-        } while (tryGetDataCnt < 12 && !this.checkHasPlayback(yesterdayLiveMsg));
+        }
         if (!this.checkHasPlayback(yesterdayLiveMsg)) {
             log.info("{} 直播无回放记录, 放弃重新上报直播数据", accountNo);
             return;