生成匹配小程序增加视频内容池、票圈视频

long-article-server/src/main/java/com/tzld/piaoquan/longarticle/service/local/impl/CrawlerVideoServiceImpl.java

@@ -89,29 +89,30 @@ public class CrawlerVideoServiceImpl {
                 }
             }
         }
-        //// 查询视频池是否存在该视频
-        //if (StringUtils.isNotEmpty(videoPoolTraceId)) {
-        //    String lockKey = String.format(SINGLE_VIDEO_LOCK_KEY, contentId);
-        //    String lockValue = UUID.randomUUID().toString();
-        //    boolean lock = redisLock.tryLock(lockKey, lockValue, 300, TimeUnit.SECONDS);
-        //    if (lock) {
-        //        log.info("singleCrawlerVideo lock lockKey={}", lockKey);
-        //        Boolean res = addCrawlerVideoByVideoPoolTraceId(contentId, videoPoolTraceId);
-        //        log.info("singleCrawlerVideo unlock lockKey={}", lockKey);
-        //        redisLock.unlock(lockKey, lockValue);
-        //        if (res) {
-        //            return true;
-        //        }
-        //    }
-        //}
-        //if (Objects.nonNull(pqVideoId)) {
-        //    JSONObject videoDetail = VideoUtils.getVideoDetail(pqVideoId);;
-        //    if (Objects.nonNull(videoDetail)) {
-        //        CrawlerVideo crawlerVideo = piaoquanVideoProduce(contentId, videoDetail);
-        //        crawlerVideo.setCrawlerTime(new Date());
-        //        crawlerVideoMapper.insertSelective(crawlerVideo);
-        //    }
-        //}
+        // 查询视频池是否存在该视频
+        if (StringUtils.isNotEmpty(videoPoolTraceId)) {
+            String lockKey = String.format(SINGLE_VIDEO_LOCK_KEY, contentId);
+            String lockValue = UUID.randomUUID().toString();
+            boolean lock = redisLock.tryLock(lockKey, lockValue, 300, TimeUnit.SECONDS);
+            if (lock) {
+                log.info("singleCrawlerVideo lock lockKey={}", lockKey);
+                Boolean res = addCrawlerVideoByVideoPoolTraceId(contentId, videoPoolTraceId);
+                log.info("singleCrawlerVideo unlock lockKey={}", lockKey);
+                redisLock.unlock(lockKey, lockValue);
+                if (res) {
+                    return true;
+                }
+            }
+        }
+        if (Objects.nonNull(pqVideoId)) {
+            JSONObject videoDetail = VideoUtils.getVideoDetail(pqVideoId);;
+            if (Objects.nonNull(videoDetail)) {
+                CrawlerVideo crawlerVideo = piaoquanVideoProduce(contentId, videoDetail);
+                crawlerVideo.setCrawlerTime(new Date());
+                crawlerVideoMapper.insertSelective(crawlerVideo);
+                return true;
+            }
+        }
         log.info("addCrawlerVideo contentId={} rootContentId={} kimiText={}", contentId, rootContentId, kimiText);
         //爬虫爬取视频
         int count = 0;