add excellent_topic

injection/data_sync/tasks.py

@@ -20,7 +20,7 @@ def write_to_es(es_type, pk_list, use_batch_query_set=False):
         type_info_map = get_type_info_map()
         type_info = type_info_map[es_type]
 
-        logging.info("duan add,es_type:%s" % str(es_type))
+        logging.info("consume es_type:%s" % str(es_type))
         type_info.insert_table_by_pk_list(
             sub_index_name=es_type,
             pk_list=pk_list,
@@ -37,7 +37,7 @@ def sync_face_similar_data_to_redis():
         result_items = FaceUserContrastSimilar.objects.filter(is_online=True, is_deleted=False).distinct().values(
             "participant_user_id").values_list("participant_user_id", flat=True)
 
-        logging.info("duan add,begin sync_face_similar_data_to_redis!")
+        logging.info("begin sync_face_similar_data_to_redis!")
 
         redis_key_prefix = "physical:user_similar:participant_user_id:"
         for participant_user_id in result_items:
@@ -58,7 +58,7 @@ def sync_face_similar_data_to_redis():
                 )
             redis_client.set(redis_key, json.dumps(item_list))
 
-            logging.info("duan add,participant_user_id:%d set data done!" % participant_user_id)
+            logging.info("participant_user_id:%d set data done!" % participant_user_id)
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
 
@@ -68,7 +68,7 @@ def sync_user_similar_score():
         results_items = UserSimilarScore.objects.filter(is_deleted=False).distinct().values("user_id").values_list("user_id",flat=True)
         redis_key_prefix = "physical:user_similar_score:user_id:"
 
-        logging.info("duan add,begin sync user_similar_score!")
+        logging.info("begin sync user_similar_score!")
         for user_id in results_items:
             redis_key = redis_key_prefix + str(user_id)
             similar_results_items = UserSimilarScore.objects.filter(is_deleted=False,user_id=user_id).order_by("-score")

libs/es.py

@@ -157,6 +157,7 @@ class ESPerform(object):
 
             if sub_index_name=="topic":
                 for data in data_list:
+                    if data:
                         bulk_actions.append({
                             '_op_type': 'index',
                             '_index': official_index_name,
@@ -167,6 +168,7 @@ class ESPerform(object):
                         })
             else:
                 for data in data_list:
+                    if data:
                         bulk_actions.append({
                             '_op_type': 'index',
                             '_index': official_index_name,

trans2es/mapping/topic-star-routing.json

@@ -48,7 +48,7 @@
         "type": "text",
         "analyzer": "gm_default_index",
         "search_analyzer": "gm_default_index"
-    }
-
+    },
+    "is_excellent":{"type": "long", "default":0}
   }
 }

trans2es/models/topic.py

@@ -262,3 +262,20 @@ class TopicExtra(models.Model):
     id = models.IntegerField(verbose_name=u'ID', primary_key=True)
     topic_id = models.IntegerField(verbose_name=u"帖子ID",db_index=True)
     virtual_vote_num = models.IntegerField(verbose_name="帖子虚拟点赞")
+
+
+class ExcellentTopic(models.Model):
+    """优质帖子"""
+
+    class Meta:
+        verbose_name = "优质帖子"
+        db_table = "excellent_topic"
+
+    id = models.IntegerField(verbose_name=u'ID', primary_key=True)
+    topic_id = models.IntegerField(verbose_name=u"帖子ID",db_index=True)
+    is_online = models.BooleanField(verbose_name=u'是否上线')
+    is_deleted = models.BooleanField(verbose_name=u'是否删除')
+    excellent_type = models.IntegerField(verbose_name=u"优质类型",db_index=True)
+    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/type_info.py

@@ -199,8 +199,8 @@ class TypeInfo(object):
         time2=end-begin
 
         begin = time.time()
-        logging.info("get sub_index_name:%s"%sub_index_name)
-        logging.info("get data_list:%s"%data_list)
+        # logging.info("get sub_index_name:%s"%sub_index_name)
+        # logging.info("get data_list:%s"%data_list)
 
         self.elasticsearch_bulk_insert_data(
             sub_index_name=sub_index_name,

trans2es/utils/excellect_topic_transfer.py

+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+import os
+import sys
+import logging
+import traceback
+from libs.tools import tzlc
+import time
+import re
+import datetime
+from trans2es.models.user import User
+from trans2es.models.topic import Topic
+from trans2es.utils.topic_transfer import TopicTransfer
+
+class ExcellectTopicTransfer(object):
+
+    @classmethod
+    def get_excellect_topic_data(cls,instance):
+        try:
+            topic_id = instance.topic_id
+            is_online = instance.is_online
+            is_deleted = instance.is_deleted
+
+            res = None
+            if is_online and not is_deleted:
+                topic_ins = Topic.objects.filter(id=topic_id).first()
+
+                if topic_ins:
+                    res = TopicTransfer.get_topic_data(topic_ins,is_excellect=True)
+
+            return res
+        except:
+            logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+            return None

trans2es/utils/topic_transfer.py

@@ -9,11 +9,12 @@ import time
 import re
 import datetime
 from trans2es.models.user import User
+from trans2es.models.topic import ExcellentTopic
 
 class TopicTransfer(object):
 
     @classmethod
-    def get_topic_data(cls,instance):
+    def get_topic_data(cls,instance,is_excellect=False):
         try:
             res = dict()
 
@@ -111,6 +112,15 @@ class TopicTransfer(object):
 
             res["total_vote_num"] = instance.get_virtual_vote_num() + instance.vote_num
 
+            if is_excellect:
+                res["is_excellent"] = 1
+            else:
+                excelllect_object = ExcellentTopic.objects.filter(topic_id=instance.id,is_online=True,is_deleted=False).first()
+                if excelllect_object:
+                    res["is_excellent"] = 1
+                else:
+                    res["is_excellent"] = 0
+
             logging.info("test topic transfer time cost,time0:%d,time1:%d,time2:%d,time3:%d,time4:%d" % (time0,time1,time2,time3,time4))
             return res
         except: