modify have-read filtering strategy on home_recommend

search/views/topic.py

@@ -52,9 +52,12 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
     try:
         topic_star_routing = "6"
         index_type = "topic-high-star"
+
+        device_redis_key = ""
         if query is None:
             if user_id>0:
                 redis_key = "physical:home_recommend" + ":user_id:" + str(user_id) + ":query_type:" + str(query_type)
+                device_redis_key = "physical:home_recommend" + ":device_id:" + device_id + ":query_type:" + str(query_type)
             else:
                 redis_key = "physical:home_recommend" + ":device_id:" + device_id + ":query_type:" + str(query_type)
         else:
@@ -62,6 +65,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             index_type = "topic"
             if user_id>0:
                 redis_key = "physical:home_query" + ":user_id:" + str(user_id) + ":query:" + str(query) + ":query_type:" + str(query_type)
+                device_redis_key = "physical:home_query" + ":device_id:" + device_id + ":query:" + str(query) + ":query_type:" + str(query_type)
             else:
                 redis_key = "physical:home_query" + ":device_id:" + device_id + ":query:" + str(query) + ":query_type:" + str(query_type)
 
@@ -78,6 +82,16 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             else:
                 if offset>0: # 首次搜索时不需要过滤已读
                     have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
+        elif len(device_redis_key)>0:
+            redis_field_val_list = redis_client.hmget(device_redis_key, redis_field_list)
+            if redis_field_val_list[0]:
+                if query is None:
+                    have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
+                else:
+                    if offset>0: # 首次搜索时不需要过滤已读
+                        have_read_topic_id_list = list(json.loads(redis_field_val_list[0]))
+
+
         if have_read_topic_id_list == None:
             have_read_topic_id_list = list()
         have_read_topic_id_list.extend(promote_topic_list)