From 58577bae968f2a10232bc8b3c04910b93ea3c69a Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期五, 19 二月 2021 11:55:52 +0800
Subject: [PATCH] 系统资源配置由原有的代码形式改为数据库形式
---
src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java | 34 ++++++++++------------------------
1 files changed, 10 insertions(+), 24 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java b/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java
index 5e5b013..55c01a7 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java
@@ -345,9 +345,9 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
-
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
List<VideoInfo> list = starService.getStarVideo(detailSystem.getId(), starId, pageIndex,
CacheUtil.getMD5Long(resourceList));
@@ -404,11 +404,12 @@
return;
}
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getPlatform(), acceptData.getVersion());
- DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
+ DetailSystem detailSystem = acceptData.getDetailSystem();
UserInfo user = userService.getUserInfo(acceptData.getUid());
if (Utils.isTest(request, user, detailSystem.getId()))
detailSystem = systemService.getDetailSystemById(40 + "");
+
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
String resourceMD5 = CacheUtil.getMD5Long(resourceList);
@@ -449,6 +450,7 @@
}
list.add(hv.getVideo());
}
+
count = (new StringBuilder(String.valueOf(homeTypeService.getVideoCountByTypes(homeType, pageIndex))))
.toString();
} else if (!StringUtil.isNullOrEmpty(videoType)) {
@@ -457,7 +459,7 @@
Long startTime = System.currentTimeMillis();
List<VideoInfo> list1 = classService.getTypeVideoList(videoType, detailSystem, pageIndex, 20,
Integer.parseInt(order), resourceList, CacheUtil.getMD5Long(resourceList));
- list = new ArrayList<VideoInfo>();
+ list = new ArrayList<>();
if (list1 != null)
for (VideoInfo info : list1)
list.add(info);
@@ -466,7 +468,7 @@
} else {
List<VideoInfo> list1 = classService.getTypeVideoList(videoType, detailSystem, pageIndex, 20, 1,
resourceList, CacheUtil.getMD5Long(resourceList));
- list = new ArrayList<VideoInfo>();
+ list = new ArrayList<>();
if (list1 != null)
for (VideoInfo info : list1)
list.add(info);
@@ -500,7 +502,7 @@
//缂撳瓨鏁版嵁
if (list != null && list.size() > 0) {
- redisManager.saveVideoList(key, new VideoListResultVO(list, count));
+ redisManager.saveVideoList(key, new VideoListResultVO(list, Long.parseLong(count)));
}
}
@@ -756,26 +758,10 @@
public void getRecommendCategoryVideoList(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
String typeid = request.getParameter("Type");
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- // int count =
- // categoryRecommendVideoService.getRankVideoNumber(Integer.parseInt(typeid));
List<VideoInfo> rankList = categoryRecommendCacheVideoService.getVideoListByRank(Integer.parseInt(typeid),
- detailSystem.getId());
+ detailSystem.getId(), acceptData.getPlatform(), acceptData.getVersion());
List<VideoInfo> list = new ArrayList<VideoInfo>();
list.addAll(rankList);
- // List<VideoInfo> list1 =
- // recommendService.getCategoryRecommendVideoList(Integer.parseInt(typeid),
- // count);
- // int crvs = list1.size();
- // for (CategoryRecommendCacheVideo crcv : rankList) {
- // int rank = crcv.getRank();
- // if(crvs > 0 && rank > 0 && rank <= crvs ){
- // list1.add(rank-1, crcv.getVideoInfo());
- // }
- // }
- // list.addAll(list1.subList(0, list1.size()>count?count:list1.size()));
- //
- // list = banQuanService.getBanQuanVideo(list, detailSystem.getId(),
- // CacheUtil.getMD5VideoInfo(list));
for (VideoInfo vi : list) {// 娓呴櫎鏃犵敤鏁版嵁,闃叉娴垂甯﹀,鏇存敼鍥剧墖
vi.setIntroduction("");
vi.setMainActor("");
--
Gitblit v1.8.0