add

search/utils/topic.py

@@ -148,10 +148,10 @@ 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_pictorial_user_info_list = result_dict["hits"][0]["_source"]["same_pictorial_user_id_list"]
-                #
-                # same_pictorial_id_list = [item["user_id"] for item in same_pictorial_user_info_list]
-                # same_pictorial_id_list = same_pictorial_id_list[:100]
+                same_pictorial_user_info_list = result_dict["hits"][0]["_source"]["same_pictorial_user_id_list"]
+
+                same_pictorial_id_list = [item["user_id"] for item in same_pictorial_user_info_list]
+                same_pictorial_id_list = same_pictorial_id_list[:100]
 
                 user_tag_list = result_dict["hits"][0]["_source"]["tag_list"]
 
@@ -206,14 +206,14 @@ class TopicUtils(object):
                     }
                 )
 
-            # if len(same_pictorial_id_list) > 0:
-            #     functions_list.append(
-            #         {
-            #             "filter": {"bool": {
-            #                 "should": {"terms": {"user_id": same_pictorial_id_list}}}},
-            #             "weight": 1
-            #         }
-            #     )
+            if len(same_pictorial_id_list) > 0:
+                functions_list.append(
+                    {
+                        "filter": {"bool": {
+                            "should": {"terms": {"user_id": same_pictorial_id_list}}}},
+                        "weight": 1
+                    }
+                )
 
             # query_tag_term_list = cls.___get_should_term_list(user_tag_list)
             if len(user_tag_list) > 0:

trans2es/models/pictorial.py

@@ -39,6 +39,17 @@ class PictorialTopics(models.Model):
     is_online = models.BooleanField(verbose_name=u'是否上线')
     is_deleted = models.BooleanField(verbose_name=u'是否删除')
 
+#
+# class Topicss(models.Model):
+#     class Meta:
+#         verbose_name = u'日记'
+#         db_table = 'topic'
+#
+#     id = models.IntegerField(verbose_name=u'日记ID', primary_key=True)
+#     vote_num = models.IntegerField(verbose_name=u'点赞数')
+
+
+
 
 class Pictorial(models.Model):
     """画报关注"""

trans2es/models/user.py

@@ -151,10 +151,6 @@ class User(models.Model):
             if len(same_pictorial_user_id_list)>=100:
                 break
 
-        logging.info("get   same  user_id:%s"%self.user_id)
-        logging.info("get same_pictorial_user_id_list:%s"%same_pictorial_user_id_list)
-
-
         same_pictorial_detail_list = list()
         for i in range(0, len(same_pictorial_user_id_list), 200):
             sql_data_list = User.objects.using(settings.SLAVE_DB_NAME).filter(user_id__in=same_pictorial_user_id_list[i:i + 1000])