From f788607ff771a47bc60d6a86e00b3433c40f3d2c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 24 九月 2021 15:22:03 +0800
Subject: [PATCH] 接入视频直播

---
 src/main/java/com/yeshi/buwan/service/imp/CategoryRecommendCacheVideoService.java |   14 +++++++-------
 1 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/imp/CategoryRecommendCacheVideoService.java b/src/main/java/com/yeshi/buwan/service/imp/CategoryRecommendCacheVideoService.java
index d7c1ce5..76f0215 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/CategoryRecommendCacheVideoService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/CategoryRecommendCacheVideoService.java
@@ -6,8 +6,7 @@
 import java.util.Comparator;
 import java.util.List;
 
-import com.yeshi.buwan.domain.DetailSystem;
-import com.yeshi.buwan.service.inter.VideoResourceMapExtraInfoService;
+import com.yeshi.buwan.domain.system.DetailSystem;
 import com.yeshi.buwan.service.inter.video.VideoInfoExtraService;
 import com.yeshi.buwan.util.JuHe.VideoResourceUtil;
 import org.hibernate.HibernateException;
@@ -163,10 +162,10 @@
 
 
     @SuppressWarnings("unchecked")
-    @Cacheable(value = "topCache", key = "'getVideoListByRank'+'-'+#videotype+'-'+#detailSystem+'-'+#platform+'-'+#version")
-    public List<VideoInfo> getVideoListByRank(final int videotype, final String detailSystem, String platform, Integer version) {
+    @Cacheable(value = "topCache", key = "'getVideoListByRank'+'-'+#videotype+'-'+#detailSystem+'-'+#platform+'-'+#version+'-'+#channel")
+    public List<VideoInfo> getVideoListByRank(final int videotype, final String detailSystem, String platform, Integer version, String channel) {
 
-        List<Long> resourceList = videoResourceUtil.getAvailableResourceIds(new DetailSystem(detailSystem), version);
+        List<Long> resourceList = videoResourceUtil.getAvailableResourceIds(new DetailSystem(detailSystem), version, channel);
 
         final int count = categoryRecommendVideoService.getRankVideoNumber(videotype);
         List<VideoInfo> videoInfoList = (List<VideoInfo>) dao.excute(new HibernateCallback<List<VideoInfo>>() {
@@ -194,10 +193,11 @@
                     vr.setHpicture(objs[5] + "");
                     vr.setLatestVpicture(objs[6] + "");
                     vr.setLatestHpicture(objs[7] + "");
-                    vr.setWatchCount(objs[8] + "");
-                    vr.setCommentCount(Integer.parseInt(objs[9] + ""));
+                    vr.setWatchCount(objs[8] != null ? objs[8] + "" : "0");
+                    vr.setCommentCount(objs[9] != null ? Integer.parseInt(objs[9] + "") : 0);
                     vr.setOrderBy(Integer.parseInt(objs[10] + ""));
                     vr.setTag(objs[11] + "");
+                    vr.setVideocount(0);
                     if (vr.getRank() > 0) {
                         rks.add(vr);
                     } else

--
Gitblit v1.8.0