modify

search/utils/topic.py

@@ -307,37 +307,9 @@ class TopicUtils(object):
                                                        offset=offset, size=size,routing=routing)
 
             topic_id_list = list()
-            same_group_id_set = set()
-            same_user_id_set = set()
 
             for item in result_dict["hits"]:
                 topic_id_list.append(item["_source"]["id"])
-            # for item in result_dict["hits"]:
-            #     if item["_source"]["group_id"]>0 and  item["_source"]["group_id"] not in same_group_id_set:
-            #         same_group_id_set.add(item["_source"]["id"])
-            #         topic_id_list.append(item["_source"]["id"])
-            #     else:
-            #         same_group_id_set.add(item["_source"]["id"])
-            #
-            #     if item["_source"]["user_id"] not in same_user_id_set:
-            #         same_user_id_set.add(item["_source"]["id"])
-            #         topic_id_list.append(item["_source"]["id"])
-            #     else:
-            #         same_user_id_set.add(item["_source"]["id"])
-            #
-            #     if len(topic_id_list) >= single_size:
-            #         break
-            #
-            # if len(topic_id_list) < single_size:
-            #     for topic_id in same_group_id_set:
-            #         topic_id_list.append(topic_id)
-            #         if len(topic_id_list)>=single_size:
-            #             break
-            #     for topic_id in same_user_id_set:
-            #         topic_id_list.append(topic_id)
-            #         if len(topic_id_list)>=single_size:
-            #             break
-            logging.info("topic_id_list:%s,attention_tag_list%s" % (str(topic_id_list),str(attention_tag_list)))
             return topic_id_list
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())

search/views/tag.py

@@ -134,10 +134,10 @@ def choice_push_tag(device_id, user_id):
         if len(unread_tag_list)>0:
             for tag_id in unread_tag_list:
                 valid_tag_topic_num = TopicTag.objects.filter(tag_id=tag_id,is_online=True).count()
-                if valid_tag_topic_num>100:
+                if valid_tag_topic_num>0:
                     ret_tag_set.add(tag_id)
                     redis_push_tag_dict[tag_id] = now_sec
-                    if len(ret_tag_set)>=2:
+                    if len(ret_tag_set)>=1:
                         break
 
         redis_client.set(redis_push_tag_key, json.dumps(redis_push_tag_dict))