add

trans2es/commons/words_utils.py

@@ -170,11 +170,13 @@ from gm_types.doris import MIND_TYPE
 
 QUERY_KEY = "query:{}:set"
 
+
 LABEL_VALUE = {
-    MIND_TYPE.PROJECT: 6,
-    MIND_TYPE.BRAND: 5,
-    MIND_TYPE.HOSPITAL: 4,
-    MIND_TYPE.DOCTOR: 3,
+    MIND_TYPE.PROJECT: 8,
+    MIND_TYPE.HOSPITAL: 7,
+    MIND_TYPE.DOCTOR: 6,
+    MIND_TYPE.FREE_FACE: 4,
+    MIND_TYPE.FACE: 3,
     MIND_TYPE.AREA: 2,
     MIND_TYPE.USER: 1,
     MIND_TYPE.UNKNOWN: 0
@@ -204,3 +206,4 @@ def get_tips_word_type(query=''):
     logging.info("get labels:%s" % labels)
     labels.sort(key=label_key, reverse=True)
     return labels[0]
+

trans2es/utils/wordresemble.py

@@ -154,6 +154,7 @@ class WordResemble(object):
                 query_sql_item = wordresemble.WordRel.objects.filter(keyword=wordrm["keyword"])
                 for sql_obj in query_sql_item:
                     words = list(sql_obj.all_resembles.all().values_list('word', flat=True))
+                    logging.info("get words:%s" % words)
                     for items in words:
                         # 先存储本体词
                         query_base64 = base64.b64encode(wordrm["keyword"].encode('utf8')).decode('utf8')
@@ -166,13 +167,17 @@ class WordResemble(object):
                         total_count = 0
                         if 't' in redis_val_dict:
                             total_count = int(redis_val_dict['t'])
+
                         # 存储到Redis
+                        logging.info("get items:%s" % items)
                         value = value_name + str(":" + str(total_count))
                         redis_client.sadd(key, value)
+
                         # 存储近义词
-                        query_base64 = base64.b64encode(items.encode('utf8')).decode('utf8')
-                        key = QUERY_KEY.format(query_base64)
-                        value_name = base64.b64encode(wordrm["keyword"].encode('utf8')).decode('utf8')
+                        # query_base64 = base64.b64encode(items.encode('utf8')).decode('utf8')
+                        key = QUERY_KEY.format(value_name)
+                        # value_name = base64.b64encode(wordrm["keyword"].encode('utf8')).decode('utf8')
+                        value_names = query_base64
                         # 获取结果
                         redis_data = redis_client.hget(tips_num_redis_key_prefix, wordrm["keyword"])
                         redis_val_dict = json.loads(str(redis_data, encoding="utf-8")) if redis_data else {}
@@ -180,17 +185,17 @@ class WordResemble(object):
                         if 't' in redis_val_dict:
                             total_count = int(redis_val_dict['t'])
                         # 存储结果
-                        value = value_name + str(":" + str(total_count))
+                        value = value_names + str(":" + str(total_count))
                         redis_client.sadd(key, value)
                         if words:
                             for w in words:
-                                value_name = base64.b64encode(w.encode('utf8')).decode('utf8')
+                                value_name_w = base64.b64encode(w.encode('utf8')).decode('utf8')
                                 redis_data = redis_client.hget(tips_num_redis_key_prefix, w)
                                 redis_val_dict = json.loads(str(redis_data, encoding="utf-8")) if redis_data else {}
                                 total_count = 0
                                 if 't' in redis_val_dict:
                                     total_count = int(redis_val_dict['t'])
-                                value = value_name + str(":" + str(total_count))
+                                value = value_name_w + str(":" + str(total_count))
                                 redis_client.sadd(key, value)
 
         except: