2023年11月24日17:09:55 优化

王明元
1 parent 2c44b108
Showing 1 changed file with 25 additions and 3 deletions
src/main/java/cn/fw/freya/service/CrawlBizService.java
@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.event.EventListener;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
  
 import java.io.IOException;
 import java.time.LocalDate;
@@ -305,12 +306,33 @@ public class CrawlBizService {
         String accountNo = account.getAccountNo();
         AccountTypeEnum typeEnum = AccountTypeEnum.getEnumByValue(type);
         CrawlStrategy crawlStrategy = crawlStrategyMap.get(typeEnum);
-        LockSupport.parkNanos(TimeUnit.SECONDS.toNanos(10));// 线程挂起10秒, 防止并发上报, 旧数据覆盖新数据
-        List<LivePool> yesterdayLiveMsg = crawlStrategy.getLiveMsg(accountNo);// 获取昨日直播信息
+        List<LivePool> yesterdayLiveMsg;
+        int tryGetDataCnt = 0;
+        do {
+            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;
+        }
         boolean reportLive = this.doReportLive(account, yesterdayLiveMsg);
         if (!reportLive) {
             accountService.setAccountUndone(accountNo);
-            log.error(LocalDate.now() + " 上报账户为" + accountNo + "的" + AccountTypeEnum.getNameByValue(account.getType()) + "的直播数据失败");
+            log.error(LocalDate.now() + " 上报账户为" + accountNo + "的" +
+                    AccountTypeEnum.getNameByValue(account.getType()) + "的直播数据失败");
         }
     }
+
+    /**
+     * 检查是直播是否满足任意一场拥有回播
+     *
+     * @param lives 直播列表
+     * @return 是否满足任意一场拥有回播
+     */
+    private boolean checkHasPlayback(List<LivePool> lives) {
+        return lives.stream()
+                .anyMatch(item -> StringUtils.hasText(item.getPlaybackUrl()));
+    }
 }