From 0fc0456a587d985fda71c66b9764fe1d5e3c6421 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期四, 29 七月 2021 19:11:01 +0800
Subject: [PATCH] 分系统完善
---
src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java | 50 +++++++++++++++++++++++++++++++-------------------
1 files changed, 31 insertions(+), 19 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 e6007b0..1c28553 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java
@@ -8,12 +8,14 @@
import com.yeshi.buwan.domain.solr.SolrAlbumVideo;
import com.yeshi.buwan.domain.special.Special;
import com.yeshi.buwan.domain.system.DetailSystem;
+import com.yeshi.buwan.domain.system.DetailSystemConfig;
import com.yeshi.buwan.dto.search.SolrResultDTO;
import com.yeshi.buwan.dto.search.SolrVideoSearchFilter;
import com.yeshi.buwan.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.imp.recommend.CategoryRecommendVideoService;
import com.yeshi.buwan.service.inter.recommend.HomeRecommendSpecialService;
+import com.yeshi.buwan.service.inter.system.SystemConfigService;
import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
import com.yeshi.buwan.service.manager.SolrCommonVideoDataManager;
import com.yeshi.buwan.util.*;
@@ -76,6 +78,9 @@
@Resource
private HomeRecommendSpecialService homeRecommendSpecialService;
+
+ @Resource
+ private DetailSystemConfigService detailSystemConfigService;
@RequireUid
public void getClass(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -328,6 +333,13 @@
if (sv.getType().getId() != 309L && sv.getType().getId() != 310L)
typelist.add(vo);
}
+
+ //IOS瀹℃牳鐗堟湰
+ DetailSystemConfig onLineVersion = detailSystemConfigService.getConfigByKey("ios_online_version", detailSystem, acceptData.getVersion());
+ if (onLineVersion != null && Integer.parseInt(onLineVersion.getValue()) <= acceptData.getVersion()) {
+ typelist.clear();
+ }
+
//鑾峰彇棣栭〉鎺ㄨ崘鏍囩
List<HomeRecommendSpecial> specialList = homeRecommendSpecialService.listSpecialByDetailSystemId(acceptData.getDetailSystem().getId(), null, 1, Constant.pageCount);
if (specialList != null) {
@@ -342,7 +354,6 @@
if (vo.getName().contains("楂樻竻"))
vo.setColor("#ff6600");
typelist.add(0, vo);
-
}
}
@@ -413,7 +424,7 @@
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(detailSystem, acceptData.getVersion(), acceptData.getChannel());
List<VideoInfo> list = starService.getStarVideo(detailSystem.getId(), starId, pageIndex,
CacheUtil.getMD5Long(resourceList));
@@ -475,7 +486,7 @@
if (Utils.isTest(request, user, detailSystem.getId()))
detailSystem = systemService.getDetailSystemById(40 + "");
- List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<Long> resourceList = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
String resourceMD5 = CacheUtil.getMD5Long(resourceList);
@@ -853,7 +864,7 @@
String specialid = request.getParameter("Id");
Special special = specialService.getSpecial(specialid);
List<VideoInfo> list = specialService.getSpecialVideoList(specialid);
- List<Long> availableResourceIds = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion());
+ List<Long> availableResourceIds = videoResouceUtil.getAvailableResourceIds(acceptData.getDetailSystem(), acceptData.getVersion(), acceptData.getChannel());
List<VideoInfo> tempList = new ArrayList<>();
for (VideoInfo videoInfo : list) {
List<VideoResource> resourceList = videoResourceService.getResourceByVideo(videoInfo);
@@ -945,21 +956,22 @@
String typeid = request.getParameter("Type");
DetailSystem detailSystem = systemService.getDetailSystemByPackage(acceptData.getPackageName());
List<VideoInfo> rankList = null;
- if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() >= Constant.IOS_ONLINING_VERSION) {
- SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
- filter.setResourceIds(new String[]{25 + ""});
- filter.setVideoType(Integer.parseInt(typeid));
- filter.setFreeType(0);
- SolrResultDTO dto = solrAlbumVideoDataManager.find(filter, 1, 30);
- List<SolrAlbumVideo> list = dto.getVideoList();
- rankList = new ArrayList<>();
- for (SolrAlbumVideo video : list) {
- rankList.add(VideoInfoFactory.create(video));
- }
- } else {
- rankList = categoryRecommendCacheVideoService.getVideoListByRank(Integer.parseInt(typeid),
- detailSystem.getId(), acceptData.getPlatform(), acceptData.getVersion());
- }
+// if ("ios".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() >= Constant.IOS_ONLINING_VERSION) {
+// SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
+// filter.setResourceIds(new String[]{25 + ""});
+// filter.setVideoType(Integer.parseInt(typeid));
+// filter.setFreeType(0);
+// SolrResultDTO dto = solrAlbumVideoDataManager.find(filter, 1, 30);
+// List<SolrAlbumVideo> list = dto.getVideoList();
+// rankList = new ArrayList<>();
+// for (SolrAlbumVideo video : list) {
+// rankList.add(VideoInfoFactory.create(video));
+// }
+// }
+// else {
+ rankList = categoryRecommendCacheVideoService.getVideoListByRank(Integer.parseInt(typeid),
+ detailSystem.getId(), acceptData.getPlatform(), acceptData.getVersion(), acceptData.getChannel());
+// }
List<VideoInfo> list = new ArrayList<>();
--
Gitblit v1.8.0