add

search/utils/topic.py

@@ -121,7 +121,7 @@ class TopicUtils(object):
             return {}
 
     @classmethod
-    def get_recommend_topic_ids(cls,tag_id,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:获取首页推荐帖子列表

search/views/topic.py

@@ -26,7 +26,7 @@ def get_discover_page_topic_ids(user_id,device_id,size,query_type=TopicPageType.
         have_read_topic_id_list = json.loads(redis_field_val_list[0]) if redis_field_val_list[0] else []
 
         recommend_topic_ids = []
-        topic_id_dict = TopicUtils.get_recommend_topic_ids(tag_id=0,user_id=user_id, offset=0, size=size,query_type=query_type,filter_topic_id_list=have_read_topic_id_list)
+        topic_id_dict = TopicUtils.get_recommend_topic_ids(user_id=user_id,tag_id=0, offset=0, size=size,query_type=query_type,filter_topic_id_list=have_read_topic_id_list)
 
         for topic_id in topic_id_dict:
             recommend_topic_ids.append(topic_id)
@@ -75,7 +75,7 @@ def get_home_recommend_topic_ids(user_id,device_id,tag_id,offset,size,query=None
         redis_user_similar_score_redis_val = redis_client.get(user_similar_score_redis_key)
         user_similar_score_redis_list = json.loads(redis_user_similar_score_redis_val) if redis_user_similar_score_redis_val else []
 
-        topic_id_dict = TopicUtils.get_recommend_topic_ids(tag_id,user_id, offset, size*size,query,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)
+        topic_id_dict = TopicUtils.get_recommend_topic_ids(user_id,tag_id, offset, size*size,query,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)
         have_read_group_id_set = set()
         have_read_user_id_set = set()
         unread_topic_id_dict = dict()

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(0,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