Merge branch 'gyz' into 'master'

增加首页lin榜单的参数

See merge request alpha/physical!468

search/views/topic.py

@@ -365,7 +365,7 @@ def query_tag_id_by_topic(offset=0, size=10, topic_id_list=[], user_id=-1):
 
 
 @bind("physical/search/home_recommend")
-def home_recommend(device_id="", user_id=-1, offset=0, size=10, query_type=TopicPageType.HOME_RECOMMEND,
+def home_recommend(device_id="", user_id=-1, offset=0, lin_pictorial_count=4, size=10, query_type=TopicPageType.HOME_RECOMMEND,
                    promote_topic_list=[], usefulrecall=-1, useful_tag_list=[], is_debug=False):
     """
     :remark:首页推荐，目前只推荐日记
@@ -407,7 +407,7 @@ def home_recommend(device_id="", user_id=-1, offset=0, size=10, query_type=Topic
 
         else:
             if usefulrecall != -1 and len(useful_tag_list) > 0:
-                recommend_pictorial_ids = get_home_recommend_pictorial_ids(user_id, device_id, 4)
+                recommend_pictorial_ids = get_home_recommend_pictorial_ids(user_id, device_id, lin_pictorial_count)
                 size = size - len(recommend_pictorial_ids)
                 if is_debug:
                     has_score = True
@@ -443,7 +443,7 @@ def home_recommend(device_id="", user_id=-1, offset=0, size=10, query_type=Topic
                             "debug_model_data": results}
 
             else:
-                recommend_pictorial_ids = get_home_recommend_pictorial_ids(user_id, device_id, 4)
+                recommend_pictorial_ids = get_home_recommend_pictorial_ids(user_id, device_id, lin_pictorial_count)
                 size = size - len(recommend_pictorial_ids)
                 if is_debug:
                     has_score = True