add

associate/type_info.py

@@ -243,12 +243,8 @@ def get_type_info_map():
         TypeInfo(
             name='associate_tag',
             type='associate_tag',
-            model=agile_tag.AgileTagType,
-            query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.DOCTOR, AGILE_TAG_TYPE.HOSPITAL,
-                                                                     AGILE_TAG_TYPE.BRAND, AGILE_TAG_TYPE.INSTRUMENT,
-                                                                     AGILE_TAG_TYPE.PROJECT,
-                                                                     AGILE_TAG_TYPE.POSITION,
-                                                                     AGILE_TAG_TYPE.UNDEFINED).query,
+            model=agile_tag.AgileTag,
+            query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.get_tag_suggest_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -257,9 +253,8 @@ def get_type_info_map():
         TypeInfo(
             name='associate_tag_brand',
             type='associate_tag_brand',
-            model=agile_tag.AgileTagType,
-            query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.BRAND,
-                                                                     AGILE_TAG_TYPE.UNDEFINED).query,
+            model=agile_tag.AgileTag,
+            query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.get_tag_suggest_brand_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -268,9 +263,8 @@ def get_type_info_map():
         TypeInfo(
             name='associate_tag_doctor',
             type='associate_tag_doctor',
-            model=agile_tag.AgileTagType,
-            query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.DOCTOR,
-                                                                     AGILE_TAG_TYPE.UNDEFINED).query,
+            model=agile_tag.AgileTag,
+            query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.get_tag_suggest_doctor_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -279,9 +273,8 @@ def get_type_info_map():
         TypeInfo(
             name='associate_tag_hospital',
             type='associate_tag_hospital',
-            model=agile_tag.AgileTagType,
-            query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
-                                                                     AGILE_TAG_TYPE.HOSPITAL).query,
+            model=agile_tag.AgileTag,
+            query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.get_tag_suggest_hospital_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -290,9 +283,8 @@ def get_type_info_map():
         TypeInfo(
             name='associate_tag_instrument',
             type='associate_tag_instrument',
-            model=agile_tag.AgileTagType,
-            query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
-                                                                     AGILE_TAG_TYPE.INSTRUMENT).query,
+            model=agile_tag.AgileTag,
+            query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.get_tag_suggest_instrument_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -301,9 +293,8 @@ def get_type_info_map():
         TypeInfo(
             name='associate_tag_position',
             type='associate_tag_position',
-            model=agile_tag.AgileTagType,
-            query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
-                                                                     AGILE_TAG_TYPE.POSITION, ).query,
+            model=agile_tag.AgileTag,
+            query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.get_tag_suggest_position_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -312,9 +303,8 @@ def get_type_info_map():
         TypeInfo(
             name='associate_tag_project',
             type='associate_tag_project',
-            model=agile_tag.AgileTagType,
-            query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
-                                                                     AGILE_TAG_TYPE.PROJECT).query,
+            model=agile_tag.AgileTag,
+            query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.get_tag_suggest_project_data_list,
             bulk_insert_chunk_size=100,
             round_insert_chunk_size=5,
@@ -340,7 +330,7 @@ def tips_attr_sync_to_redis_type_info_map():
         TypeInfo(
             name='associate',
             type='associate_results_num',  # api_wordrelresemble
-            model=agile_tag.AgileTagType,
+            model=agile_tag.AgileTag,
             query_deferred=lambda: agile_tag.AgileTag.objects.all().query,
             get_data_func=TagTransfer.set_data_to_redis,
             bulk_insert_chunk_size=100,

associate/utils/agile_tag_transfer.py

@@ -34,6 +34,7 @@ class TagTransfer(object):
                                                                                AGILE_TAG_TYPE.PROJECT,
                                                                                AGILE_TAG_TYPE.DOCTOR,
                                                                                AGILE_TAG_TYPE.UNDEFINED])
+            if result:
                 ret_list = list()
                 item_dict = dict()
                 item_dict["id"] = getMd5Digest(str(instance.name))