减少商品库无效上传

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/entity/AigcProductAlbum.java

@@ -34,4 +34,6 @@ public class AigcProductAlbum {
     private Integer hasMotivationContent;
 
     private Integer startingUnlockEpisode;
+
+    private Integer source;
 }

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/mapper/xml/BytedanceProductUpdateMapper.xml

@@ -57,9 +57,9 @@
         '天津星链视界信息技术有限公司' as copyright_owner, '其他' as playlet_gender, video.update_sort as playlet_num, '2' as playlet_duration,
         payinfo.sort as start_pay_playlet, '5' as membership_types, '2' as has_motivation_types,
         payinfo.maxpay as max_charge, payinfo.minpay as min_charge, maxpay as recommended_charge, maxpay as price,
-         1 as has_motivation_content
+         1 as has_motivation_content, video.source
         FROM (select video_id, album_id, 1 as platform_type from thirtpart.ly_third_videos where submission_status=2 and platform=2
-        and video_id in (select video_id from thirtpart.ly_video_audit_records where audit_status=2)
+        and video_id in (select video_id from thirtpart.ly_video_audit_records where audit_status=2 and platform=2)
         union select ly_video_id as video_id, album_id, 2 as platform_type from deepthink.bytedance_upload_album where can_promotion=1
         ) third
         LEFT JOIN (select * from thirtpart.ly_video_details where platform_config is not null group by video_id) detail ON third.video_id = detail.video_id
@@ -73,9 +73,9 @@
     <select id="getIAAVideoList" resultType="cn.com.ctop.job.bytedance.data.entity.AigcProductAlbum">
         select third.album_id, third.platform_type, detail.platform_config, video.id as video_id, detail.id as video_detail_id, video.name as name, video.cover_img as img,ifnull(category.name, '其他') as 'theme', video.play_platform,
         '天津星链视界信息技术有限公司' as copyright_owner, '其他' as playlet_gender, video.update_sort as playlet_num, '2' as playlet_duration,
-        '5' as membership_types, '1' as has_paid_content, '2' as has_motivation_types,payinfo.sort as starting_unlock_episode
+        '5' as membership_types, '1' as has_paid_content, '2' as has_motivation_types,payinfo.sort as starting_unlock_episode, video.source
         FROM (select video_id, album_id, 1 as platform_type from thirtpart.ly_third_videos where submission_status=2 and platform=2
-        and video_id in (select video_id from thirtpart.ly_video_audit_records where audit_status=2)
+        and video_id in (select video_id from thirtpart.ly_video_audit_records where audit_status=2 and platform=2)
         union select ly_video_id as video_id, album_id, 2 as platform_type from deepthink.bytedance_upload_album where can_promotion=1
         ) third
         LEFT JOIN (select * from thirtpart.ly_video_details where platform_config is not null group by video_id) detail ON third.video_id = detail.video_id

job-bytedance/src/main/java/cn/com/ctop/job/bytedance/data/service/impl/BytedanceProductUpdateServiceImpl.java

@@ -82,7 +82,15 @@ public class BytedanceProductUpdateServiceImpl implements IBytedanceProductUpdat
         for (AigcProductPlatform platform : platformList){
             // 拉取已上传剧目，对比，得到未上传剧目列表
             List<String> hasUpload = hasUploadProductList(platform);
-            List<AigcProductAlbum> toUpload = albums.stream().filter(o -> !hasUpload.contains(o.getAlbumId())).collect(Collectors.toList());
+            System.out.println("已上传剧目数: "+hasUpload.size() + ", 商品库ID: "+platform.getPlatformId()+", 来源:"+platform.getSource());
+            List<AigcProductAlbum> toUpload = albums.stream()
+                    .filter(o -> Objects.equals(o.getSource(), platform.getSource()))
+                    .filter(o -> Objects.equals(o.getPlatformType(), String.valueOf(platform.getPlatformType())))
+                    .filter(o -> !hasUpload.contains(o.getAlbumId())).collect(Collectors.toList());
+            System.out.println("待上传剧目数: "+toUpload.size() + ", 商品库ID: "+platform.getPlatformId()+", 来源:"+platform.getSource());
+            if (toUpload.isEmpty()){
+                continue;
+            }
             //获取未上传剧目的推广链接
             List<AigcProductAlbum> douyinUploadList = toUpload.stream().filter(o -> Objects.equals(o.getPlatformType(), "1")).collect(Collectors.toList());
             Map<String, String> albumIdToLinkMap = getBytedancePlayletPromoteLink(platform.getAdvertiserId(), platform.getAccessToken(), platform.getMiniInstanceId(), douyinUploadList, errors);
@@ -217,10 +225,10 @@ public class BytedanceProductUpdateServiceImpl implements IBytedanceProductUpdat
      */
     @Override
     public void initNew(){
-//        List<AigcProductPlatform> iapPlatformList = bytedanceProductUpdateMapper.getIAPPlatformInitList();
+        List<AigcProductPlatform> iapPlatformList = bytedanceProductUpdateMapper.getIAPPlatformInitList();
         List<AigcProductPlatform> iaaPlatformList = bytedanceProductUpdateMapper.getIAAPlatformInitList();
         initNew(iaaPlatformList);
-//        initNew(iapPlatformList);
+        initNew(iapPlatformList);
         authMovieResource();
     }