add

search/views/group.py

@@ -54,30 +54,30 @@ def pictorial_sort(user_id=-1, sort_type=GroupSortTypes.HOT_RECOMMEND, offset=0,
         if not isinstance(user_id, int):
             user_id = -1
 
-        # if not isinstance(device_id, str):
-        #     device_id = ""
-        #
-        # now = datetime.datetime.now().date()
-        # yes_time = now - datetime.timedelta(days=10)
-        # """
-        # 过滤近10天读过的数据
-        # """
-        # redis_key = ""
-        # have_read_pictorial_id_list = set()
-        # if device_id:
-        #     redis_key = "physical:home_recommend_pictorial" + ":device_id:" + str(device_id)
-        #     redis_question_val_list = redis_client.hgetall(redis_key)
-        #     for item in redis_question_val_list:
-        #         items = item.decode(encoding='utf-8')
-        #         # 先删除10天前的
-        #         if items < str(yes_time):
-        #             redis_client.hdel(redis_key, item)
-        #         # 获取近10天的读过的榜单
-        #         else:
-        #             value = redis_question_val_list.get(item, None).decode(encoding='utf-8')
-        #             for pictorial_id in value:
-        #                 have_read_pictorial_id_list.add(pictorial_id)
-        # logging.info("get have_read_tractate_id_list:%s" % have_read_pictorial_id_list)
+        if not isinstance(device_id, str):
+            device_id = ""
+
+        now = datetime.datetime.now().date()
+        yes_time = now - datetime.timedelta(days=10)
+        """
+        过滤近10天读过的数据
+        """
+        redis_key = ""
+        have_read_pictorial_id_list = set()
+        if device_id:
+            redis_key = "physical:home_recommend_pictorial" + ":device_id:" + str(device_id)
+            redis_question_val_list = redis_client.hgetall(redis_key)
+            for item in redis_question_val_list:
+                items = item.decode(encoding='utf-8')
+                # 先删除10天前的
+                if items < str(yes_time):
+                    redis_client.hdel(redis_key, item)
+                # 获取近10天的读过的榜单
+                else:
+                    value = redis_question_val_list.get(item, None).decode(encoding='utf-8')
+                    for pictorial_id in value:
+                        have_read_pictorial_id_list.add(pictorial_id)
+        logging.info("get have_read_tractate_id_list:%s" % have_read_pictorial_id_list)
 
         # 获取es链接对象
         es_cli_obj = ESPerform.get_cli()
@@ -90,17 +90,17 @@ def pictorial_sort(user_id=-1, sort_type=GroupSortTypes.HOT_RECOMMEND, offset=0,
 
             pictorial_ids_list = GroupUtils.get_hot_pictorial_recommend_result_list(offset, size, es_cli_obj,
                                                                                     attention_tag_list)  #
-            # logging.info("get  pictorial_ids_list:%s" % pictorial_ids_list)
-            #
-            # """
-            # 增加已读过滤
-            # """
-            #
-            # if len(pictorial_ids_list) > 0:
-            #     if redis_key:
-            #         for id in pictorial_ids_list:
-            #             have_read_pictorial_id_list.append(id)
-            #         redis_client.hset(redis_key, now, json.dumps(have_read_pictorial_id_list))
+            logging.info("get  pictorial_ids_list:%s" % pictorial_ids_list)
+
+            """
+            增加已读过滤
+            """
+
+            if len(pictorial_ids_list) > 0:
+                if redis_key:
+                    for id in pictorial_ids_list:
+                        have_read_pictorial_id_list.append(id)
+                    redis_client.hset(redis_key, now, json.dumps(have_read_pictorial_id_list))
 
             return {"pictorial_recommend_ids": pictorial_ids_list}
         elif sort_type == GroupSortTypes.ATTENTION_RECOMMEND:
@@ -121,14 +121,14 @@ def pictorial_sort(user_id=-1, sort_type=GroupSortTypes.HOT_RECOMMEND, offset=0,
                 for item in sorted_attention_pictorial_list:
                     if item["pictorial_id"] not in pictorial_recommend_ids_list:
                         pictorial_recommend_ids_list.append(item["pictorial_id"])
-                # """
-                # 增加已读过滤
-                # """
-                # if len(pictorial_recommend_ids_list[offset:(offset + size)]) > 0:
-                #     if redis_key:
-                #         for id in pictorial_recommend_ids_list[offset:(offset + size)]:
-                #             have_read_pictorial_id_list.append(id)
-                #         redis_client.hset(redis_key, now, json.dumps(have_read_pictorial_id_list))
+                """
+                增加已读过滤
+                """
+                if len(pictorial_recommend_ids_list[offset:(offset + size)]) > 0:
+                    if redis_key:
+                        for id in pictorial_recommend_ids_list[offset:(offset + size)]:
+                            have_read_pictorial_id_list.append(id)
+                        redis_client.hset(redis_key, now, json.dumps(have_read_pictorial_id_list))
 
                 return {"pictorial_recommend_ids": pictorial_recommend_ids_list[offset:(offset + size)]}