Commit 4140e006 authored by 谢祁峰's avatar 谢祁峰

fix

parent 28d1efa1
...@@ -633,7 +633,7 @@ class CollectData(object): ...@@ -633,7 +633,7 @@ class CollectData(object):
logging.info("action=api/v1/cards/topic") logging.info("action=api/v1/cards/topic")
tag_name = data["APP"].get("query", []) tag_name = data["APP"].get("query", [])
tag_list = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter( tag_list = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter(
name=tag_name).values_list("id")) name=tag_name).values_list("id",flat=True))
device_id = data["SYS"]["cl_id"] device_id = data["SYS"]["cl_id"]
user_id = data['SYS'].get('user_id', None) user_id = data['SYS'].get('user_id', None)
self.transfer_update_recommend_tag_list(device_id, user_feature, user_id, self.transfer_update_recommend_tag_list(device_id, user_feature, user_id,
...@@ -651,14 +651,15 @@ class CollectData(object): ...@@ -651,14 +651,15 @@ class CollectData(object):
tag_ids = list(data["APP"].get("tag_ids", [])) tag_ids = list(data["APP"].get("tag_ids", []))
tag_list = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter( tag_list = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter(
id__in=tag_ids, is_online=True, is_deleted=False, id__in=tag_ids, is_online=True, is_deleted=False,
is_category=False).values_list("id")) is_category=False).values_list("id",flat=True))
tag_query_results_multi = [i for i in tag_ids if i in tag_list]
device_id = data["SYS"]["cl_id"] device_id = data["SYS"]["cl_id"]
user_id = data['SYS'].get('user_id', None) user_id = data['SYS'].get('user_id', None)
self.transfer_update_recommend_tag_list(device_id, user_feature, user_id, self.transfer_update_recommend_tag_list(device_id, user_feature, user_id,
tag_list, tag_query_results_multi,
10) 10)
logging.info("%s,device_id:%s,tag_list:%s" % (action, logging.info("%s,device_id:%s,tag_list:%s" % (action,
str(device_id), str(tag_list))) str(device_id), str(tag_query_results_multi)))
# 创建问题关注标签关键字进linucb # 创建问题关注标签关键字进linucb
elif 'SYS' in data and 'APP' in data and 'action' in data['SYS'] and \ elif 'SYS' in data and 'APP' in data and 'action' in data['SYS'] and \
"venus/sun/pictorial/edit" in str(data['SYS'].get('action',"")): "venus/sun/pictorial/edit" in str(data['SYS'].get('action',"")):
...@@ -668,14 +669,15 @@ class CollectData(object): ...@@ -668,14 +669,15 @@ class CollectData(object):
tag_ids = list(data["APP"].get("tag_ids", [])) tag_ids = list(data["APP"].get("tag_ids", []))
tag_list = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter( tag_list = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter(
id__in=tag_ids, is_online=True, is_deleted=False, id__in=tag_ids, is_online=True, is_deleted=False,
is_category=False).values_list("id")) is_category=False).values_list("id",flat=True))
tag_query_results_multi = [i for i in tag_ids if i in tag_list]
device_id = data["SYS"]["cl_id"] device_id = data["SYS"]["cl_id"]
user_id = data['SYS'].get('user_id', None) user_id = data['SYS'].get('user_id', None)
self.transfer_update_recommend_tag_list(device_id, user_feature, user_id, self.transfer_update_recommend_tag_list(device_id, user_feature, user_id,
tag_list, tag_query_results_multi,
20) 20)
logging.info("%s,device_id:%s,tag_list:%s" % (action, logging.info("%s,device_id:%s,tag_list:%s" % (action,
str(device_id), str(tag_list))) str(device_id), str(tag_query_results_multi)))
# kyc最后一题 # kyc最后一题
elif 'SYS' in data and 'APP' in data and 'action' in data['SYS'] and \ elif 'SYS' in data and 'APP' in data and 'action' in data['SYS'] and \
"venus/community/survey_question/record_kyc_last_question" in str(data['SYS'].get('action',"")): "venus/community/survey_question/record_kyc_last_question" in str(data['SYS'].get('action',"")):
...@@ -685,8 +687,8 @@ class CollectData(object): ...@@ -685,8 +687,8 @@ class CollectData(object):
logging.info('action:%s,tag_list:%s' % (action, str(tag_ids))) logging.info('action:%s,tag_list:%s' % (action, str(tag_ids)))
tag_query_results = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter( tag_query_results = list(Tag.objects.using(settings.SLAVE1_DB_NAME).filter(
id__in=tag_ids, is_online=True, is_deleted=False, id__in=tag_ids, is_online=True, is_deleted=False,
is_category=False).values_list("id")) is_category=False).values_list("id",flat=True))
tag_query_results = [i[0] for i in tag_query_results] # tag_query_results = [i[0] for i in tag_query_results]
logging.info('action:%s,mysql query taglist:%s' % (action, str(tag_query_results))) logging.info('action:%s,mysql query taglist:%s' % (action, str(tag_query_results)))
tag_query_results_multi = [i for i in tag_ids if i in tag_query_results] tag_query_results_multi = [i for i in tag_ids if i in tag_query_results]
device_id = data["SYS"]["cl_id"] device_id = data["SYS"]["cl_id"]
......
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