From 0a18a8cb0a7a57bf1f82df425251334c57f8c39a Mon Sep 17 00:00:00 2001 From: admin <weikou2014> Date: 星期六, 23 一月 2021 15:40:37 +0800 Subject: [PATCH] 新增手机号/qq/微信绑定 --- src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java | 27 ++++++++++----------------- 1 files changed, 10 insertions(+), 17 deletions(-) diff --git a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java index 23ec03a..241f304 100644 --- a/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java +++ b/src/main/java/com/yeshi/buwan/util/video/VideoDetailUtil.java @@ -11,19 +11,20 @@ import com.yeshi.buwan.funtv.FunTVUtil2; import com.yeshi.buwan.iqiyi.util.IqiyiUtil; import com.yeshi.buwan.iqiyi.util.IqiyiUtil2; -import com.yeshi.buwan.pptv.PPTVUtil; import com.yeshi.buwan.service.imp.VideoInfoService; import com.yeshi.buwan.service.imp.juhe.FunTVService; import com.yeshi.buwan.service.imp.juhe.IqiyiService; -import com.yeshi.buwan.service.imp.juhe.PPTVService; import com.yeshi.buwan.service.imp.juhe.SoHuService; import com.yeshi.buwan.service.inter.juhe.FunTV2Service; import com.yeshi.buwan.service.inter.juhe.Iqiyi2Service; import com.yeshi.buwan.sohu.SoHuUtil; import com.yeshi.buwan.util.StringUtil; +import com.yeshi.buwan.util.log.VideoLogFactory; import com.yeshi.buwan.vo.AcceptData; import org.hibernate.HibernateException; import org.hibernate.Session; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.springframework.cache.annotation.Cacheable; import org.springframework.orm.hibernate4.HibernateCallback; import org.springframework.stereotype.Component; @@ -33,6 +34,9 @@ @Component public class VideoDetailUtil { + + private final Logger playLogger = LoggerFactory.getLogger("videoPlay"); + @Resource private IqiyiUtil iqiyiUtil; @@ -58,16 +62,13 @@ private FunTV2Service funTV2Service; @Resource - private PPTVService pptvService; - - @Resource private VideoInfoService videoInfoService; @SuppressWarnings("unchecked") // @Cacheable(value = "homeCache", key = "'getVideoInfo'+'-'+#videoid+'-'+#resourceId+'-'+#cacheMD5") - public VideoInfo getVideoInfo(final String videoid, final String resourceId, final List<Long> reList, + public VideoInfo getVideoInfo(String detailSystemId,final String videoid, final String resourceId, final List<Long> reList, String cacheMD5) { - + playLogger.info(VideoLogFactory.createVideoDetailLog(detailSystemId, videoid,resourceId)); return (VideoInfo) videoInfoDao.excute(new HibernateCallback<VideoInfo>() { public VideoInfo doInHibernate(Session session) throws HibernateException { @@ -193,8 +194,6 @@ return funTV2Service.getVideoDetailList(videoid, page, pageSize); case FunTVUtil.RESOURCE_ID: return funTVService.getVideoDetailList(videoid, page, pageSize); - case PPTVUtil.RESOURCE_ID: - return pptvService.getVideoDetailList(videoid, page, pageSize); case AcFunUtil.RESOURCE_ID: return videoInfoService.getVideoDetailList(videoid, vr, page, pageSize); case SoHuUtil.RESOURCE_ID: @@ -216,8 +215,6 @@ return funTV2Service.getLatestVideoDetail(videoid); case FunTVUtil.RESOURCE_ID: return funTVService.getLatestVideoDetail(videoid); - case PPTVUtil.RESOURCE_ID: - return pptvService.getLatestVideoDetail(videoid); case SoHuUtil.RESOURCE_ID: return soHuService.getLatestVideoDetail(videoid); default: @@ -236,8 +233,6 @@ return funTV2Service.getShowType(videoid); case FunTVUtil.RESOURCE_ID: return funTVService.getShowType(videoid); - case PPTVUtil.RESOURCE_ID: - return pptvService.getShowType(videoid); case SoHuUtil.RESOURCE_ID: return soHuUtil.getShowType(videoid); default: @@ -247,18 +242,16 @@ @Cacheable(value = "homeCache", key = "'getPlayUrl'+'-'+#detailSystemId+'-'+#id+'-'+#type+'-'+#resourceid") public PlayUrl getPlayUrl(AcceptData acceptData, String detailSystemId, String id, String type, int resourceid, String videoid) { - + playLogger.info(VideoLogFactory.createPlayUrlLog(detailSystemId, id, type, resourceid, videoid)); switch (resourceid) { case IqiyiUtil2.RESOURCE_ID: return iqiyi2Service.getPlayUrl(detailSystemId, resourceid, id, videoid); case IqiyiUtil.RESOURCE_ID: return iqiyiUtil.getPlayUrl(detailSystemId, resourceid + "", type, id); case FunTVUtil2.RESOURCE_ID: - return funTV2Service.getPlayUrl(acceptData,detailSystemId, resourceid, id, videoid); + return funTV2Service.getPlayUrl(acceptData, detailSystemId, resourceid, id, videoid); case FunTVUtil.RESOURCE_ID: return funTVService.getPlayUrl(detailSystemId, id, type, resourceid, videoid); - case PPTVUtil.RESOURCE_ID: - return pptvService.getPlayUrl(detailSystemId, id, type, resourceid, videoid); case SoHuUtil.RESOURCE_ID: return soHuUtil.getPlayUrl(detailSystemId, resourceid + "", type, id); case AcFunUtil.RESOURCE_ID: -- Gitblit v1.8.0