judge topic star

search/views/topic.py

@@ -136,8 +136,9 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         #         else:
         #             break
 
-        recommend_topic_list.extend(topic_id_list)
-        have_read_topic_id_list.extend(recommend_topic_list)
+        topic_id_list.extend(recommend_topic_list)
+        # recommend_topic_list.extend(topic_id_list)
+        have_read_topic_id_list.extend(topic_id_list)
         if len(have_read_topic_id_list) > 30000:
             cut_len = len(have_read_topic_id_list)-30000
             have_read_topic_id_list = have_read_topic_id_list[cut_len:]
@@ -148,7 +149,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         # 每个session key保存15分钟
         redis_client.expire(redis_key, 60 * 60 * 24 * 30)
 
-        return recommend_topic_list
+        return topic_id_list
     except:
         logging.error("catch exception,err_msg:%s" % traceback.format_exc())
         return []

trans2es/type_info.py

@@ -11,6 +11,8 @@ from libs.es import ESPerform
 import elasticsearch
 import elasticsearch.helpers
 import sys
+from libs.cache import redis_client
+import copy
 
 from trans2es.models import topic, user, pick_celebrity, group, celebrity, tag, contrast_similar,pictorial
 from trans2es.utils.user_transfer import UserTransfer
@@ -22,7 +24,6 @@ from trans2es.utils.pictorial_transfer import PictorialTransfer
 from trans2es.utils.celebrity_transfer import CelebrityTransfer
 from trans2es.utils.tag_transfer import TagTransfer
 from trans2es.utils.contrast_similar_transfer import Contrast_Similar_Transfer
-from libs.es import ESPerform
 
 __es = None
 
@@ -63,6 +64,7 @@ class TypeInfo(object):
         self.round_insert_chunk_size = round_insert_chunk_size
         self.round_insert_period = round_insert_period
         self.logic_database_id = logic_database_id
+        self.physical_topic_star = "physical:topic_star"
 
     @property
     def query(self):
@@ -140,9 +142,24 @@ class TypeInfo(object):
                         pk,
                     ))
                 else:
-                    data_list.append(data)
-                    if self.type=="topic" and instance.content_level and int(instance.content_level)>=4:
-                        topic_data_high_star_list.append(data)
+                    if data:
+                        data_list.append(data)
+                        ori_topic_star = redis_client.hget(self.physical_topic_star, data["id"])
+                        if not ori_topic_star:
+                            redis_client.hset(self.physical_topic_star, data["id"], data["content_level"])
+                        else:
+                            int_ori_topic_star = int(str(ori_topic_star, encoding="utf-8"))
+                            if int_ori_topic_star != data["content_level"]:
+                                old_data = copy.deepcopy(data)
+                                old_data["is_online"] = False
+                                old_data["is_deleted"] = True
+                                old_data["content_level"] = ori_topic_star
+
+                                data_list.append(old_data)
+                                redis_client.hset(self.physical_topic_star, data["id"], data["content_level"])
+
+                    # if self.type=="topic" and instance.content_level and int(instance.content_level)>=4:
+                    #     topic_data_high_star_list.append(data)
 
         return (data_list,topic_data_high_star_list)