Merge branch 'feature/sun_topic2es' into 'master'

帖子

See merge request !205

trans2es/models/pictorial.py

-# from django.db import models
+import datetime
 
+from django.db import models
 
-# class PictorialTopic(models.Model):
-#     """画报帖子关系"""
 
-#     class Meta:
-#         verbose_name = u'画报帖子关系'
-#         app_label = 'community'
-#         db_table = 'community_pictorial_topic'
+class PictorialTopic(models.Model):
+    """画报帖子关系"""
 
-#     id = models.IntegerField(verbose_name=u'日记ID', primary_key=True)
-#     pictorial_id = models.BigIntegerField(verbose_name=u'画报ID')
-#     topic_id = models.BigIntegerField(verbose_name=u'帖子ID')
-#     user_id = models.BigIntegerField(verbose_name=u'用户ID')
-#     is_online = models.BooleanField(verbose_name=u"是否有效", default=True)
-#     is_online = models.BooleanField(verbose_name=u'是否上线')
-#     is_deleted = models.BooleanField(verbose_name=u'是否删除')
+    class Meta:
+        verbose_name = u'画报帖子关系'
+        app_label = 'community'
+        db_table = 'community_pictorial_topic'
+
+    pictorial_id = models.BigIntegerField(verbose_name=u'画报ID')
+    topic_id = models.BigIntegerField(verbose_name=u'帖子ID')
+    is_online = models.BooleanField(verbose_name='是否上线')
+    is_deleted = models.BooleanField(verbose_name='是否删除')
+    create_time = models.DateTimeField(verbose_name=u'创建时间', default=datetime.datetime.fromtimestamp(0))
+    update_time = models.DateTimeField(verbose_name=u'更新时间', default=datetime.datetime.fromtimestamp(0))

trans2es/models/topic.py

@@ -16,6 +16,7 @@ from .pick_topic import PickTopic
 from .tag import TopicTag, Tag
 from .user_extra import UserExtra
 from .group import Group
+from .pictorial import PictorialTopic
 
 
 class ActionSumAboutTopic(models.Model):
@@ -83,6 +84,16 @@ class Topic(models.Model):
     platform = models.IntegerField(verbose_name=u'平台来源', choices=GRAP_PLATFORM, default=GRAP_PLATFORM.ALPHA)
     platform_id = models.BigIntegerField(verbose_name='用平台ID', null=True)
 
+    def get_pictorial_id(self):
+        try:
+            pictorial_id_list =[]
+            return list(PictorialTopic.objects.filter(
+                topic_id=self.id, is_online=True, is_deleted=False
+            ).values_list("pictorial_id",flat=True))
+        except:
+            logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+            return []
+
     @property
     def is_complaint(self):
         """是否被举报"""

trans2es/utils/topic_transfer.py

@@ -34,6 +34,8 @@ class TopicTransfer(object):
                 res["group_id"] = -1
             res["share_num"] = instance.share_num
 
+            res["pictorial_id"] = instance.get_pictorial_id()
+
             begin = time.time()
             res["pick_id_list"] = instance.get_pick_id_info()
             end = time.time()
@@ -78,6 +80,20 @@ class TopicTransfer(object):
             # else:
             #     res["language_type"] = instance.language_type
 
+            res["is_shadow"] = instance.is_shadow
+            res["is_recommend"] = True if instance.is_recommend else False
+            res["is_complaint"] = instance.is_complaint
+
+            res["virtual_content_level"] = instance.virtual_content_level
+            res["like_num_crawl"] = instance.like_num_crawl
+            res["comment_num_crawl"]= instance.comment_num_crawl
+
+            res["is_crawl"] = instance.is_crawl
+            res["platform"] = instance.platform
+            res["platform_id"] = instance.platform_id
+
+            res["drop_score"] = instance.drop_score
+            res["sort_score"] = instance.sort_score
 
             create_time = instance.create_time
             tzlc_create_time = tzlc(create_time)