From 04f09e52ffd4681bdfd85e51acd3da0d1280c3d3 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 16 四月 2022 16:07:10 +0800
Subject: [PATCH] bug修复
---
src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java | 96 +++++++++++++++++++++++++++++++++++------------
1 files changed, 71 insertions(+), 25 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 513e9d3..8661693 100644
--- a/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java
+++ b/src/main/java/com/yeshi/buwan/controller/parser/ClassParser.java
@@ -5,11 +5,14 @@
import com.yeshi.buwan.domain.ad.CommonAdPositionAd;
import com.yeshi.buwan.domain.recommend.CategoryRecommendVideo;
import com.yeshi.buwan.domain.recommend.HomeRecommendSpecial;
+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.service.manager.search.SolrInternetSearchVideoDataManager;
+import com.yeshi.buwan.util.factory.VideoInfoFactory;
import com.yeshi.buwan.videos.pptv.PPTVUtil;
import com.yeshi.buwan.service.imp.*;
import com.yeshi.buwan.service.imp.recommend.CategoryRecommendVideoService;
@@ -69,6 +72,9 @@
private SolrAlbumVideoDataManager solrAlbumVideoDataManager;
@Resource
+ private SolrInternetSearchVideoDataManager solrInternetSearchVideoDataManager;
+
+ @Resource
private SearchService searchService;
@Resource
@@ -76,6 +82,21 @@
@Resource
private DetailSystemConfigService detailSystemConfigService;
+
+
+ private static String[] getAreas(String area) {
+ switch (area) {
+ case "娓彴":
+ return new String[]{"棣欐腐", "鍙版咕"};
+ case "鍏朵粬鍥藉":
+ return new String[]{"婢冲ぇ鍒╀簹", "鏂板姞鍧�", "鍗板害"};
+ case "娆ф床":
+ return new String[]{"鑻卞浗", "娉曞浗", "寰峰浗", "淇勭綏鏂�", "鎰忓ぇ鍒�", "鍦熻�冲叾"};
+ default:
+ return new String[]{area};
+ }
+ }
+
@RequireUid
public void getClass(AcceptData acceptData, HttpServletRequest request, PrintWriter out) {
@@ -167,25 +188,25 @@
//Android骞冲彴3.8.7涔嬪悗杩斿洖VIP
- if ("android".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() >= 105) {
-
- SuperVideoType sty = new SuperVideoType();
- sty.setCreatetime(0 + "");
- sty.setPicture("");
- VideoType vt = new VideoType(Constant.VIDEO_TYPE_VIP);
- vt.setName("VIP");
- vt.setShow("1");
- vt.setIcon("https://hbimg.huabanimg.com/4690ea8f8144f3d46c11e417c77daa5debcb71f9201f-WpAbfw_fw658/format/jpg");
- sty.setType(vt);
- boolean isC = false;
- for (SuperVideoType svt : list) {
- if (svt.getType().getId() == vt.getId()) {
- isC = true;
- break;
- }
- }
- list.add(sty);
- }
+// if ("android".equalsIgnoreCase(acceptData.getPlatform()) && acceptData.getVersion() >= 105) {
+//
+// SuperVideoType sty = new SuperVideoType();
+// sty.setCreatetime(0 + "");
+// sty.setPicture("");
+// VideoType vt = new VideoType(Constant.VIDEO_TYPE_VIP);
+// vt.setName("VIP");
+// vt.setShow("1");
+// vt.setIcon("https://hbimg.huabanimg.com/4690ea8f8144f3d46c11e417c77daa5debcb71f9201f-WpAbfw_fw658/format/jpg");
+// sty.setType(vt);
+// boolean isC = false;
+// for (SuperVideoType svt : list) {
+// if (svt.getType().getId() == vt.getId()) {
+// isC = true;
+// break;
+// }
+// }
+// list.add(sty);
+// }
List<VideoType> typelist = new ArrayList<VideoType>();
@@ -490,7 +511,7 @@
VideoListResultVO vo = null;
try {
- vo = redisManager.getVideoList(key);
+ vo = redisManager.getVideoList(key);
} catch (Exception e) {
e.printStackTrace();
}
@@ -590,12 +611,37 @@
long typeid = cc.getParent().getCid();
if (StringUtil.isNullOrEmpty(order))
order = 1 + "";
- list = categoryAreaService.getVideoInfoByArea(typeid + "", detailSystem, pageIndex, 20,
- Integer.parseInt(order), resourceList, country,
- StringUtil.Md5(typeid + "-" + detailSystem + "-" + pageIndex + "-" + order + "-" + country
- + "-" + CacheUtil.getMD5Long(resourceList)));
+ //閫氳繃涓撹緫鎼滅储鏌ヨ
+ List<String> rids = new ArrayList<>();
+ for (Long rid : resourceList) {
+ rids.add(rid + "");
+ }
+
+ SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
+ filter.setResourceIds(rids);
+ filter.setVideoType((int) typeid);
+ filter.setAreas(Arrays.asList(getAreas(country)));
+ SolrResultDTO result = solrAlbumVideoDataManager.find(filter, pageIndex, 20);
+
+ list = new ArrayList<>();
+ for (Object av : result.getVideoList()) {
+ list.add(VideoInfoFactory.create((SolrAlbumVideo) av));
+ }
+ count = result.getTotalCount() + "";
+
+ if (pageIndex == 1 && result.getTotalCount() == 0) {
+
+ solrInternetSearchVideoDataManager.find(filter,pageIndex,20);
+
+ }
+
+
+// list = categoryAreaService.getVideoInfoByArea(typeid + "", detailSystem, pageIndex, 20,
+// Integer.parseInt(order), resourceList, country,
+// StringUtil.Md5(typeid + "-" + detailSystem + "-" + pageIndex + "-" + order + "-" + country
+// + "-" + CacheUtil.getMD5Long(resourceList)));
System.out.println("鍒楄〃鏈�缁堟暟閲�:" + list.size());
- count = 1000 + "";
+// count = 1000 + "";
}
}
}
--
Gitblit v1.8.0