Skip to content

S
search_tips
Commit 2ffac48b authored by lixiaofang's avatar lixiaofang
Browse files
Options

add

parent 8634a541
Hide whitespace changes
Inline Side-by-side
Showing with 45 additions and 26 deletions
associate/models/agile_tag.py
View file @ 2ffac48b
......@@ -11,6 +11,7 @@ from gm_types.gaia import (
AGILE_TAG_CREATE_TYPE,
AGILE_TAG_STYLE,
AGILE_TAG_RECOMMEND_TYPE,
)
......@@ -45,8 +46,8 @@ class AgileTag(BaseModel):
def get_api_agile_tag_recommend_type(self):
try:
results = AgileTagRecommendType.objects.filter(agile_tag_id=self.id).values_list("agile_tag_type",
flat=True).first()
results = AgileTagRecommendType.objects.filter(agile_tag_id=self.id,
agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list("agile_tag_type",flat=True).first()
return results
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
......
associate/utils/agile_tag_transfer.py
View file @ 2ffac48b
......@@ -17,6 +17,7 @@ from associate.commons.words_utils import QueryWordAttr
from associate.models import agile_tag
from gm_types.gaia import (
AGILE_TAG_TYPE,
AGILE_TAG_RECOMMEND_TYPE
)
......@@ -25,28 +26,32 @@ class TagTransfer(object):
@classmethod
def get_tag_suggest_data_list(cls, instance):
try:
results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
"agile_tag_type", flat=True).first()
ret_list = list()
item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
item_dict["ori_name"] = instance.name.strip()
item_dict["is_online"] = instance.is_online
random_num = random.randint(3000, 10000)
item_dict["results_num"] = random_num
item_dict["offline_score"] = 0.0
item_dict["create_tag_type"] = instance.create_tag_type
item_dict["style"] = instance.style
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["agile_tag_type"] = instance.get_agile_tag_type()
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)
if results:
ret_list = list()
item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
item_dict["ori_name"] = instance.name.strip()
item_dict["is_online"] = instance.is_online
random_num = random.randint(3000, 10000)
item_dict["results_num"] = random_num
item_dict["offline_score"] = 0.0
item_dict["create_tag_type"] = instance.create_tag_type
item_dict["style"] = instance.style
item_dict["topic_recommend_sort"] = instance.topic_recommend_sort
item_dict["agile_tag_type"] = instance.get_agile_tag_type()
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)
return (item_dict, suggest_list)
logging.info("get ret_list:%s" % ret_list)
logging.info("get suggest_list:%s" % ret_list)
return (item_dict, suggest_list)
except:
logging.error("catch exception,err_msg:%s" % traceback.format_exc())
return ([], [])
......@@ -87,7 +92,11 @@ class TagTransfer(object):
try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_TYPE.PROJECT)
if result:
results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
"agile_tag_type", flat=True).first()
if result and results:
ret_list = list()
item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
......@@ -118,7 +127,10 @@ class TagTransfer(object):
try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_TYPE.POSITION)
if result:
results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
"agile_tag_type", flat=True).first()
if result and results:
ret_list = list()
item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
......@@ -149,7 +161,10 @@ class TagTransfer(object):
try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_TYPE.INSTRUMENT)
if result:
results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
"agile_tag_type", flat=True).first()
if result and results:
ret_list = list()
item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
......@@ -180,7 +195,10 @@ class TagTransfer(object):
try:
result = agile_tag.AgileTagType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_TYPE.HOSPITAL)
if result:
results = agile_tag.AgileTagRecommendType.objects.filter(agile_tag_id=instance.id,
agile_tag_type=AGILE_TAG_RECOMMEND_TYPE.TRACTATE).values_list(
"agile_tag_type", flat=True).first()
if result and results:
ret_list = list()
item_dict = dict()
item_dict["id"] = getMd5Digest(str(instance.name))
......
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