From b37275dba6b782bf3bb3817c4504f6cdef1bef7c Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 18 三月 2021 18:38:51 +0800
Subject: [PATCH] APP首页顶部标签兼容
---
src/main/java/com/yeshi/buwan/service/imp/CategoryRecommendCacheVideoService.java | 14 ++++++++------
1 files changed, 8 insertions(+), 6 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..51c88e5 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;
@@ -164,7 +165,7 @@
@Cacheable(value = "topCache", key = "'getVideoListByRank'+'-'+#videotype+'-'+#detailSystem+'-'+#platform+'-'+#version")
public List<VideoInfo> getVideoListByRank(final int videotype, final String detailSystem, String platform, Integer version) {
- List<Long> resourceList = videoResourceUtil.getAvailableResourceIds(platform, version);
+ List<Long> resourceList = videoResourceUtil.getAvailableResourceIds(new DetailSystem(detailSystem), version);
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