Merge branch 'master' into 'similar_sort'

# Conflicts:
#   search/views/topic.py

search/utils/topic.py

@@ -121,7 +121,7 @@ class TopicUtils(object):
             return {}
 
     @classmethod
-    def get_recommend_topic_ids(cls,user_id,offset,size,query=None,query_type=TopicPageType.FIND_PAGE,filter_topic_id_list=[],test_score=False,must_topic_id_list=[],recommend_tag_list=[],user_similar_score_list=[]):
+    def get_recommend_topic_ids(cls,user_id,tag_id,offset,size,query=None,query_type=TopicPageType.FIND_PAGE,filter_topic_id_list=[],test_score=False,must_topic_id_list=[],recommend_tag_list=[],user_similar_score_list=[]):
         """
         :需增加打散逻辑
         :remark:获取首页推荐帖子列表
@@ -291,8 +291,10 @@ class TopicUtils(object):
                     'operator': 'and',
                     'fields': query_fields,
                 }
+
                 query_function_score["query"]["bool"]["should"] = [
-                    {'multi_match': multi_match}
+                    {'multi_match': multi_match},
+                    {"term":{"tag_list":tag_id}}
                 ]
                 query_function_score["query"]["bool"]["minimum_should_match"] = 1
 

trans2es/management/commands/trans2es_data2es_parallel.py

@@ -129,7 +129,7 @@ class Command(BaseCommand):
 
     def generate_topic_score_detail(self):
         try:
-            topic_id_dict = TopicUtils.get_recommend_topic_ids(241432787, 0, 500,query_type=TopicPageType.HOME_RECOMMEND,test_score=True)
+            topic_id_dict = TopicUtils.get_recommend_topic_ids(241432787,0, 0, 500,query_type=TopicPageType.HOME_RECOMMEND,test_score=True)
             for topic_id in topic_id_dict:
 
                 offline_score = 0.0