merge master

trans2es/commons/words_utils.py

@@ -163,6 +163,18 @@ class QueryWordAttr(object):
 
     @classmethod
     def get_query_results_num(cls, name):
+        try:
+            redis_data = redis_client.hget(cls.tips_num_redis_key_prefix, name)
+            redis_val_dict = json.loads(str(redis_data, encoding="utf-8")) if redis_data else {}
+            results_num = redis_val_dict['t'] if 't' in redis_val_dict else 0
+
+            return results_num
+        except:
+            logging.error("catch exception,err_msg:%s" % traceback.format_exc())
+            return 0
+
+    @classmethod
+    def get_search_query_results_num(cls, name):
         try:
             total_num = 0
             data = StrategyHistoryQueryWords.objects.filter(keyword=name, is_delete=0).values("answer_num",

trans2es/utils/search_query.py

@@ -18,7 +18,7 @@ class SearchWord(object):
             item_dict["ori_name"] = instance.keyword
             item_dict["is_online"] = False if instance.is_delete else True
             item_dict["order_weight"] = QueryWordAttr.get_hot_search_query_word_weight(instance.keyword)
-            item_dict["results_num"] = QueryWordAttr.get_query_results_num(instance.keyword)
+            item_dict["results_num"] = QueryWordAttr.get_search_query_results_num(instance.keyword)
             item_dict["type_flag"] = get_tips_word_type(instance.keyword)
             item_dict["offline_score"] = 0.0
             item_dict["tips_name_type"] = 5