Merge branch 'master' of git.wanmeizhensuo.com:alpha/physical

search/views/topic.py

@@ -247,7 +247,7 @@ def home_query(device_id="", tag_id=-1, user_id=-1, query="", offset=0, size=10)
 
 
 @bind("physical/search/topic_detail_page_recommend")
-def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_group_id=-1, topic_user_id=-1,
+def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_pictorial_id=-1, topic_user_id=-1,
                                 filter_topic_user_id=False, offset=0, size=10):
     """
     :remark:帖子详情页推荐策略，缺少第一个卡片策略
@@ -271,7 +271,7 @@ def topic_detail_page_recommend(device_id="", user_id=-1, topic_id=-1, topic_gro
         # 获取帖子标签列表
         topic_tag_list = TopicUtils.get_topic_tag_id_list(topic_id, es_cli_obj)
 
-        result_list = TopicUtils.get_topic_detail_recommend_list(user_id, topic_id, topic_tag_list, topic_group_id,
+        result_list = TopicUtils.get_topic_detail_recommend_list(user_id, topic_id, topic_tag_list, topic_pictorial_id,
                                                                  topic_user_id, filter_topic_user_id,
                                                                  have_read_topic_list, offset, size, es_cli_obj,index_type="topic-high-star")
         recommend_topic_ids_list = list()

trans2es/models/user.py

@@ -15,7 +15,7 @@ from .group_user_role import GroupUserRole
 from .tag import AccountUserTag
 from .topic import Topic
 from .user_extra import UserExtra
-
+from .pictorial import PictorialFollow
 
 class User(models.Model):
     class Meta:
@@ -91,6 +91,26 @@ class User(models.Model):
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return []
 
+    def get_attention_pictorial_id_list(self):
+        try:
+            attention_pictorial_id_list = list()
+            query_results = PictorialFollow.objects.using(settings.SLAVE_DB_NAME).filter(is_online=True, user_id=self.user_id)
+            logging.info("get PictorialFollow:%s"%query_results)
+            for item in query_results:
+                item_dict = {
+                    "pictorial_id": item.pictorial_id,
+                    "update_time_val": time.mktime(tzlc(item.update_time).timetuple())
+                }
+                attention_pictorial_id_list.append(item_dict)
+            logging.info("get user_id:%s" %self.user_id)
+
+            logging.info("get same_pictorial_user_id_list:%s" % attention_pictorial_id_list)
+
+            return attention_pictorial_id_list
+        except:
+            logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+            return []
+
     def get_pick_user_id_list(self):
         pick_topic_id_list = list()
         user_picks = self.user_pick.using(settings.SLAVE_DB_NAME).filter(is_deleted=False, is_pick=True)
@@ -117,32 +137,35 @@ class User(models.Model):
 
         return pick_user_detail_list
 
-    def get_same_group_user_id_list(self):
+    def get_same_pictorial_user_id_list(self):
 
         #todo 有的同组数据过大，导致celery cpu过高，暂时限制同组的数据大小，后续可能会去掉同组的数据
-        same_group_user_id_list = list()
-        group_items_list = list(GroupUserRole.objects.using(settings.SLAVE_DB_NAME).filter(user_id=self.user_id).values_list("group_id",flat=True))
-        for group_id in group_items_list:
-            user_items_list = list(GroupUserRole.objects.using(settings.SLAVE_DB_NAME).filter(group_id=group_id).values_list("user_id",flat=True))
+        same_pictorial_user_id_list = list()
+        pictorial_items_list = list(PictorialFollow.objects.using(settings.SLAVE_DB_NAME).filter(user_id=self.user_id).values_list("pictorial_id",flat=True))
+        for pictorial_id in pictorial_items_list:
+            user_items_list = list(PictorialFollow.objects.using(settings.SLAVE_DB_NAME).filter(pictorial_id=pictorial_id).values_list("user_id",flat=True))
             for user_id in user_items_list:
-                same_group_user_id_list.append(user_id)
-                if len(same_group_user_id_list)>=100:
+                same_pictorial_user_id_list.append(user_id)
+                if len(same_pictorial_user_id_list)>=100:
                     break
-            if len(same_group_user_id_list)>=100:
+            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_group_detail_list = list()
-        for i in range(0, len(same_group_user_id_list), 200):
-            sql_data_list = User.objects.using(settings.SLAVE_DB_NAME).filter(user_id__in=same_group_user_id_list[i:i + 1000])
+        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])
             for detail_data in sql_data_list:
                 item = {
                     "user_id": detail_data.user_id,
                     "country_id": detail_data.country_id
                 }
-                same_group_detail_list.append(item)
+                same_pictorial_detail_list.append(item)
 
-        return same_group_detail_list
+        return same_pictorial_detail_list
 
     def get_user_tag_id_list(self):
         try:

trans2es/utils/user_transfer.py

@@ -74,16 +74,26 @@ class UserTransfer(object):
             try:
                 res["tag_list"] = instance.get_user_tag_id_list()
                 res["attention_user_id_list"] = cls.get_follow_user_id_list(userInstance=instance)
-                res["attention_group_id_list"] = instance.get_attention_group_id_list()
+
+                # res["attention_group_id_list"] = instance.get_attention_group_id_list()
                 res["pick_user_id_list"] = instance.get_pick_user_id_list()
-                res["same_group_user_id_list"] = instance.get_same_group_user_id_list()
+
+                res["attention_pictorial_id_list"] = instance.get_attention_pictorial_id_list()
+
+                # res["same_group_user_id_list"] = instance.get_same_group_user_id_list()
+                res["same_pictorial_user_id_list"] = instance.get_same_pictorial_user_id_list()
+
             except:
                 logging.error("catch exception,err_msg:%s" % traceback.format_exc())
                 res["tag_list"] = []
                 res["attention_user_id_list"] = []
-                res["attention_group_id_list"] = []
+                # res["attention_group_id_list"] = []
                 res["pick_user_id_list"] = []
-                res["same_group_user_id_list"] = []
+                # res["same_group_user_id_list"] = []
+
+                res["attention_pictorial_id_list"] = []
+                res["same_pictorial_user_id_list"] = []
+
 
             return res
         except: