最新tab修改

trans2es/mapping/topic.json

@@ -60,6 +60,7 @@
       "type":"nested",
       "properties":{
         "pictorial_id":{"type":"long"},
+        "topic_add_time":{"type":"long"},
         "real_vote_cnt":{"type":"long"},
         "virt_vote_cnt":{"type":"long"},
         "total_vote_cnt":{"type":"long"}

trans2es/models/topic.py

@@ -203,7 +203,7 @@ class Topic(models.Model):
             tag_id_list = TopicTag.objects.using(settings.SLAVE_DB_NAME).filter(topic_id=self.id,
                                                                                 is_collection=1).values_list("tag_id",
                                                                                                              flat=True)
-            return  list(tag_id_list)
+            return list(tag_id_list)
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())
             return []
@@ -282,26 +282,28 @@ class Topic(models.Model):
 
     def get_related_billboard(self):
         try:
-
-            pictorial_ids = Topic.get_pictorial_id(self)
-
             related_billboard_list = list()
 
-            for pictorial_id in pictorial_ids:
+            pictorials = PictorialTopic.objects.filter(topic_id=self.id).values("pictorial_id", "create_time")
+            for pictorial_id in pictorials:
 
-                query_result = TopicBillBoard.objects.filter(pictorial_id=pictorial_id,
+                query_result = TopicBillBoard.objects.filter(pictorial_id=pictorial_id.get('pictorial_id', None),
                                                              topic_id=self.id).values().first()
 
                 if query_result == None:
-                    related_billboard_list.append({"pictorial_id": pictorial_id, "real_vote_cnt": 0,
-                                                   "virt_vote_cnt": 0, "total_vote_cnt": 0})
+                    related_billboard_list.append(
+                        {"pictorial_id": pictorial_id.get('pictorial_id', None), "real_vote_cnt": 0,
+                         "virt_vote_cnt": 0, "total_vote_cnt": 0,
+                         "topic_add_createtime": int(
+                             time.mktime(pictorial_id.get("create_time", None).timetuple()))})
 
 
                 else:
                     total_vote_cnt = int(query_result["virt_vote_cnt"]) + int(query_result["real_vote_cnt"])
                     related_billboard_list.append(
                         {"pictorial_id": query_result["pictorial_id"], "real_vote_cnt": query_result["real_vote_cnt"],
-                         "virt_vote_cnt": query_result["virt_vote_cnt"], "total_vote_cnt": total_vote_cnt})
+                         "virt_vote_cnt": query_result["virt_vote_cnt"], "total_vote_cnt": total_vote_cnt,
+                         "topic_add_createtime": int(time.mktime(pictorial_id.get("create_time", None).timetuple()))})
 
             logging.info("product_brand_info" % related_billboard_list)