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 | 94 ++++++++++++++++++++++++++++++++++++----------
1 files changed, 73 insertions(+), 21 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/util/SpringContext.java b/src/main/java/com/yeshi/buwan/util/SpringContext.java
index 9303fc5..1122eb9 100644
--- a/src/main/java/com/yeshi/buwan/util/SpringContext.java
+++ b/src/main/java/com/yeshi/buwan/util/SpringContext.java
@@ -2,15 +2,18 @@
import com.yeshi.buwan.domain.ResourceVideo;
import com.yeshi.buwan.domain.VideoInfo;
+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;
@@ -19,6 +22,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -33,7 +37,7 @@
private VideoInfoService videoInfoService;
@Resource
- private SolrAlbumDataManager solrDataManager;
+ private SolrAlbumVideoDataManager solrDataManager;
@Resource
private Iqiyi2Service iqiyi2Service;
@@ -43,6 +47,9 @@
@Resource
private ResourceVideoService resourceVideoService;
+
+ @Resource
+ private PPTVService pptvService;
private static boolean isInited = false;
@@ -64,37 +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() {
- 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()))
- solrDataManager.saveOrUpdate(videoInfo);
- else
- solrDataManager.deleteById(videoInfo.getId());
+ 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())) {
+ 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
+ solrDataManager.deleteById(videoInfo.getId());
+ }
+ CMQManager.getInstance().deleteSolrMsg(solrVideo.getHandler());
+ } catch (Exception e) {
+ logger.error("娣诲姞鍒版悳绱㈠紩鎿庡嚭閿�", e);
}
- CMQManager.getInstance().deleteSolrMsg(solrVideo.getHandler());
- } catch (Exception e) {
-
}
- }
- }
- });
+ }
+ });
+ }
}
@@ -102,12 +120,14 @@
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
public void run() {
+ 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);
}
@@ -147,6 +167,38 @@
}
+
+ 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());
+ }
+ }
+ }
+ });
+
+ }
+
private void doDeleteVideoResource() {
new JobThreadExecutorServiceImpl().run(new Runnable() {
@Override
--
Gitblit v1.8.0