Merge branch 'tips' into 'master'

Tips

See merge request !14

search/utils/auto_tips.py

@@ -87,7 +87,7 @@ def get_suggest_tips(query, lat, lng, offset=0, size=50):
             return ret_list
 
         else:
-            QUERY_KEY = "query:{}:search_tips"
+            QUERY_KEY = "query:{}:search_tip"
             query_base64 = base64.b64encode(query.encode('utf8')).decode('utf8')
             key = QUERY_KEY.format(query_base64)
             labels = list(map(lambda x: x.decode("utf8"), list(redis_client.smembers(key))))

trans2es/management/commands/trans2es_mapping2es.py

@@ -34,10 +34,14 @@ class Command(BaseCommand):
         try:
             es_cli = ESPerform.get_cli()
 
+            type_name1 = "suggest-v1"
+
             type_name = "suggest"
 
             if len(options["type"]):
-                if options["type"] == "all" or type_name == options["type"]:
+                if options["type"] == "all" or type_name == options["type"] or type_name1 == options["type"]:
+
+                    type_name = options["type"]
                     official_index_name = ESPerform.get_official_index_name(type_name)
                     index_exists = es_cli.indices.exists(official_index_name)
                     if not index_exists:

trans2es/mapping/suggest-v1.json

+{
+  "dynamic":"strict",
+  "properties": {
+    "id":{"type":"text"},
+    "suggest":{
+      "analyzer":"keyword",
+      "search_analyzer":"keyword",
+      "type":"completion",
+      "contexts":[
+        {
+          "name":"is_online",
+          "type": "category"
+        }
+      ]
+    },
+    "suggest_type":{"type":"long"},//0-汉字,1-汉字全拼,2-拼音,3-拼音全拼,4-拼音简写,5-拼音简写全拼
+    "tips_name_type":{"type":"long"},//tips数据所属类型,0-tag,1-hospital,2-doctor,3-wiki
+    "ori_name":{"type":"keyword"},//原名称
+    "order_weight":{"type":"double"},//订单权重
+    "offline_score":{"type":"double"},//离线分
+    "results_num":{"type":"integer"},//结果数量
+    "type_flag":{"type":"keyword"},
+    "is_online":{"type":"boolean"}//上线
+  }
+}

trans2es/type_info.py

@@ -347,7 +347,8 @@ def get_type_info_map():
             name='suggest',
             type='wordrel_tips',  # tag
             model=wordresemble.WordRel,
-            query_deferred=lambda: wordresemble.WordRel.objects.all().query,
+            query_deferred=lambda: wordresemble.WordRel.objects.filter(
+                category__in=[0, 1, 2, 9, 10, 11, 12, 13, 14, 15, 16, 17]).query,
             get_data_func=WordResemble.get_resemble_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -445,7 +446,8 @@ def tips_attr_sync_to_redis_type_info_map():
             name='suggest',
             type='wordrel_results_num',  # api_wordrelresemble
             model=doctor.Hospital,
-            query_deferred=lambda: wordresemble.WordRel.objects.all().query,
+            query_deferred=lambda: wordresemble.WordRel.objects.filter(
+                category__in=[0, 1, 2, 9, 10, 11, 12, 13, 14, 15, 16, 17]).query,
             get_data_func=WordResemble.get_all_data_name_mapping_results_to_redis,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -455,7 +457,8 @@ def tips_attr_sync_to_redis_type_info_map():
             name='suggest',
             type='wordresemble_results_num',  # api_wordrelresemble
             model=doctor.Hospital,
-            query_deferred=lambda: wordresemble.WordRel.objects.all().query,
+            query_deferred=lambda: wordresemble.WordRel.objects.filter(
+                category__in=[0, 1, 2, 9, 10, 11, 12, 13, 14, 15, 16, 17]).query,
             get_data_func=WordResemble.set_data_to_redis,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,

trans2es/utils/wordresemble.py

@@ -146,7 +146,7 @@ class WordResemble(object):
     def set_data_to_redis(cls, instance):
         try:
 
-            QUERY_KEY = "query:{}:search_tips"
+            QUERY_KEY = "query:{}:search_tip"
             tips_num_redis_key_prefix = "search_tips:tips_mapping_num"
 
             # result = wordresemble.WordRel.objects.all().values("keyword", "id")