From 264b5dea5b74c4b5ba54a90caba7e709858a037e Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 25 八月 2022 17:58:27 +0800
Subject: [PATCH] 增加rabbitmq
---
src/main/java/com/yeshi/buwan/service/imp/juhe/Iqiyi2ServiceImpl.java | 81 +++++++++++++++++++++++++++++++---------
1 files changed, 63 insertions(+), 18 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 2ecec45..ea3c6cc 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,21 +6,25 @@
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.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.SolrAlbumVideoDataManager;
import com.yeshi.buwan.util.StringUtil;
import com.yeshi.buwan.util.ThreadUtil;
import com.yeshi.buwan.util.TimeUtil;
@@ -28,9 +32,11 @@
import com.yeshi.buwan.util.mq.CMQManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.data.annotation.Transient;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
import javax.annotation.Resource;
import java.io.Serializable;
@@ -72,6 +78,12 @@
@Resource
private SystemConfigService systemConfigService;
+ @Resource
+ private AlbumVideoMapService albumVideoMapService;
+
+ @Resource
+ private SolrAlbumVideoDataManager solrAlbumVideoDataManager;
+
public List<VideoDetailInfo> getVideoDetailList(String videoId, int page, int pageSize) {
//鏌ヨ涓撹緫
VideoIqiyi2 videoIqiyi2 = videoIqiyi2Dao.selectByVideoId(Long.parseLong(videoId));
@@ -79,15 +91,14 @@
return null;
final IqiyiAlbum2 album = iqiyiAlbum2Dao.get(videoIqiyi2.getIqiyiId());
- if (album != null) {
- ThreadUtil.run(new Runnable() {
- @Override
- public void run() {
- CMQManager.getInstance().addUpdateResourceVideoMsg(new UpdateResourceVideoMQMsg(album.getId() + "", IqiyiUtil2.RESOURCE_ID, new Date()));
- }
- });
-
- }
+// if (album != null) {
+ ThreadUtil.run(new Runnable() {
+ @Override
+ public void run() {
+ CMQManager.getInstance().addUpdateResourceVideoMsg(new UpdateResourceVideoMQMsg(videoIqiyi2.getIqiyiId() + "", IqiyiUtil2.RESOURCE_ID, new Date()));
+ }
+ });
+// }
List<IqiyiAlbum2> album2List = new ArrayList<>();
if (album.getFeatureAlbumId() > 0) {//鍗曡棰�
@@ -153,6 +164,7 @@
return false;
}
+ @Transactional
@Override
public void addToVideoInfo(IqiyiAlbum2 album) {
if (album.getFeatureAlbumId() > 0L && album.getChannelId() != IqiYiNewAPI.TYPE_DIANYING) {
@@ -219,14 +231,14 @@
videoInfo.setShow(newVideoInfo.getShow());
videoInfo.setVideoType(newVideoInfo.getVideoType());
videoInfo.setUpdatetime(newVideoInfo.getUpdatetime());
- videoInfoDao.update(videoInfo);
+ videoInfoService.update(videoInfo);
}
} else {//瑙嗛涓嶅瓨鍦�
//鍒ゆ柇2涓棰戝疄浣撴槸鍚︿负鍚屼竴瑙嗛
VideoInfo oldVideo = videoInfoService.getExistSameVideoWithTime(newVideoInfo);
if (oldVideo == null) {
//娣诲姞瑙嗛
- Serializable id = videoInfoDao.save(newVideoInfo);
+ Serializable id = videoInfoService.save(newVideoInfo);
newVideoInfo.setId(id + "");
} else {//涓哄悓涓�瑙嗛
//鏇存柊tag
@@ -241,7 +253,7 @@
oldVideo.setShow(newVideoInfo.getShow());
oldVideo.setVideoType(newVideoInfo.getVideoType());
oldVideo.setUpdatetime(newVideoInfo.getUpdatetime());
- videoInfoDao.update(oldVideo);
+ videoInfoService.update(oldVideo);
}
//鍔犲叆涓撹緫瑙嗛鏄犲皠
@@ -270,6 +282,7 @@
@Override
public PlayUrl getPlayUrl(String detailSystemId, int resourceId, String id, String videoId) {
+
IqiyiAlbum2 album = iqiyiAlbum2Dao.get(Long.parseLong(id));
VideoResource vr = videoResourceService.getResource(resourceId + "");
int t = IqiyiUtil2.getPlayType(album);
@@ -283,6 +296,12 @@
} else if (t == IqiyiUtil2.PLAY_HTML) {
pu.setUrl(album.getH5Url());
}
+
+ //闊╁墽
+ if ("48".equalsIgnoreCase(detailSystemId)) {
+ pu.setUrl(pu.getUrl().replace("_bwap", "_hjvap"));
+ }
+
return pu;
}
@@ -396,9 +415,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 + "");
}
}
@@ -407,4 +427,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