Merge branch 'set_tag_list' into 'test'

Set tag list

See merge request !450

linucb/views/collect_data.py

@@ -17,6 +17,8 @@ import libs.tools as Tools
 from trans2es.models.pictorial import CommunityPictorialHomeFeed
 from libs.error import logging_exception
 import os
+from search.views.tag import get_same_tagset_ids
+
 
 class KafkaManager(object):
     consumser_obj = None
@@ -91,7 +93,8 @@ class CollectData(object):
                 recommend_lin_pictorial_id_list = list()
 
                 if click_topic_tag_list and len(click_topic_tag_list)>0:
-                    recommend_topic_id_list_click,recommend_topic_id_list_click_dict = ESPerform.get_tag_topic_list_dict(click_topic_tag_list,
+                    click_topic_tag_list_same_tagset_ids = get_same_tagset_ids(click_topic_tag_list)
+                    recommend_topic_id_list_click,recommend_topic_id_list_click_dict = ESPerform.get_tag_topic_list_dict(click_topic_tag_list_same_tagset_ids,
                                                                                  have_read_topic_id_list,size=2)
                     if len(recommend_topic_id_list_click) > 0:
                         recommend_topic_id_list.extend(recommend_topic_id_list_click)
@@ -120,12 +123,14 @@ class CollectData(object):
                 # if len(recommend_topic_id_list)==0 and cursor==0 and len(redis_topic_list)>0:
                 #     have_read_topic_id_list.extend(redis_topic_list[:2])
                 if len(new_user_click_tag_list)>0:
-                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(new_user_click_tag_list, have_read_topic_id_list)
-                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(new_user_click_tag_list,
+                     new_user_click_tag_list_same_tagset_ids = get_same_tagset_ids(new_user_click_tag_list)
+                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(new_user_click_tag_list_same_tagset_ids, have_read_topic_id_list)
+                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(new_user_click_tag_list_same_tagset_ids,
                                                                                       have_read_lin_pictorial_id_list)
                 else:
-                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(tag_id_list,have_read_topic_id_list)
-                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(tag_id_list,
+                     tag_id_list_same_tagset_ids = get_same_tagset_ids(tag_id_list)
+                     tag_topic_id_list,tag_topic_dict = ESPerform.get_tag_topic_list_dict(tag_id_list_same_tagset_ids,have_read_topic_id_list)
+                     recommend_lin_pictorial_id_list = ESPerform.get_tag_pictorial_id_list(tag_id_list_same_tagset_ids,
                                                                                       have_read_lin_pictorial_id_list)
 
                 if len(recommend_topic_id_list)>0 or len(tag_topic_id_list)>0 or len(new_user_click_tag_list) > 0:

search/utils/topic.py

@@ -4,16 +4,14 @@
 import logging
 import traceback
 import json
-
 from alpha_types.venus import TOPIC_SEARCH_SORT
-
+from search.views.tag import get_same_tagset_ids
 from libs.es import ESPerform
 from .common import TopicDocumentField
 from search.utils.common import *
 from trans2es.models.pictorial import PictorialTopics
 from libs.cache import redis_client
 
-
 class TopicUtils(object):
 
     @classmethod
@@ -239,9 +237,10 @@ class TopicUtils(object):
                 }
                 query_function_score["boost_mode"] = "replace"
 
+                tag_ids = get_same_tagset_ids(tag_id)
                 query_function_score["query"]["bool"]["should"] = [
                     {'multi_match': multi_match},
-                    {"term": {"tag_list": tag_id}},
+                    {"terms": {"tag_list": tag_ids}},
                     {"term": {"user_nick_name_pre": query.lower()}}
                 ]
                 query_function_score["query"]["bool"]["minimum_should_match"] = 1

search/views/group.py

@@ -17,6 +17,7 @@ from trans2es.models.topic import CommunityCategoryTagRelation
 from trans2es.models.pictorial import PictorialTopics
 from trans2es.models.pictorial import CommunityPictorialActivity
 from alpha_types.venus import PICTORIAL_ACTIVITY_SORT
+from search.views.tag import get_same_tagset_ids
 
 
 @bind("physical/search/query_pictorial")
@@ -148,6 +149,10 @@ def pictorial_topic(topic_id=-1, offset=0, size=10):
             for item in result_dict["hits"]:
                 pict_pictorial_ids_list = item["_source"]["pictorial_id"]
                 topic_tag_list = item["_source"]["tag_list"]
+
+        ##拿到这些标签的同义词
+
+        topic_tag_list = get_same_tagset_ids(topic_tag_list)
         ##先拿到当前帖子对应的标签的分类ID
         tag_type_ids = CommunityCategoryTagRelation.objects.filter(tag_id__in=topic_tag_list,
                                                                    is_online=True, is_deleted=False).values_list(

trans2es/models/tag.py

@@ -107,4 +107,15 @@ class SettingsConfig(models.Model):
     key = models.IntegerField(verbose_name=u"值")
     val = models.IntegerField(verbose_name="标签内容")
 
+class CommunityTagSetRelation(models.Model):
+    class Meta:
+        verbose_name = "搜索热词"
+        db_table = "community_tag_set_relation"
+
+    id = models.IntegerField(primary_key=True, verbose_name=u"主键ID")
+    tag_id = models.IntegerField(verbose_name=u"标签ID")
+    tag_set_id = models.IntegerField(verbose_name=u"标签ID")
+    is_deleted = models.BooleanField(verbose_name=u"是否删除")
+
+