From 8fee151ffae0c3818694b7318583814bf92663e2 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 27 八月 2021 18:52:28 +0800
Subject: [PATCH] 聚合视频资源包调整，接入韩迷

---
 src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java |   56 ++++++++++++++++++++++++++++++++++++++++++++++----------
 1 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java b/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java
index b143f9f..d9b4fec 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java
@@ -6,29 +6,30 @@
 import com.yeshi.buwan.dao.video.AlbumVideoMapDao;
 import com.yeshi.buwan.domain.*;
 import com.yeshi.buwan.domain.entity.PlayUrl;
-import com.yeshi.buwan.domain.solr.SolrShortVideo;
+import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
 import com.yeshi.buwan.domain.system.SystemConfig;
 import com.yeshi.buwan.domain.video.AlbumVideoMap;
 import com.yeshi.buwan.dto.mq.UpdateResourceVideoMQMsg;
-import com.yeshi.buwan.iqiyi.IqiYiNewAPI;
-import com.yeshi.buwan.iqiyi.entity.IqiyiAlbum2;
-import com.yeshi.buwan.iqiyi.entity.VideoIqiyi2;
-import com.yeshi.buwan.iqiyi.util.IqiyiUtil;
-import com.yeshi.buwan.iqiyi.util.IqiyiUtil2;
+import com.yeshi.buwan.exception.video.IqiyiVideoSolrException;
+import com.yeshi.buwan.videos.iqiyi.IqiYiNewAPI;
+import com.yeshi.buwan.videos.iqiyi.entity.IqiyiAlbum2;
+import com.yeshi.buwan.videos.iqiyi.entity.VideoIqiyi2;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil;
+import com.yeshi.buwan.videos.iqiyi.util.IqiyiUtil2;
 import com.yeshi.buwan.query.Iqiyi2AlbumQuery;
 import com.yeshi.buwan.service.imp.CategoryVideoService;
 import com.yeshi.buwan.service.imp.ResourceVideoService;
 import com.yeshi.buwan.service.imp.VideoInfoService;
 import com.yeshi.buwan.service.imp.VideoResourceService;
+import com.yeshi.buwan.service.inter.juhe.AlbumVideoMapService;
 import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service;
 import com.yeshi.buwan.service.inter.system.SystemConfigService;
-import com.yeshi.buwan.service.manager.search.SolrShortVideoDataManager;
+import com.yeshi.buwan.service.manager.search.SolrAlbumVideoDataManager;
 import com.yeshi.buwan.util.StringUtil;
 import com.yeshi.buwan.util.ThreadUtil;
 import com.yeshi.buwan.util.TimeUtil;
 import com.yeshi.buwan.util.log.VideoLogFactory;
 import com.yeshi.buwan.util.mq.CMQManager;
-import com.yeshi.buwan.util.video.shortvideo.ShortVideoUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.mongodb.core.query.Criteria;
@@ -76,7 +77,10 @@
     private SystemConfigService systemConfigService;
 
     @Resource
-    private SolrShortVideoDataManager solrShortVideoDataManager;
+    private AlbumVideoMapService albumVideoMapService;
+
+    @Resource
+    private SolrAlbumVideoDataManager solrAlbumVideoDataManager;
 
     public List<VideoDetailInfo> getVideoDetailList(String videoId, int page, int pageSize) {
         //鏌ヨ涓撹緫
@@ -289,6 +293,12 @@
         } else if (t == IqiyiUtil2.PLAY_HTML) {
             pu.setUrl(album.getH5Url());
         }
+
+        //闊╁墽
+        if ("48".equalsIgnoreCase(detailSystemId)) {
+            pu.setUrl(pu.getUrl().replace("_bwap", "_hjvap"));
+        }
+
         return pu;
     }
 
@@ -402,9 +412,10 @@
         }
         VideoIqiyi2 bean = videoIqiyi2Dao.selectByIqiyiId(id);
         if (bean != null) {
-            videoIqiyi2Dao.delete(bean.getVideoId());
+            videoIqiyi2Dao.deleteById(bean.getVideoId());
             //鍒犻櫎璧勬簮
             resourceVideoService.delete(bean.getVideoId() + "", IqiyiUtil2.RESOURCE_ID + "");
+            resourceVideoService.delete(bean.getVideoId() + "", IqiyiUtil.RESOURCE_ID + "");
         }
 
     }
@@ -413,4 +424,29 @@
     public List<IqiyiAlbum2> listByIds(List<Long> idsList) {
         return iqiyiAlbum2Dao.listByIds(idsList);
     }
+
+    @Override
+    public void validAlbumSolrState(Long albumId) throws IqiyiVideoSolrException {
+        long count = iqiyiAlbum2Dao.countById(albumId);
+        if (count <= 0L) {
+            throw new IqiyiVideoSolrException(IqiyiVideoSolrException.CODE_ALBUM_NOT_SAVE, "涓撹緫灏氭湭缂撳瓨");
+        }
+        VideoIqiyi2 videoIqiyi2 = videoIqiyi2Dao.selectByIqiyiId(albumId);
+        if (videoIqiyi2 == null) {
+            throw new IqiyiVideoSolrException(IqiyiVideoSolrException.CODE_ALBUM_NOT_ADD_TO_VIDEO, "涓撹緫灏氭湭娣诲姞鍒拌棰戞�昏");
+        }
+
+
+        AlbumVideoMap albumVideoMap = albumVideoMapService.selectByVideoId(videoIqiyi2.getVideoId() + "");
+        if (albumVideoMap == null) {
+            throw new IqiyiVideoSolrException(IqiyiVideoSolrException.CODE_VIDEO_NOT_ADD_TO_SOLR_ALBUM, "瑙嗛鏈坊鍔犲埌涓撹緫鎼滅储鏄犲皠");
+        }
+
+        SolrAlbumVideo solrAlbumVideo = solrAlbumVideoDataManager.findOne(videoIqiyi2.getVideoId());
+        if (solrAlbumVideo == null) {
+            throw new IqiyiVideoSolrException(IqiyiVideoSolrException.CODE_VIDEO_NOT_SYNC_TO_SOLR, "瑙嗛灏氭湭鍚屾鍒版悳绱㈠紩鎿�");
+        }
+
+
+    }
 }

--
Gitblit v1.8.0