modify content_level range

search/utils/topic.py

@@ -237,7 +237,7 @@ class TopicUtils(object):
                 "query": {
                     "bool": {
                         "filter": [
-                            {"range": {"content_level": {"gte": low_content_level, "lte": 5}}},
+                            # {"range": {"content_level": {"gte": low_content_level, "lte": 5}}},
                             {"term": {"has_image":True}},
                             {"term": {"is_online": True}},
                             {"term": {"is_deleted": False}}
@@ -361,7 +361,7 @@ class TopicUtils(object):
             return list()
 
     @classmethod
-    def get_topic_detail_recommend_list(cls,user_id,topic_id,topic_tag_list,topic_group_id,topic_user_id,filter_topic_user_id,have_read_topic_list,offset,size,es_cli_obj=None):
+    def get_topic_detail_recommend_list(cls,user_id,topic_id,topic_tag_list,topic_group_id,topic_user_id,filter_topic_user_id,have_read_topic_list,offset,size,es_cli_obj=None,index_type="topic"):
         """
         :remark 帖子详情页推荐列表,缺少按时间衰减
         :param user_id:
@@ -408,7 +408,7 @@ class TopicUtils(object):
                 "query":{
                     "bool":{
                         "must": [
-                            {"range": {"content_level": {"gte": 3, "lte": 5}}},
+                            # {"range": {"content_level": {"gte": 3, "lte": 5}}},
                             {"term": {"is_online": True}},
                             {"term": {"is_deleted": False}}
                         ],
@@ -437,7 +437,7 @@ class TopicUtils(object):
                 "includes":["id","group_id","user_id","_score"]
             }
 
-            result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name="topic", query_body=q,
+            result_dict = ESPerform.get_search_results(es_cli_obj, sub_index_name=index_type, query_body=q,
                                                        offset=offset, size=size)
 
             return result_dict["hits"]

search/views/topic.py

@@ -27,7 +27,7 @@ def get_discover_page_topic_ids(user_id, device_id, size, query_type=TopicPageTy
 
         recommend_topic_ids = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=0, offset=0, size=size,single_size=size,
                                                            query_type=query_type,
-                                                           filter_topic_id_list=have_read_topic_id_list)
+                                                           filter_topic_id_list=have_read_topic_id_list,index_type="topic-high-star")
 
 
         have_read_topic_id_list.extend(recommend_topic_ids)
@@ -84,7 +84,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
                                                            single_size=size,query=query, query_type=query_type,
                                                            filter_topic_id_list=have_read_topic_id_list,
                                                            recommend_tag_list=recommend_tag_list,
-                                                           user_similar_score_list=user_similar_score_redis_list)
+                                                           user_similar_score_list=user_similar_score_redis_list,index_type="topic-high-star")
         have_read_group_id_set = set()
         have_read_user_id_set = set()
         unread_topic_id_dict = dict()
@@ -273,7 +273,7 @@ def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_gro
 
         result_list = TopicUtils.get_topic_detail_recommend_list(user_id, topic_id, topic_tag_list, topic_group_id,
                                                                  topic_user_id, filter_topic_user_id,
-                                                                 have_read_topic_list, offset, size, es_cli_obj)
+                                                                 have_read_topic_list, offset, size, es_cli_obj,index_type="topic-high-star")
         recommend_topic_ids_list = list()
         if len(result_list) > 0:
             recommend_topic_ids_list = [item["_source"]["id"] for item in result_list]
@@ -347,7 +347,7 @@ def query_topic_by_user_similarity(topic_similarity_score_dict, offset=0, size=1
 
         must_topic_id_list = list(topic_similarity_score_dict.keys())
         topic_id_list = TopicUtils.get_recommend_topic_ids(tag_id=0, user_id=-1, offset=offset, size=size,single_size=size,
-                                                           must_topic_id_list=must_topic_id_list)
+                                                           must_topic_id_list=must_topic_id_list,index_type="topic-high-star")
 
         return {"recommend_topic_ids": topic_id_list}
     except: