From 19533a17aa55fafc70d0a385928e785cb50e1ebc Mon Sep 17 00:00:00 2001
From: admin <2780501319@qq.com>
Date: 星期五, 30 七月 2021 02:05:14 +0800
Subject: [PATCH] 爱奇艺视频更新

---
 src/main/java/com/yeshi/buwan/service/imp/CategoryRecommendCacheVideoService.java |   18 ++++++++++--------
 1 files changed, 10 insertions(+), 8 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 df7cf89..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,7 +6,8 @@
 import java.util.Comparator;
 import java.util.List;
 
-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;
 import org.hibernate.SQLQuery;
@@ -36,7 +37,7 @@
     private CategoryRecommendVideoService categoryRecommendVideoService;
 
     @Resource
-    private VideoResourceMapExtraInfoService videoResourceMapExtraInfoService;
+    private VideoInfoExtraService videoInfoExtraService;
 
     @Resource
     private VideoResourceUtil videoResourceUtil;
@@ -161,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(platform, 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>>() {
@@ -192,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
@@ -242,7 +244,7 @@
             }
         });
 
-        return videoResourceMapExtraInfoService.batchExtraInfo(videoInfoList, resourceList);
+        return videoInfoExtraService.batchExtra(videoInfoList, resourceList);
     }
 
     public CategoryRecommendCacheVideo getByVid(String vid) {

--
Gitblit v1.8.0