Commit a61703a2 authored by lixiaofang's avatar lixiaofang

add

parent 87a01c0b
...@@ -244,7 +244,11 @@ def get_type_info_map(): ...@@ -244,7 +244,11 @@ def get_type_info_map():
name='associate_tag', name='associate_tag',
type='associate_tag', type='associate_tag',
model=agile_tag.AgileTagType, model=agile_tag.AgileTagType,
query_deferred=lambda: agile_tag.AgileTag.objects.all().query, 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,
get_data_func=TagTransfer.get_tag_suggest_data_list, get_data_func=TagTransfer.get_tag_suggest_data_list,
bulk_insert_chunk_size=100, bulk_insert_chunk_size=100,
round_insert_chunk_size=5, round_insert_chunk_size=5,
...@@ -254,7 +258,8 @@ def get_type_info_map(): ...@@ -254,7 +258,8 @@ def get_type_info_map():
name='associate_tag_brand', name='associate_tag_brand',
type='associate_tag_brand', type='associate_tag_brand',
model=agile_tag.AgileTagType, model=agile_tag.AgileTagType,
query_deferred=lambda: agile_tag.AgileTag.objects.filter().query, query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.BRAND,
AGILE_TAG_TYPE.UNDEFINED).query,
get_data_func=TagTransfer.get_tag_suggest_brand_data_list, get_data_func=TagTransfer.get_tag_suggest_brand_data_list,
bulk_insert_chunk_size=100, bulk_insert_chunk_size=100,
round_insert_chunk_size=5, round_insert_chunk_size=5,
...@@ -264,7 +269,8 @@ def get_type_info_map(): ...@@ -264,7 +269,8 @@ def get_type_info_map():
name='associate_tag_doctor', name='associate_tag_doctor',
type='associate_tag_doctor', type='associate_tag_doctor',
model=agile_tag.AgileTagType, model=agile_tag.AgileTagType,
query_deferred=lambda: agile_tag.AgileTag.objects.all().query, query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.DOCTOR,
AGILE_TAG_TYPE.UNDEFINED).query,
get_data_func=TagTransfer.get_tag_suggest_doctor_data_list, get_data_func=TagTransfer.get_tag_suggest_doctor_data_list,
bulk_insert_chunk_size=100, bulk_insert_chunk_size=100,
round_insert_chunk_size=5, round_insert_chunk_size=5,
...@@ -274,7 +280,8 @@ def get_type_info_map(): ...@@ -274,7 +280,8 @@ def get_type_info_map():
name='associate_tag_hospital', name='associate_tag_hospital',
type='associate_tag_hospital', type='associate_tag_hospital',
model=agile_tag.AgileTagType, model=agile_tag.AgileTagType,
query_deferred=lambda: agile_tag.AgileTag.objects.all().query, query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
AGILE_TAG_TYPE.HOSPITAL).query,
get_data_func=TagTransfer.get_tag_suggest_hospital_data_list, get_data_func=TagTransfer.get_tag_suggest_hospital_data_list,
bulk_insert_chunk_size=100, bulk_insert_chunk_size=100,
round_insert_chunk_size=5, round_insert_chunk_size=5,
...@@ -284,7 +291,8 @@ def get_type_info_map(): ...@@ -284,7 +291,8 @@ def get_type_info_map():
name='associate_tag_instrument', name='associate_tag_instrument',
type='associate_tag_instrument', type='associate_tag_instrument',
model=agile_tag.AgileTagType, model=agile_tag.AgileTagType,
query_deferred=lambda: agile_tag.AgileTag.objects.all().query, query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
AGILE_TAG_TYPE.INSTRUMENT).query,
get_data_func=TagTransfer.get_tag_suggest_instrument_data_list, get_data_func=TagTransfer.get_tag_suggest_instrument_data_list,
bulk_insert_chunk_size=100, bulk_insert_chunk_size=100,
round_insert_chunk_size=5, round_insert_chunk_size=5,
...@@ -294,7 +302,8 @@ def get_type_info_map(): ...@@ -294,7 +302,8 @@ def get_type_info_map():
name='associate_tag_position', name='associate_tag_position',
type='associate_tag_position', type='associate_tag_position',
model=agile_tag.AgileTagType, model=agile_tag.AgileTagType,
query_deferred=lambda: agile_tag.AgileTag.objects.all().query, query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
AGILE_TAG_TYPE.POSITION, ).query,
get_data_func=TagTransfer.get_tag_suggest_position_data_list, get_data_func=TagTransfer.get_tag_suggest_position_data_list,
bulk_insert_chunk_size=100, bulk_insert_chunk_size=100,
round_insert_chunk_size=5, round_insert_chunk_size=5,
...@@ -304,7 +313,8 @@ def get_type_info_map(): ...@@ -304,7 +313,8 @@ def get_type_info_map():
name='associate_tag_project', name='associate_tag_project',
type='associate_tag_project', type='associate_tag_project',
model=agile_tag.AgileTagType, model=agile_tag.AgileTagType,
query_deferred=lambda: agile_tag.AgileTag.objects.all().query, query_deferred=lambda: agile_tag.AgileTag.objects.filter(AGILE_TAG_TYPE.UNDEFINED,
AGILE_TAG_TYPE.PROJECT).query,
get_data_func=TagTransfer.get_tag_suggest_project_data_list, get_data_func=TagTransfer.get_tag_suggest_project_data_list,
bulk_insert_chunk_size=100, bulk_insert_chunk_size=100,
round_insert_chunk_size=5, round_insert_chunk_size=5,
......
...@@ -26,7 +26,6 @@ class TagTransfer(object): ...@@ -26,7 +26,6 @@ class TagTransfer(object):
@classmethod @classmethod
def get_tag_suggest_data_list(cls, instance): def get_tag_suggest_data_list(cls, instance):
try: try:
ret_list = list() ret_list = list()
item_dict = dict() item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name)) item_dict["id"] = getMd5Digest(str(instance.name))
...@@ -43,10 +42,7 @@ class TagTransfer(object): ...@@ -43,10 +42,7 @@ class TagTransfer(object):
item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type() item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
ret_list.append(item_dict) ret_list.append(item_dict)
suggest_list = get_tips_suggest_list(instance.name) suggest_list = get_tips_suggest_list(instance.name)
logging.info("get ret_list:%s" % ret_list) logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list) return (item_dict, suggest_list)
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
...@@ -55,29 +51,23 @@ class TagTransfer(object): ...@@ -55,29 +51,23 @@ class TagTransfer(object):
@classmethod @classmethod
def get_tag_suggest_brand_data_list(self, instance): def get_tag_suggest_brand_data_list(self, instance):
try: try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id, ret_list = list()
agile_tag_type=AGILE_TAG_TYPE.BRAND) item_dict = dict()
if result: item_dict["id"] = getMd5Digest(str(instance.name))
ret_list = list() item_dict["ori_name"] = instance.name.strip()
item_dict = dict() item_dict["is_online"] = instance.is_online
item_dict["id"] = getMd5Digest(str(instance.name)) random_num = random.randint(10000, 20000)
item_dict["ori_name"] = instance.name.strip() item_dict["results_num"] = random_num
item_dict["is_online"] = instance.is_online item_dict["offline_score"] = 0.0
random_num = random.randint(10000, 20000) item_dict["create_tag_type"] = instance.create_tag_type
item_dict["results_num"] = random_num item_dict["style"] = instance.style
item_dict["offline_score"] = 0.0 item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["create_tag_type"] = instance.create_tag_type item_dict["agile_tag_type"] = instance.get_agile_tag_type()
item_dict["style"] = instance.style item_dict["agile_tag_id"] = instance.id
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
item_dict["agile_tag_type"] = instance.get_agile_tag_type() ret_list.append(item_dict)
item_dict["agile_tag_id"] = instance.id suggest_list = get_tips_suggest_list(instance.name)
item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type() logging.info("get ret_list:%s" % ret_list)
ret_list.append(item_dict)
suggest_list = get_tips_suggest_list(instance.name)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list) return (item_dict, suggest_list)
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
...@@ -86,30 +76,23 @@ class TagTransfer(object): ...@@ -86,30 +76,23 @@ class TagTransfer(object):
@classmethod @classmethod
def get_tag_suggest_project_data_list(self, instance): def get_tag_suggest_project_data_list(self, instance):
try: try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id, ret_list = list()
agile_tag_type=AGILE_TAG_TYPE.PROJECT) item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
if result: item_dict["ori_name"] = instance.name.strip()
ret_list = list() item_dict["is_online"] = instance.is_online
item_dict = dict() random_num = random.randint(10000, 20000)
item_dict["id"] = getMd5Digest(str(instance.name)) item_dict["results_num"] = random_num
item_dict["ori_name"] = instance.name.strip() item_dict["offline_score"] = 0.0
item_dict["is_online"] = instance.is_online item_dict["create_tag_type"] = instance.create_tag_type
random_num = random.randint(10000, 20000) item_dict["style"] = instance.style
item_dict["results_num"] = random_num item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["offline_score"] = 0.0 item_dict["agile_tag_type"] = instance.get_agile_tag_type()
item_dict["create_tag_type"] = instance.create_tag_type item_dict["agile_tag_id"] = instance.id
item_dict["style"] = instance.style item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort ret_list.append(item_dict)
item_dict["agile_tag_type"] = instance.get_agile_tag_type() suggest_list = get_tips_suggest_list(instance.name)
item_dict["agile_tag_id"] = instance.id logging.info("get ret_list:%s" % ret_list)
item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
ret_list.append(item_dict)
suggest_list = get_tips_suggest_list(instance.name)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list) return (item_dict, suggest_list)
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
...@@ -118,30 +101,25 @@ class TagTransfer(object): ...@@ -118,30 +101,25 @@ class TagTransfer(object):
@classmethod @classmethod
def get_tag_suggest_position_data_list(self, instance): def get_tag_suggest_position_data_list(self, instance):
try: try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id, ret_list = list()
agile_tag_type=AGILE_TAG_TYPE.POSITION) item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
if result: item_dict["ori_name"] = instance.name.strip()
ret_list = list() item_dict["is_online"] = instance.is_online
item_dict = dict() random_num = random.randint(10000, 20000)
item_dict["id"] = getMd5Digest(str(instance.name)) item_dict["results_num"] = random_num
item_dict["ori_name"] = instance.name.strip() item_dict["offline_score"] = 0.0
item_dict["is_online"] = instance.is_online item_dict["create_tag_type"] = instance.create_tag_type
random_num = random.randint(10000, 20000) item_dict["style"] = instance.style
item_dict["results_num"] = random_num item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["offline_score"] = 0.0 item_dict["agile_tag_type"] = instance.get_agile_tag_type()
item_dict["create_tag_type"] = instance.create_tag_type item_dict["agile_tag_id"] = instance.id
item_dict["style"] = instance.style item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort ret_list.append(item_dict)
item_dict["agile_tag_type"] = instance.get_agile_tag_type() suggest_list = get_tips_suggest_list(instance.name)
item_dict["agile_tag_id"] = instance.id
item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
ret_list.append(item_dict)
suggest_list = get_tips_suggest_list(instance.name)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list) return (item_dict, suggest_list)
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
...@@ -150,29 +128,23 @@ class TagTransfer(object): ...@@ -150,29 +128,23 @@ class TagTransfer(object):
@classmethod @classmethod
def get_tag_suggest_instrument_data_list(self, instance): def get_tag_suggest_instrument_data_list(self, instance):
try: try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id, ret_list = list()
agile_tag_type=AGILE_TAG_TYPE.INSTRUMENT) item_dict = dict()
if result: item_dict["id"] = getMd5Digest(str(instance.name))
ret_list = list() item_dict["ori_name"] = instance.name.strip()
item_dict = dict() item_dict["is_online"] = instance.is_online
item_dict["id"] = getMd5Digest(str(instance.name)) random_num = random.randint(10000, 20000)
item_dict["ori_name"] = instance.name.strip() item_dict["results_num"] = random_num
item_dict["is_online"] = instance.is_online item_dict["offline_score"] = 0.0
random_num = random.randint(10000, 20000) item_dict["create_tag_type"] = instance.create_tag_type
item_dict["results_num"] = random_num item_dict["style"] = instance.style
item_dict["offline_score"] = 0.0 item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["create_tag_type"] = instance.create_tag_type item_dict["agile_tag_type"] = instance.get_agile_tag_type()
item_dict["style"] = instance.style item_dict["agile_tag_id"] = instance.id
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
item_dict["agile_tag_type"] = instance.get_agile_tag_type() ret_list.append(item_dict)
item_dict["agile_tag_id"] = instance.id suggest_list = get_tips_suggest_list(instance.name)
item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type() logging.info("get ret_list:%s" % ret_list)
ret_list.append(item_dict)
suggest_list = get_tips_suggest_list(instance.name)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list) return (item_dict, suggest_list)
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
...@@ -181,29 +153,23 @@ class TagTransfer(object): ...@@ -181,29 +153,23 @@ class TagTransfer(object):
@classmethod @classmethod
def get_tag_suggest_hospital_data_list(self, instance): def get_tag_suggest_hospital_data_list(self, instance):
try: try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id, ret_list = list()
agile_tag_type=AGILE_TAG_TYPE.HOSPITAL) item_dict = dict()
if result: item_dict["id"] = getMd5Digest(str(instance.name))
ret_list = list() item_dict["ori_name"] = instance.name.strip()
item_dict = dict() item_dict["is_online"] = instance.is_online
item_dict["id"] = getMd5Digest(str(instance.name)) random_num = random.randint(10000, 20000)
item_dict["ori_name"] = instance.name.strip() item_dict["results_num"] = random_num
item_dict["is_online"] = instance.is_online item_dict["offline_score"] = 0.0
random_num = random.randint(10000, 20000) item_dict["create_tag_type"] = instance.create_tag_type
item_dict["results_num"] = random_num item_dict["style"] = instance.style
item_dict["offline_score"] = 0.0 item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["create_tag_type"] = instance.create_tag_type item_dict["agile_tag_type"] = instance.get_agile_tag_type()
item_dict["style"] = instance.style item_dict["agile_tag_id"] = instance.id
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
item_dict["agile_tag_type"] = instance.get_agile_tag_type() ret_list.append(item_dict)
item_dict["agile_tag_id"] = instance.id suggest_list = get_tips_suggest_list(instance.name)
item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type() logging.info("get ret_list:%s" % ret_list)
ret_list.append(item_dict)
suggest_list = get_tips_suggest_list(instance.name)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list) return (item_dict, suggest_list)
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
...@@ -212,29 +178,23 @@ class TagTransfer(object): ...@@ -212,29 +178,23 @@ class TagTransfer(object):
@classmethod @classmethod
def get_tag_suggest_doctor_data_list(self, instance): def get_tag_suggest_doctor_data_list(self, instance):
try: try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id, ret_list = list()
agile_tag_type=AGILE_TAG_TYPE.DOCTOR) item_dict = dict()
if result: item_dict["id"] = getMd5Digest(str(instance.name))
ret_list = list() item_dict["ori_name"] = instance.name.strip()
item_dict = dict() item_dict["is_online"] = instance.is_online
item_dict["id"] = getMd5Digest(str(instance.name)) random_num = random.randint(10000, 20000)
item_dict["ori_name"] = instance.name.strip() item_dict["results_num"] = random_num
item_dict["is_online"] = instance.is_online item_dict["offline_score"] = 0.0
random_num = random.randint(10000, 20000) item_dict["create_tag_type"] = instance.create_tag_type
item_dict["results_num"] = random_num item_dict["style"] = instance.style
item_dict["offline_score"] = 0.0 item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["create_tag_type"] = instance.create_tag_type item_dict["agile_tag_type"] = instance.get_agile_tag_type()
item_dict["style"] = instance.style item_dict["agile_tag_id"] = instance.id
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type()
item_dict["agile_tag_type"] = instance.get_agile_tag_type() ret_list.append(item_dict)
item_dict["agile_tag_id"] = instance.id suggest_list = get_tips_suggest_list(instance.name)
item_dict["api_agile_tag_recommend_type"] = instance.get_api_agile_tag_recommend_type() logging.info("get ret_list:%s" % ret_list)
ret_list.append(item_dict)
suggest_list = get_tips_suggest_list(instance.name)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list) return (item_dict, suggest_list)
except: except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc()) logging.error("catch exception,err_msg:%s" % traceback.format_exc())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment