wangyunpeng 7 mesi fa
parent
commit
7dc6e44e0e

+ 4 - 0
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/repository/longArticle/LongArticleVideoAuditRepository.java

@@ -4,7 +4,11 @@ import com.tzld.longarticle.recommend.server.model.entity.longArticle.LongArticl
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface LongArticleVideoAuditRepository extends JpaRepository<LongArticleVideoAudit, Long> {
     LongArticleVideoAudit getByVideoId(Long videoId);
+
+    List<LongArticleVideoAudit> getByVideoIdIn(List<Long> videoIds);
 }

+ 13 - 5
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/service/recommend/ArticleAuditService.java

@@ -55,12 +55,12 @@ public class ArticleAuditService {
 
     @XxlJob("articleVideoAudit")
     public ReturnT<String> articleVideoAudit(String param) {
-        long publishTime = DateUtils.getBeforeDayStart(1);
+        long publishTime = DateUtils.getTodayStart();
         if (StringUtils.hasText(param)) {
             publishTime = DateUtils.getStartOfDay(param, "yyyyMMdd");
         }
         List<GetOffVideoArticle> getOffVideoArticleList = getOffVideoArticleRepository.getByPublishTimeGreaterThanEqual(publishTime);
-        List<String> traceIds = getOffVideoArticleList.stream().map(GetOffVideoArticle::getTraceId).collect(Collectors.toList());
+        List<String> traceIds = getOffVideoArticleList.stream().map(GetOffVideoArticle::getTraceId).distinct().collect(Collectors.toList());
         if (CollectionUtil.isEmpty(traceIds)) {
             return ReturnT.SUCCESS;
         }
@@ -71,7 +71,13 @@ public class ArticleAuditService {
             LongArticlesMatchVideo longArticlesMatchVideo = longarticlesMatchVideoMap.get(traceId);
             List<LongArticlesMatchVideoResponse> responseList = JSONArray.parseArray(longArticlesMatchVideo.getResponse()
                     , LongArticlesMatchVideoResponse.class);
+            List<Long> videoIds = responseList.stream().map(LongArticlesMatchVideoResponse::getVideoID).collect(Collectors.toList());
+            List<LongArticleVideoAudit> existsList = longArticleVideoAuditRepository.getByVideoIdIn(videoIds);
+            List<Long> existsVideoIds = existsList.stream().map(LongArticleVideoAudit::getVideoId).collect(Collectors.toList());
             for (LongArticlesMatchVideoResponse response : responseList) {
+                if (existsVideoIds.contains(response.getVideoID())) {
+                    continue;
+                }
                 LongArticleVideoAudit videoAudit = new LongArticleVideoAudit();
                 videoAudit.setVideoId(response.getVideoID());
                 videoAudit.setTraceId(traceId);
@@ -173,9 +179,11 @@ public class ArticleAuditService {
         for (LongArticleAuditDelete delete : dealList) {
             if (Objects.equals(delete.getPushType(), PushTypeEnum.AUTO_GROUP_PUBLISH.getVal())) {
                 // 获取token
-                String token = wxAccessTokenRemoteService.getAccessToken(delete.getGhId());
-                // 删除文章
-                RequestResult<String> result = wxArticleDeleteService.deleteArticle(token, delete.getMsgId(), delete.getIndex());
+//                String token = wxAccessTokenRemoteService.getAccessToken(delete.getGhId());
+//                // 删除文章
+//                RequestResult<String> result = wxArticleDeleteService.deleteArticle(token, delete.getMsgId(), delete.getIndex());
+                RequestResult<String> result = new RequestResult<>();
+                result.setSuccess(true);
                 if (result.isSuccess()) {
                     delete.setStatus(StatusEnum.ONE.getCode());
                 } else {

+ 2 - 2
long-article-recommend-service/src/main/java/com/tzld/longarticle/recommend/server/web/recommend/ArticleAuditController.java

@@ -17,8 +17,8 @@ public class ArticleAuditController {
 
 
     @GetMapping("/articleVideoAudit")
-    public void articleVideoAudit() {
-        service.articleVideoAudit(null);
+    public void articleVideoAudit(String dateStr) {
+        service.articleVideoAudit(dateStr);
     }
 
     @PostMapping("/articleVideoAuditResult")