|
@@ -52,7 +52,6 @@ class create_ad_plan_local(BaseHandler):
|
|
user_id = request_dict['user_id']
|
|
user_id = request_dict['user_id']
|
|
ad_plan_list = request_dict['plan_list']
|
|
ad_plan_list = request_dict['plan_list']
|
|
|
|
|
|
- print(user_id, ad_plan_list)
|
|
|
|
sql_session = db.DBSession()
|
|
sql_session = db.DBSession()
|
|
if user_id is None or ad_plan_list is None:
|
|
if user_id is None or ad_plan_list is None:
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
@@ -85,7 +84,6 @@ class create_ad_plan(BaseHandler):
|
|
def save_task_info(self, user_id, ad_plan_list, sql_session, task_name):
|
|
def save_task_info(self, user_id, ad_plan_list, sql_session, task_name):
|
|
|
|
|
|
# 2.数据存入数据库
|
|
# 2.数据存入数据库
|
|
- print(user_id, ad_plan_list)
|
|
|
|
if user_id is None or ad_plan_list is None:
|
|
if user_id is None or ad_plan_list is None:
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
return
|
|
return
|
|
@@ -94,9 +92,7 @@ class create_ad_plan(BaseHandler):
|
|
ad_plan_name = _['title']
|
|
ad_plan_name = _['title']
|
|
ad_plan_typesetting_info = {'user_id': user_id, 'name': ad_plan_name,
|
|
ad_plan_typesetting_info = {'user_id': user_id, 'name': ad_plan_name,
|
|
'typesetting': json.dumps(_, ensure_ascii=False)}
|
|
'typesetting': json.dumps(_, ensure_ascii=False)}
|
|
- print('typesetting_info')
|
|
|
|
- print(_)
|
|
|
|
- print(ad_plan_typesetting_info)
|
|
|
|
|
|
+
|
|
ad_plan_typesetting_inserte = sql_tools.save_ad_plan_typesetting_info(
|
|
ad_plan_typesetting_inserte = sql_tools.save_ad_plan_typesetting_info(
|
|
ad_plan_typesetting_info=ad_plan_typesetting_info,
|
|
ad_plan_typesetting_info=ad_plan_typesetting_info,
|
|
table_ad_plan_typesetting=ad_plan_typesetting_table)
|
|
table_ad_plan_typesetting=ad_plan_typesetting_table)
|
|
@@ -104,7 +100,6 @@ class create_ad_plan(BaseHandler):
|
|
sql_session.commit()
|
|
sql_session.commit()
|
|
|
|
|
|
for _ in ad_plan_list:
|
|
for _ in ad_plan_list:
|
|
- print(_)
|
|
|
|
for action_type in [layout_create_action, ad_plan_create_action]:
|
|
for action_type in [layout_create_action, ad_plan_create_action]:
|
|
object_name = _['title'] if action_type == ad_plan_create_action else \
|
|
object_name = _['title'] if action_type == ad_plan_create_action else \
|
|
_['idea']['jump_type_page_type'][
|
|
_['idea']['jump_type_page_type'][
|
|
@@ -123,7 +118,6 @@ class create_ad_plan(BaseHandler):
|
|
log_ad = None
|
|
log_ad = None
|
|
try:
|
|
try:
|
|
request_dict = json.loads(self.request.body, encoding='utf-8')
|
|
request_dict = json.loads(self.request.body, encoding='utf-8')
|
|
- print(request_dict)
|
|
|
|
ad_plan_list = request_dict['plan_list']
|
|
ad_plan_list = request_dict['plan_list']
|
|
user_id = request_dict['user_id']
|
|
user_id = request_dict['user_id']
|
|
# 2.2存行为记录
|
|
# 2.2存行为记录
|
|
@@ -140,12 +134,13 @@ class create_ad_plan(BaseHandler):
|
|
else:
|
|
else:
|
|
self.save_task_info(user_id, ad_plan_list, sql_session, task_name)
|
|
self.save_task_info(user_id, ad_plan_list, sql_session, task_name)
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
|
+ if log_ad:
|
|
|
|
+ log_ad.driver.quit()
|
|
|
|
+
|
|
logging.error(str(e))
|
|
logging.error(str(e))
|
|
self.write('eror')
|
|
self.write('eror')
|
|
raise
|
|
raise
|
|
finally:
|
|
finally:
|
|
- if log_ad:
|
|
|
|
- log_ad.driver.quit()
|
|
|
|
sql_session.commit()
|
|
sql_session.commit()
|
|
|
|
|
|
|
|
|
|
@@ -166,10 +161,8 @@ class get_ad_plan_local(BaseHandler):
|
|
layout_name = ''
|
|
layout_name = ''
|
|
result = sql_tools.get_plan_typesetting_rough(sql_session=sql_session, user_id=user_id,
|
|
result = sql_tools.get_plan_typesetting_rough(sql_session=sql_session, user_id=user_id,
|
|
typesetting_name=layout_name)
|
|
typesetting_name=layout_name)
|
|
- print(result)
|
|
|
|
result_ = []
|
|
result_ = []
|
|
for i in range(len(result)):
|
|
for i in range(len(result)):
|
|
- print(result[i])
|
|
|
|
typesetting, name, create_time, update_time = result[i]
|
|
typesetting, name, create_time, update_time = result[i]
|
|
_ = {}
|
|
_ = {}
|
|
_['typesetting'] = json.loads(typesetting)
|
|
_['typesetting'] = json.loads(typesetting)
|
|
@@ -190,8 +183,6 @@ class create_ad_layout_local(BaseHandler):
|
|
layout_typesetting = request_dict['layout_typesetting']
|
|
layout_typesetting = request_dict['layout_typesetting']
|
|
layout_name = request_dict['layout_name']
|
|
layout_name = request_dict['layout_name']
|
|
|
|
|
|
- print(user_id, layout_typesetting, layout_name)
|
|
|
|
- print('layout-typesetting', type(layout_typesetting), layout_typesetting)
|
|
|
|
sql_session = db.DBSession()
|
|
sql_session = db.DBSession()
|
|
if user_id is None or layout_name is None or layout_typesetting is None:
|
|
if user_id is None or layout_name is None or layout_typesetting is None:
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
@@ -224,10 +215,8 @@ class get_ad_layout_local(BaseHandler):
|
|
layout_name = ''
|
|
layout_name = ''
|
|
result = sql_tools.get_layout_typesetting_rough(sql_session=sql_session, user_id=user_id,
|
|
result = sql_tools.get_layout_typesetting_rough(sql_session=sql_session, user_id=user_id,
|
|
typesetting_name=layout_name)
|
|
typesetting_name=layout_name)
|
|
- print(result)
|
|
|
|
result_ = []
|
|
result_ = []
|
|
for i in range(len(result)):
|
|
for i in range(len(result)):
|
|
- print(result[i])
|
|
|
|
typesetting, name, create_time, update_time = result[i]
|
|
typesetting, name, create_time, update_time = result[i]
|
|
_ = {}
|
|
_ = {}
|
|
_['typesetting'] = json.loads(typesetting)
|
|
_['typesetting'] = json.loads(typesetting)
|
|
@@ -267,7 +256,7 @@ class ad_human_info(BaseHandler):
|
|
wechat_code = log_ad.log_in()
|
|
wechat_code = log_ad.log_in()
|
|
tornado_web.write({'status': {'msg': 'success', "RetCode": 200},
|
|
tornado_web.write({'status': {'msg': 'success', "RetCode": 200},
|
|
'wechat_code': wechat_code})
|
|
'wechat_code': wechat_code})
|
|
- print('cookie can not use')
|
|
|
|
|
|
+ logging.info('cookie can not use')
|
|
else:
|
|
else:
|
|
# cookie 可以继续使用
|
|
# cookie 可以继续使用
|
|
cookie_canuse = True
|
|
cookie_canuse = True
|
|
@@ -292,7 +281,6 @@ class ad_human_info(BaseHandler):
|
|
is_refresh = self.get_argument("is_refresh", None)
|
|
is_refresh = self.get_argument("is_refresh", None)
|
|
wechat_name = self.get_argument('wechat_name', None)
|
|
wechat_name = self.get_argument('wechat_name', None)
|
|
service_name = self.get_argument('service_name', None)
|
|
service_name = self.get_argument('service_name', None)
|
|
- print(user_id, is_refresh)
|
|
|
|
if user_id is None or is_refresh is None or wechat_name is None or service_name is None:
|
|
if user_id is None or is_refresh is None or wechat_name is None or service_name is None:
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
return
|
|
return
|
|
@@ -332,7 +320,6 @@ class ad_human_info(BaseHandler):
|
|
# 2.获取userid对应数据
|
|
# 2.获取userid对应数据
|
|
result = sql_tools.get_human_info(sql_session=sql_session,
|
|
result = sql_tools.get_human_info(sql_session=sql_session,
|
|
service_name=service_name, wechat_name=wechat_name)
|
|
service_name=service_name, wechat_name=wechat_name)
|
|
- print(result)
|
|
|
|
result = json.loads(result)
|
|
result = json.loads(result)
|
|
if human_package_name:
|
|
if human_package_name:
|
|
result = [_ for _ in result if human_package_name in _['name']]
|
|
result = [_ for _ in result if human_package_name in _['name']]
|
|
@@ -344,12 +331,12 @@ class ad_human_info(BaseHandler):
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
'human_info': result})
|
|
'human_info': result})
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
|
+ if log_ad:
|
|
|
|
+ log_ad.driver.quit()
|
|
logging.error(str(e))
|
|
logging.error(str(e))
|
|
raise
|
|
raise
|
|
finally:
|
|
finally:
|
|
sql_session.commit()
|
|
sql_session.commit()
|
|
- if log_ad:
|
|
|
|
- log_ad.driver.quit()
|
|
|
|
|
|
|
|
|
|
|
|
class ad_wechat_info(BaseHandler):
|
|
class ad_wechat_info(BaseHandler):
|
|
@@ -366,7 +353,6 @@ class ad_wechat_info(BaseHandler):
|
|
# 1.获取userid,以及是否刷新
|
|
# 1.获取userid,以及是否刷新
|
|
user_id = self.get_argument("user_id", None)
|
|
user_id = self.get_argument("user_id", None)
|
|
is_refresh = self.get_argument("is_refresh", None)
|
|
is_refresh = self.get_argument("is_refresh", None)
|
|
- print(user_id, is_refresh)
|
|
|
|
if user_id is None or is_refresh is None:
|
|
if user_id is None or is_refresh is None:
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
self.write({'status': {'msg': 'url parameter error', "RetCode": 400}})
|
|
return
|
|
return
|
|
@@ -401,15 +387,14 @@ class ad_wechat_info(BaseHandler):
|
|
for _ in result:
|
|
for _ in result:
|
|
service_name, wechat_name = _
|
|
service_name, wechat_name = _
|
|
result_list.append({'service_name': service_name, 'wechat_name': wechat_name})
|
|
result_list.append({'service_name': service_name, 'wechat_name': wechat_name})
|
|
- print(result_list)
|
|
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
'wechat_info': result_list})
|
|
'wechat_info': result_list})
|
|
except Exception as e:
|
|
except Exception as e:
|
|
|
|
+ if log_ad:
|
|
|
|
+ log_ad.driver.quit()
|
|
logging.error(str(e))
|
|
logging.error(str(e))
|
|
raise
|
|
raise
|
|
finally:
|
|
finally:
|
|
- if log_ad:
|
|
|
|
- log_ad.driver.quit()
|
|
|
|
sql_session.commit()
|
|
sql_session.commit()
|
|
|
|
|
|
|
|
|
|
@@ -459,7 +444,6 @@ class get_ad_wechat_service_name(BaseHandler):
|
|
for _ in result:
|
|
for _ in result:
|
|
service_name = _
|
|
service_name = _
|
|
result_list.append({'service_name': service_name})
|
|
result_list.append({'service_name': service_name})
|
|
- print(result_list)
|
|
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
'wechat_info': result_list})
|
|
'wechat_info': result_list})
|
|
|
|
|
|
@@ -479,7 +463,6 @@ class get_ad_wechat_wechat_name(BaseHandler):
|
|
for _ in result:
|
|
for _ in result:
|
|
service_name, wechat_name = _
|
|
service_name, wechat_name = _
|
|
result_list.append({'service_name': service_name, 'wechat_name': wechat_name})
|
|
result_list.append({'service_name': service_name, 'wechat_name': wechat_name})
|
|
- print(result_list)
|
|
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
'wechat_info': result_list})
|
|
'wechat_info': result_list})
|
|
|
|
|
|
@@ -502,7 +485,6 @@ class get_plan_action_record(BaseHandler):
|
|
status=status, plan_name=plan_name)
|
|
status=status, plan_name=plan_name)
|
|
result_ = []
|
|
result_ = []
|
|
for i in range(len(result)):
|
|
for i in range(len(result)):
|
|
- print(result[i])
|
|
|
|
user_id, name, service_name, wechat_name, create_time, status, typesetting, wechat_id_info = result[i]
|
|
user_id, name, service_name, wechat_name, create_time, status, typesetting, wechat_id_info = result[i]
|
|
_ = {}
|
|
_ = {}
|
|
_['typesetting'] = json.loads(typesetting)
|
|
_['typesetting'] = json.loads(typesetting)
|
|
@@ -533,7 +515,6 @@ class get_all_ad_task(BaseHandler):
|
|
localtion = ['wechat', '']
|
|
localtion = ['wechat', '']
|
|
for _ in result:
|
|
for _ in result:
|
|
task_name, status, task_status_num, create_time, typesetting = _
|
|
task_name, status, task_status_num, create_time, typesetting = _
|
|
- print(typesetting)
|
|
|
|
typesetting = json.loads(typesetting)
|
|
typesetting = json.loads(typesetting)
|
|
if typesetting['plan_base'][1] == 'pyq':
|
|
if typesetting['plan_base'][1] == 'pyq':
|
|
localtion[1] = 'pyq'
|
|
localtion[1] = 'pyq'
|
|
@@ -547,7 +528,6 @@ class get_all_ad_task(BaseHandler):
|
|
for k, v in task_dict.items():
|
|
for k, v in task_dict.items():
|
|
# TODO:修改为dict的sort
|
|
# TODO:修改为dict的sort
|
|
sum_num = 0
|
|
sum_num = 0
|
|
- print(k, v)
|
|
|
|
new_dict = {}
|
|
new_dict = {}
|
|
create_time = None
|
|
create_time = None
|
|
for k_, v_ in v.items():
|
|
for k_, v_ in v.items():
|
|
@@ -561,7 +541,6 @@ class get_all_ad_task(BaseHandler):
|
|
{'task_name': k, 'task_info': new_dict, 'create_time': create_time, 'channel': localtion[0],
|
|
{'task_name': k, 'task_info': new_dict, 'create_time': create_time, 'channel': localtion[0],
|
|
'localtion': localtion[1], 'id': num, 'status': status})
|
|
'localtion': localtion[1], 'id': num, 'status': status})
|
|
num = num + 1
|
|
num = num + 1
|
|
- print(json.dumps(task_dict))
|
|
|
|
|
|
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
self.write({'status': {'msg': 'success', "RetCode": 200},
|
|
'local_ad_plan_info': result_})
|
|
'local_ad_plan_info': result_})
|