Merge branch 'master' into 'hk'

# Conflicts:
#   search/views/topic.py

.idea/codeStyles/Project.xml

@@ -24,5 +24,29 @@
         <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

libs/es.py

@@ -311,6 +311,7 @@ class ESPerform(object):
                                                        offset=0, size=100,routing="3,4,5")
 
             topic_id_list = [item["_source"]["id"] for item in result_dict["hits"]]
+            logging.info("topic_id_list:%s"%str(topic_id_list))
             return topic_id_list
         except:
             logging.error("catch exception,err_msg:%s" % traceback.format_exc())

search/utils/topic.py

@@ -221,7 +221,7 @@ class TopicUtils(object):
                     {
                         "filter": {"bool": {
                             "should": {"terms": {"tag_list": attention_tag_list}}}},
-                        "weight": 60
+                        "weight": 100
                     }
                 )
             # if len(recommend_tag_list)>0:
@@ -380,7 +380,7 @@ class TopicUtils(object):
             #         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/group.py

@@ -224,9 +224,10 @@ def pictorial_topic_sort(pictorial_id=-1, offset=0, size=10):
                     ]
                 }
             },
-            "sort":{
-                "total_vote_num":{"order":"desc"}
-            }
+            "sort":[
+                {"total_vote_num":{"order":"desc"}},
+                {"create_time": {"order": "desc"}}
+            ]
         }
         pict_pictorial_ids_list =[]
         # 获取es链接对象

search/views/topic.py

@@ -111,7 +111,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
 
         redis_tag_data = redis_client.hget("physical:linucb:register_user_tag_info", user_id)
         attention_tag_list = json.loads(redis_tag_data) if redis_tag_data else []
-
+        logging.info("attention_tag_list:%s"%(str(attention_tag_list)))
         if len(recommend_topic_list)>0:
             size = size-len(recommend_topic_list)
             have_read_topic_id_list.extend(recommend_topic_list)
@@ -148,6 +148,7 @@ def get_home_recommend_topic_ids(user_id, device_id, tag_id, offset, size, query
         have_read_group_id_set = set()
         have_read_user_id_set = set()
         unread_topic_id_dict = dict()
+        logging.info("attention_tag_list:%s"%(str(topic_id_list)))
 
         # # 当前页小组数量
         # cur_page_group_num = 0