Commit a071dab3 authored by 段英荣's avatar 段英荣

modify

parent 0d7e7033
......@@ -135,7 +135,7 @@ class TopicUtils(object):
try:
attention_user_id_list = list()
pick_user_id_list = list()
same_group_id_list = list()
# same_group_id_list = list()
user_tag_list = list()
result_dict = TopicUtils.get_related_user_info(user_id, 0, 1)
......@@ -148,9 +148,9 @@ class TopicUtils(object):
pick_user_info_list = result_dict["hits"][0]["_source"]["pick_user_id_list"]
pick_user_id_list = [item["user_id"] for item in pick_user_info_list]
same_group_user_info_list = result_dict["hits"][0]["_source"]["same_group_user_id_list"]
same_group_id_list = [item["user_id"] for item in same_group_user_info_list]
same_group_id_list = same_group_id_list[:100]
# same_group_user_info_list = result_dict["hits"][0]["_source"]["same_group_user_id_list"]
# same_group_id_list = [item["user_id"] for item in same_group_user_info_list]
# same_group_id_list = same_group_id_list[:100]
user_tag_list = result_dict["hits"][0]["_source"]["tag_list"]
......@@ -204,14 +204,14 @@ class TopicUtils(object):
"weight": 2
}
)
if len(same_group_id_list)>0:
functions_list.append(
{
"filter": {"bool": {
"should": {"terms":{"user_id":same_group_id_list}}}},
"weight": 1
}
)
# if len(same_group_id_list)>0:
# functions_list.append(
# {
# "filter": {"bool": {
# "should": {"terms":{"user_id":same_group_id_list}}}},
# "weight": 1
# }
# )
# query_tag_term_list = cls.___get_should_term_list(user_tag_list)
if len(user_tag_list)>0:
......@@ -300,9 +300,9 @@ class TopicUtils(object):
query_function_score["query"]["bool"]["minimum_should_match"] = 1
q["query"]["function_score"] = query_function_score
q["collapse"] = {
"field": "user_id"
}
# q["collapse"] = {
# "field": "user_id"
# }
q["_source"] = {
"includes":["id","group_id","offline_score","user_id","edit_tag_list"]
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment