From f7b2baec57a19039ca85880bbba4e17fe27f0511 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 10 三月 2021 18:21:13 +0800
Subject: [PATCH] 删除冗余代码，初步优化首页的推荐专题，3.8.7之后在我的里面添加VIP分类
---
src/main/java/com/yeshi/buwan/util/SpringContext.java | 203 +++++++++++++++++++++++++++++++++++---------------
1 files changed, 143 insertions(+), 60 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/util/SpringContext.java b/src/main/java/com/yeshi/buwan/util/SpringContext.java
index 54be0b3..1122eb9 100644
--- a/src/main/java/com/yeshi/buwan/util/SpringContext.java
+++ b/src/main/java/com/yeshi/buwan/util/SpringContext.java
@@ -2,18 +2,18 @@
import com.yeshi.buwan.domain.ResourceVideo;
import com.yeshi.buwan.domain.VideoInfo;
-import com.yeshi.buwan.dto.mq.CMQResult;
-import com.yeshi.buwan.dto.mq.FunTVAlbum2MQMsg;
-import com.yeshi.buwan.dto.mq.IqiyiAlbum2MQMsg;
-import com.yeshi.buwan.dto.mq.SolrVideoMQMsg;
+import com.yeshi.buwan.domain.VideoResource;
+import com.yeshi.buwan.dto.mq.*;
import com.yeshi.buwan.funtv.entity.FunTVAlbum2;
import com.yeshi.buwan.iqiyi.entity.IqiyiAlbum2;
+import com.yeshi.buwan.pptv.entity.PPTVSeries;
import com.yeshi.buwan.service.imp.JobThreadExecutorServiceImpl;
import com.yeshi.buwan.service.imp.ResourceVideoService;
import com.yeshi.buwan.service.imp.VideoInfoService;
import com.yeshi.buwan.service.inter.juhe.FunTV2Service;
import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service;
-import com.yeshi.buwan.service.manager.SolrAlbumDataManager;
+import com.yeshi.buwan.service.inter.juhe.PPTVService;
+import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
import com.yeshi.buwan.util.mq.CMQManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -22,6 +22,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -36,7 +37,7 @@
private VideoInfoService videoInfoService;
@Resource
- private SolrAlbumDataManager solrDataManager;
+ private SolrAlbumVideoDataManager solrDataManager;
@Resource
private Iqiyi2Service iqiyi2Service;
@@ -46,6 +47,9 @@
@Resource
private ResourceVideoService resourceVideoService;
+
+ @Resource
+ private PPTVService pptvService;
private static boolean isInited = false;
@@ -67,36 +71,48 @@
}
private void init() {
+ logger.error("鍒濆鍖�");
if (!Constant.JobTasker) {
doSolrJob();
doAddIqiyi2Video();
doAddFunTV2Video();
+ doAddPPTVVideo();
doDeleteVideoResource();
+ doUpdateVideoExtraInfo();
}
}
private void doSolrJob() {
- new JobThreadExecutorServiceImpl().run(new Runnable() {
- @Override
- public void run() {
+ for (int i = 0; i < 5; i++) {
+ new JobThreadExecutorServiceImpl().run(new Runnable() {
+ @Override
+ public void run() {
+ logger.info("doSolrJob");
List<SolrVideoMQMsg> solrMsgList = CMQManager.getInstance().consumeSolrMsg(16);
if (solrMsgList != null)
for (SolrVideoMQMsg solrVideo : solrMsgList) {
try {
VideoInfo videoInfo = videoInfoService.getVideoInfo(solrVideo.getId());
if (videoInfo != null) {
- if ("1".equalsIgnoreCase(videoInfo.getShow()))
+ if ("1".equalsIgnoreCase(videoInfo.getShow())) {
+ List<VideoResource> resourceList = new ArrayList<>();
+ List<ResourceVideo> rvList = resourceVideoService.getResourceList(videoInfo.getId());
+ if (rvList != null)
+ for (ResourceVideo rv : rvList)
+ resourceList.add(rv.getResource());
+ videoInfo.setResourceList(resourceList);
solrDataManager.saveOrUpdate(videoInfo);
- else
+ } else
solrDataManager.deleteById(videoInfo.getId());
}
CMQManager.getInstance().deleteSolrMsg(solrVideo.getHandler());
} catch (Exception e) {
-
+ logger.error("娣诲姞鍒版悳绱㈠紩鎿庡嚭閿�", e);
}
}
- }
- });
+ }
+ });
+ }
}
@@ -104,22 +120,24 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- List<IqiyiAlbum2MQMsg> iqiyiAlbumMsgList = CMQManager.getInstance().consumeIqiyiAlbumUpdateMsg(16);
- if (iqiyiAlbumMsgList != null)
- for (IqiyiAlbum2MQMsg iqiyiAlbum2MQMsg : iqiyiAlbumMsgList) {
- try {
- Long qikuID = iqiyiAlbum2MQMsg.getId();
- IqiyiAlbum2 album2 = iqiyi2Service.selectAlbumById(qikuID);
- if (album2 != null) {
- iqiyi2Service.addToVideoInfo(album2);
- }
- CMQManager.getInstance().deleteIqiyiAlbumUpdateMsg(iqiyiAlbum2MQMsg.getHandler());
- } catch (Exception e) {
- logger.error("鐖卞鑹轰笓杈戞坊鍔犲埌瑙嗛鍑洪敊锛�" + e.getMessage());
- logger.error("ID:" + iqiyiAlbum2MQMsg.getId());
+ logger.info("doAddIqiyi2Video");
+ List<IqiyiAlbum2MQMsg> iqiyiAlbumMsgList = CMQManager.getInstance().consumeIqiyiAlbumUpdateMsg(16);
+ if (iqiyiAlbumMsgList != null)
+ for (IqiyiAlbum2MQMsg iqiyiAlbum2MQMsg : iqiyiAlbumMsgList) {
+ try {
+ Long qikuID = iqiyiAlbum2MQMsg.getId();
+ IqiyiAlbum2 album2 = iqiyi2Service.selectAlbumById(qikuID);
+ logger.info("鐖卞鑹轰笓杈戯細" + album2.getName());
+ if (album2 != null) {
+ iqiyi2Service.addToVideoInfo(album2);
}
+ CMQManager.getInstance().deleteIqiyiAlbumUpdateMsg(iqiyiAlbum2MQMsg.getHandler());
+ } catch (Exception e) {
+ logger.error("鐖卞鑹轰笓杈戞坊鍔犲埌瑙嗛鍑洪敊锛�" + e.getMessage());
+ logger.error("ID:" + iqiyiAlbum2MQMsg.getId());
}
- }
+ }
+ }
});
}
@@ -129,21 +147,53 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- List<FunTVAlbum2MQMsg> funTVAlbum2MsgList = CMQManager.getInstance().consumeFunTVAlbumUpdateMsg(16);
- if (funTVAlbum2MsgList != null)
- for (FunTVAlbum2MQMsg funTVAlbum2MQMsg : funTVAlbum2MsgList) {
- try {
- String mediaId = funTVAlbum2MQMsg.getId();
- FunTVAlbum2 album2 = funTV2Service.getAlbumDetail(mediaId);
- if (album2 != null) {
- funTV2Service.processAlbum(album2);
- }
- CMQManager.getInstance().deleteFunTVAlbumUpdateMsg(funTVAlbum2MQMsg.getHandler());
- } catch (Exception e) {
- logger.error("椋庤涓撹緫娣诲姞鍒拌棰戝嚭閿欙細" + e.getMessage());
- logger.error("ID:" + funTVAlbum2MQMsg.getId());
+ List<FunTVAlbum2MQMsg> funTVAlbum2MsgList = CMQManager.getInstance().consumeFunTVAlbumUpdateMsg(16);
+ if (funTVAlbum2MsgList != null)
+ for (FunTVAlbum2MQMsg funTVAlbum2MQMsg : funTVAlbum2MsgList) {
+ try {
+ String mediaId = funTVAlbum2MQMsg.getId();
+ FunTVAlbum2 album2 = funTV2Service.getAlbumDetail(mediaId);
+ if (album2 != null) {
+ funTV2Service.processAlbum(album2);
}
+ CMQManager.getInstance().deleteFunTVAlbumUpdateMsg(funTVAlbum2MQMsg.getHandler());
+ } catch (Exception e) {
+ logger.error("椋庤涓撹緫娣诲姞鍒拌棰戝嚭閿欙細" + e.getMessage());
+ logger.error("ID:" + funTVAlbum2MQMsg.getId());
}
+ }
+ }
+ });
+
+ }
+
+
+ private void doAddPPTVVideo() {
+ new JobThreadExecutorServiceImpl().run(new Runnable() {
+ @Override
+ public void run() {
+ List<PPTVMQMsg> pptvMsgList = CMQManager.getInstance().consumePPTVSeriesUpdateMsg(16);
+ if (pptvMsgList != null)
+ for (PPTVMQMsg pptvmqMsg : pptvMsgList) {
+ try {
+ switch (pptvmqMsg.getType()) {
+ case PPTVMQMsg.TYPE_ADD_OR_UPDATE:
+ PPTVSeries pptvSeries = pptvService.getSeriesDetail(pptvmqMsg.getInfoId());
+ if (pptvSeries != null) {
+ pptvService.addToVideoInfo(pptvSeries);
+ }
+ break;
+
+ case PPTVMQMsg.TYPE_DELETE:
+ pptvService.offLineSeries(pptvmqMsg.getInfoId());
+ break;
+ }
+ CMQManager.getInstance().deletePPTVSeriesUpdateMsg(pptvmqMsg.getHandler());
+ } catch (Exception e) {
+ logger.error("PPTV娣诲姞鍒拌棰戝嚭閿欙細" + e.getMessage());
+ logger.error("infoId:" + pptvmqMsg.getInfoId());
+ }
+ }
}
});
@@ -153,26 +203,59 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
- while (true) {
- List<CMQResult> cmqMsgList = CMQManager.getInstance().consumeVideoResourceDeleteMsg(16);
- if (cmqMsgList != null)
- for (CMQResult msg : cmqMsgList) {
- try {
- String videoId = msg.getData() + "";
- //鏌ヨ璧勬簮鍒楄〃
- List<ResourceVideo> resourceVideoList = resourceVideoService.getResourceList(videoId);
- //闅愯棌瑙嗛
- if (resourceVideoList == null || resourceVideoList.size() == 0)
- videoInfoService.hiddenVideo(videoId);
- //鏇存柊鎼滅储寮曟搸
- CMQManager.getInstance().addSolrMsg(videoId);
- CMQManager.getInstance().deleteVideoResourceDeleteMsg(msg.getHandler());
- } catch (Exception e) {
- logger.error("瑙嗛璧勬簮鍒犻櫎澶勭悊鍑洪敊锛�" + e.getMessage());
- logger.error("ID:" + msg.getData());
- }
+ List<CMQResult> cmqMsgList = CMQManager.getInstance().consumeVideoResourceDeleteMsg(16);
+ if (cmqMsgList != null)
+ for (CMQResult msg : cmqMsgList) {
+ try {
+ String videoId = msg.getData() + "";
+ //鏌ヨ璧勬簮鍒楄〃
+ List<ResourceVideo> resourceVideoList = resourceVideoService.getResourceList(videoId);
+ //闅愯棌瑙嗛
+ if (resourceVideoList == null || resourceVideoList.size() == 0)
+ videoInfoService.hiddenVideo(videoId);
+ //鏇存柊鎼滅储寮曟搸
+ CMQManager.getInstance().addSolrMsg(videoId);
+ CMQManager.getInstance().deleteVideoResourceDeleteMsg(msg.getHandler());
+ } catch (Exception e) {
+ logger.error("瑙嗛璧勬簮鍒犻櫎澶勭悊鍑洪敊锛�" + e.getMessage());
+ logger.error("ID:" + msg.getData());
}
- }
+ }
+ }
+ });
+
+ }
+
+
+ private void doUpdateVideoExtraInfo() {
+ new JobThreadExecutorServiceImpl().run(new Runnable() {
+ @Override
+ public void run() {
+ List<CMQResult> cmqMsgList = CMQManager.getInstance().consumeUpdateVideoExtraInfoMsg(16);
+ if (cmqMsgList != null)
+ for (CMQResult msg : cmqMsgList) {
+ try {
+ VideoExtraInfoChangeMQMsg videoExtraInfoChangeMQMsg = (VideoExtraInfoChangeMQMsg) msg.getData();
+
+ if (videoExtraInfoChangeMQMsg != null) {
+ switch (videoExtraInfoChangeMQMsg.getType()) {
+ case VideoExtraInfoChangeMQMsg.TYPE_RESOURCE:
+ if (VideoExtraInfoChangeMQMsg.ACTION_DELETE.equalsIgnoreCase(videoExtraInfoChangeMQMsg.getAction())) {//鍒犻櫎瑙嗛婧�
+ CMQManager.getInstance().addVideoResourceDeleteMsg(videoExtraInfoChangeMQMsg.getVideoId());
+ }
+ break;
+ case VideoExtraInfoChangeMQMsg.TYPE_CATEGORY:
+ break;
+ }
+
+ videoInfoService.statisticVideoExtraInfo(videoExtraInfoChangeMQMsg.getVideoId());
+ }
+ CMQManager.getInstance().deleteUpdateVideoExtraInfoMsg(msg.getHandler());
+ } catch (Exception e) {
+ logger.error("瑙嗛璧勬簮鍒犻櫎澶勭悊鍑洪敊锛�" + e.getMessage());
+ logger.error("ID:" + msg.getData());
+ }
+ }
}
});
--
Gitblit v1.8.0