add

trans2es/mapping/user.json

@@ -28,17 +28,31 @@
         "country_id":{"type":"text"}
       }
     },
-    "same_group_user_id_list":{//同组用户列表
+//    "same_group_user_id_list":{//同组用户列表
+//      "type":"nested",
+//      "properties":{
+//        "user_id":{"type":"long"},
+//        "country_id":{"type":"text"}
+//      }
+//    },
+//    "attention_group_id_list":{//关注小组列表
+//      "type":"nested",
+//      "properties":{
+//        "group_id":{"type":"long"},
+//        "update_time_val":{"type":"long"}
+//      }
+//    },
+    "same_pictorial_user_id_list":{//同组用户列表
       "type":"nested",
       "properties":{
         "user_id":{"type":"long"},
         "country_id":{"type":"text"}
       }
     },
-    "attention_group_id_list":{//关注小组列表
+    "attention_pictorial_id_list":{//关注小组列表
       "type":"nested",
       "properties":{
-        "group_id":{"type":"long"},
+        "pictorial_id":{"type":"long"},
         "update_time_val":{"type":"long"}
       }
     },

trans2es/models/pictorial.py

@@ -2,7 +2,7 @@ from django.db import models
 import datetime
 import logging
 import traceback
-from .topic import Topic,TopicComplaint,TopicImage
+# from .topic import Topic
 
 class PictorialTopic(models.Model):
     """画报帖子关系"""
@@ -68,12 +68,12 @@ class Pictorial(models.Model):
 
             logging.info("get topic_id_list:%s" % topic_id_list)
 
-            topic_num = Topic.filter(content_level__in=("4", "5"), create_time__gte=yesterday_begin_time,
-                                     create_time__lte=yesterday_end_time, topic_id_in=topic_id_list).count()
-
-            logging.info("get topic_num:%s" % topic_num)
-
-            return topic_num
+            # topic_num = Topic.filter(content_level__in=("4", "5"), create_time__gte=yesterday_begin_time,
+            #                          create_time__lte=yesterday_end_time, topic_id_in=topic_id_list).count()
+            #
+            # logging.info("get topic_num:%s" % topic_num)
+            #
+            # return topic_num
 
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())

trans2es/models/topic.py

@@ -16,7 +16,7 @@ from .pick_topic import PickTopic
 from .tag import TopicTag, Tag
 from .user_extra import UserExtra
 from .group import Group
-from .pictorial import Pictorial,PictorialFollow,PictorialTopic
+from .pictorial import PictorialTopic
 
 
 class ActionSumAboutTopic(models.Model):

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,23 @@ 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)
+            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)
+
+            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)
@@ -120,29 +137,29 @@ class User(models.Model):
     def get_same_group_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
 
 
-        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,9 +74,14 @@ 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_group_id_list()
+
+                # res["same_group_user_id_list"] = instance.get_same_group_user_id_list()
+                res["same_pictorial_user_id_list"] = instance.get_same_group_user_id_list()
+
             except:
                 logging.error("catch exception,err_msg:%s" % traceback.format_exc())
                 res["tag_list"] = []