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/SearchService.java | 24 +++++++++++++++++++-----
1 files changed, 19 insertions(+), 5 deletions(-)
diff --git a/src/main/java/com/yeshi/buwan/service/imp/SearchService.java b/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
index fccde09..57b6482 100644
--- a/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
+++ b/src/main/java/com/yeshi/buwan/service/imp/SearchService.java
@@ -9,6 +9,7 @@
import com.yeshi.buwan.domain.web.HotSearchAdmin;
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.inter.video.VideoInfoExtraService;
import com.yeshi.buwan.service.manager.SolrAlbumVideoDataManager;
import com.yeshi.buwan.util.*;
@@ -17,6 +18,8 @@
import com.yeshi.buwan.vo.video.VideoListResultVO;
import org.hibernate.HibernateException;
import org.hibernate.Session;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import org.springframework.cache.annotation.Cacheable;
import org.springframework.orm.hibernate4.HibernateCallback;
import org.springframework.stereotype.Service;
@@ -28,6 +31,9 @@
@Service
public class SearchService {
+ private Logger logger= LoggerFactory.getLogger(SearchService.class);
+
+
@Resource
private SearchDao searchDao;
@Resource
@@ -285,7 +291,11 @@
SolrVideoSearchFilter filter = new SolrVideoSearchFilter();
filter.setKey(key);
- filter.setVideoType(videoType == 0 ? null : videoType);
+ if (videoType == Constant.SEARCH_RESULT_TYPE_HIGH_DEFINITION) {
+ filter.setResourceIds(new String[]{PPTVUtil.RESOURCE_ID + ""});
+ logger.info("楂樻竻鎼滅储# key锛歿}",key);
+ } else
+ filter.setVideoType(videoType == 0 ? null : videoType);
filter.setContentType(1);
SolrResultDTO solrResultDTO = solrAlbumDataManager.find(filter, page, pageSize);
@@ -328,11 +338,15 @@
if (videoType == 0 && commonSolrPage > 0) {
//鎼滅储鍘熷鐨�
- List<VideoInfo> solrList = SolrUtil.search(key, commonSolrPage);
- for (VideoInfo vi : solrList) {
- if (!solrAlbumVids.contains(vi.getId())) {
- localList.add(vi);
+ try {
+ List<VideoInfo> solrList = SolrUtil.search(key, commonSolrPage);
+ for (VideoInfo vi : solrList) {
+ if (!solrAlbumVids.contains(vi.getId())) {
+ localList.add(vi);
+ }
}
+ } catch (Exception e) {
+
}
}
System.out.println("鎼滅储鑰楁椂:" + (System.currentTimeMillis() - startt));
--
Gitblit v1.8.0