From 2778cf2a16823f9b1153a0549b47f7b503176a17 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期六, 12 九月 2020 18:04:43 +0800
Subject: [PATCH] 爱奇艺正片,搜索引擎

---
 src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/yeshi/buwan/service/manager/SolrDataManager.java b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java
similarity index 83%
rename from src/main/java/com/yeshi/buwan/service/manager/SolrDataManager.java
rename to src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java
index 127ebc6..8fe3f86 100644
--- a/src/main/java/com/yeshi/buwan/service/manager/SolrDataManager.java
+++ b/src/main/java/com/yeshi/buwan/service/manager/SolrAlbumDataManager.java
@@ -5,6 +5,7 @@
 import com.yeshi.buwan.util.factory.SolrVideoFactory;
 import org.apache.solr.client.solrj.response.UpdateResponse;
 import org.springframework.data.solr.core.SolrTemplate;
+import org.springframework.data.solr.core.query.Criteria;
 import org.springframework.data.solr.core.query.Query;
 import org.springframework.data.solr.core.query.SimpleQuery;
 import org.springframework.data.solr.core.query.result.ScoredPage;
@@ -15,10 +16,10 @@
 import java.util.List;
 
 /**
- * 鎼滅储寮曟搸鏁版嵁绠$悊
+ * 鎼滅储寮曟搸-涓撹緫鏁版嵁绠$悊
  */
 @Component
-public class SolrDataManager {
+public class SolrAlbumDataManager {
 
     @Resource
     private SolrTemplate solrTemplate;
@@ -60,11 +61,19 @@
         return solrVideo;
     }
 
-    public List<SolrVideo> findByKey(String key, int page) {
+    public List<SolrVideo> findByKey(String key, Integer contentType, Integer videoType, int page) {
         int pageSize = 20;
-        Query query = new SimpleQuery("name:" + key);
+        Query query = new SimpleQuery("name:\"" + key+"\"");
+
+        Criteria criteria =new Criteria("contenttype").is(contentType);
+
+        if (videoType != null)
+            criteria = criteria.and("root_video_type").is(videoType);
+
         /** 娣诲姞鏉′欢 */
-//        query.addCriteria(criteria);
+        if (criteria != null)
+            query.addCriteria(criteria);
+
         /** 璁剧疆鍒嗛〉寮�濮嬭褰曟暟(绗竴椤�) 榛樿0 */
         query.setOffset((page - 1) * page);
         /** 璁剧疆姣忛〉鏄剧ず璁板綍鏁帮紝榛樿10 */
@@ -76,7 +85,7 @@
     }
 
     public List<String> getSuggestKeyList(String key) {
-        Query query = new SimpleQuery("name:" + key);
+        Query query = new SimpleQuery("name:\""+key+"\"");
         /** 璁剧疆鍒嗛〉寮�濮嬭褰曟暟(绗竴椤�) 榛樿0 */
         query.setOffset(0);
         /** 璁剧疆姣忛〉鏄剧ず璁板綍鏁帮紝榛樿10 */

--
Gitblit v1.8.0