update

.idea/codeStyles/Project.xml

@@ -24,29 +24,5 @@
         <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
       </formatting-settings>
     </DBN-SQL>
-    <DBN-PSQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false" />
-    </DBN-PSQL>
-    <DBN-SQL>
-      <case-options enabled="false">
-        <option name="KEYWORD_CASE" value="lower" />
-        <option name="FUNCTION_CASE" value="lower" />
-        <option name="PARAMETER_CASE" value="lower" />
-        <option name="DATATYPE_CASE" value="lower" />
-        <option name="OBJECT_CASE" value="preserve" />
-      </case-options>
-      <formatting-settings enabled="false">
-        <option name="STATEMENT_SPACING" value="one_line" />
-        <option name="CLAUSE_CHOP_DOWN" value="chop_down_if_statement_long" />
-        <option name="ITERATION_ELEMENTS_WRAPPING" value="chop_down_if_not_single" />
-      </formatting-settings>
-    </DBN-SQL>
   </code_scheme>
 </component>
\ No newline at end of file

search/views/topic.py

@@ -60,7 +60,6 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
 
         topic_recommend_redis_key = "physical:linucb:topic_recommend:device_id:" + str(device_id)
 
-
         # recommend_tag_dict = dict()
         # tag_recommend_val = redis_client.get(tag_recommend_redis_key)
         # if tag_recommend_val:
@@ -71,7 +70,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         if b"data" in recommend_topic_dict:
             recommend_topic_id_list = json.loads(recommend_topic_dict[b"data"])
             cursor = int(str(recommend_topic_dict[b"cursor"], encoding="utf-8"))
-            newcursor = cursor + 5
+            newcursor = cursor + 6
             if len(recommend_topic_id_list) > newcursor:
                 recommend_topic_list = recommend_topic_id_list[cursor:newcursor]
                 redis_client.hset(topic_recommend_redis_key,"cursor",newcursor)
@@ -91,7 +90,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
             redis_user_similar_score_redis_val) if redis_user_similar_score_redis_val else []
 
         size = size-len(recommend_topic_list)
-        topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=offset, size=size,
+        rank_topic_id_list = TopicUtils.get_recommend_topic_ids(user_id=user_id, tag_id=tag_id, offset=offset, size=size,
                                                            single_size=size,query=query, query_type=query_type,
                                                            filter_topic_id_list=have_read_topic_id_list,
                                                            recommend_tag_list=recommend_topic_list,
@@ -135,8 +134,21 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         #             have_read_topic_id_list.append(unread_topic_id)
         #         else:
         #             break
-
-        topic_id_list.extend(recommend_topic_list)
+        topic_id_list =list()
+        if(len(recommend_topic_list)==6):
+          if(size <11):
+            topic_id_list.extend(rank_topic_id_list[0:3])
+            topic_id_list.extend(recommend_topic_id_list[0:3])
+            topic_id_list.extend(rank_topic_id_list[3:size])
+            topic_id_list.extend(recommend_topic_id_list[3:6])
+          else:
+            topic_id_list.extend(rank_topic_id_list[0:size-7])
+            topic_id_list.extend(recommend_topic_id_list[0:3])
+            topic_id_list.extend(rank_topic_id_list[siez-7:size])
+            topic_id_list.extend(recommend_topic_id_list[3:6])
+        else:
+            topic_id_list.extend(rank_topic_id_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: