Merge branch 'hk_now' into 'master'

bug fix

See merge request alpha/physical!261

linucb/views/collect_data.py

@@ -94,21 +94,26 @@ class CollectData(object):
                       }
                      redis_client.hmset(click_recommend_redis_key, click_redis_data_dict)
 
+                total_topic_list = list()
                 tag_topic_id_list = list()
                 tag_id_list = recommend_tag_list[0:100]
-                tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
+
                 topic_recommend_redis_key = self.linucb_recommend_topic_id_prefix + str(device_id)
+                redis_topic_data_dict = redis_client.hgetall(topic_recommend_redis_key)
+                redis_topic_list = list()
+                cursor = -1
+                if b"data" in redis_topic_data_dict:
+                    redis_topic_list = json.loads(redis_topic_data_dict[b"data"]) if redis_topic_data_dict[
+                        b"data"] else []
+                    cursor = int(str(redis_topic_data_dict[b"cursor"], encoding="utf-8"))
+
+                if len(recommend_topic_id_list)==0 and cursor==0 and len(redis_topic_list)>0:
+                    have_read_topic_id_list.extend(redis_topic_list[:2])
+                tag_topic_id_list = ESPerform.get_tag_topic_list(tag_id_list,have_read_topic_id_list)
 
-                if len(recommend_topic_id_list):
+                if len(recommend_topic_id_list)>0:
                     tag_topic_id_list = recommend_topic_id_list + tag_topic_id_list
                 else:
-                    redis_topic_data_dict = redis_client.hgetall(topic_recommend_redis_key)
-                    redis_topic_list = list()
-                    cursor = -1
-                    if b"data" in redis_topic_data_dict:
-                        redis_topic_list = json.loads(redis_topic_data_dict[b"data"]) if redis_topic_data_dict[b"data"] else []
-                        cursor = int(str(redis_topic_data_dict[b"cursor"],encoding="utf-8"))
-
                     if cursor==0 and len(redis_topic_list)>0:
                         tag_topic_id_list = redis_topic_list[:2] + tag_topic_id_list
                         tag_topic_id_list = list(set(tag_topic_id_list))