Commit ef397482 authored by 王浩's avatar 王浩

Merge branch 'test' into 'master'

Alpha 2.0

See merge request alpha/sun!225
parents 1ead0077 ea25f7d7
......@@ -61,7 +61,8 @@ class PictorialUpdateOrCreate(APIView):
'collection_tag_ids': collection_tag_ids,
'is_home_recommend': int(request.POST.get('is_home_recommend', 0)),
'add_score': int(request.POST.get('add_score', 0)),
'is_public': True if request.POST.get('is_public') == "true" else False
'is_public': True if request.POST.get('is_public') == "true" else False,
'is_feed': int(request.POST.get('is_feed',0))
}
try:
......@@ -94,3 +95,51 @@ class PictorialTopics(APIView):
return {
'message': '更新成功'
}
class PictorialFeedlListView(APIView):
def get(self, request):
order_by = request.GET.get('order_by', "-id")
offset = int(request.GET.get('offset', 1))
limit = int(request.GET.get('limit', 10))
try:
data = self.rpc['venus/sun/pictorial/feed/list'](offset=(offset - 1) * limit, limit=limit,
order_by=order_by).unwrap()
except Exception as e:
error_logger.error(u'获取画报列表失败%s' , e)
raise
return data
class PictorialFeedlRank(APIView):
"""修改画报首页like流rank"""
def post(self, request):
id_ = request.POST.get('id')
rank = int(request.POST.get('rank'))
try:
self.rpc['venus/sun/pictorial/feed/rank'](id_=id_, rank=rank).unwrap()
except Exception as e:
error_logger.error(u'编辑%信息失败%s' % (e))
raise
return {
'message': '更新成功'
}
class PictorialFeedDelete(APIView):
"""删除画报首页like流"""
def post(self, request):
ids = json.loads(request.POST.get('ids', '[]'))
try:
self.rpc['venus/sun/pictorial/feed/delete'](ids=ids).unwrap()
except Exception as e:
error_logger.error(u'删除信息失败%s' % (e))
raise
return {
'message': '删除成功'
}
\ No newline at end of file
......@@ -91,3 +91,33 @@ class BatchCreateTopicWithAiFashionTag(APIView):
self.rpc['venus/sun/tools/batch_create_topic_with_ai_fashion_tag'](infos=json_data).unwrap()
return {'message': u'上传成功', 'code': 200}
class AddVirtFans(APIView):
def post(self, request):
xls_file = request.FILES.get('file')
if not xls_file:
return {'message': u'上传失败,请重新上传', 'code': 500}
wb = load_workbook(xls_file)
data = wb.get_sheet_by_name(wb.get_sheet_names()[0])
columns = [item for item in data.columns]
user_id_column = [item.value for item in columns[0]]
fans_num_column = [item.value for item in columns[1]]
user_id_fans_num_data = list(zip(user_id_column[1:], fans_num_column[1:]))
#做一次数据清洗。 避免文件中的空行
user_id_fans_num_data = [
(user_id, fans_num) for user_id, fans_num in user_id_fans_num_data
if isinstance(user_id, int) and isinstance(fans_num, int)
]
try:
self.rpc['venus/sun/tools/add_virt_fans'](data=user_id_fans_num_data).unwrap()
except:
return {'message': u'处理失败', 'code': 500}
return {'message': u'处理成功', 'code': 200}
......@@ -40,7 +40,7 @@ class TopicListView(APIView):
try:
data = self.rpc['venus/sun/topic/list'](
topic_ids=topic_ids
topic_ids=topic_ids, pictorial_id=pictorial_id
).unwrap()
except Exception as e:
error_logger.error(u'获取帖子列表失败%s', e)
......@@ -227,3 +227,20 @@ class TopicRelatePictorialInfo(APIView):
error_logger.error(u'获取帖子画报列表失败%s', e)
raise
return {'data': data}
class TopicBallot(APIView):
def post(self, request):
id_ = request.POST.get('id')
pictorial_id = request.POST.get('pictorial_id')
ballot_num = request.POST.get('ballot_num')
try:
self.rpc['venus/sun/topic/ballot'](id_=id_, pictorial_id=pictorial_id, ballot_num=ballot_num).unwrap()
except Exception as e:
error_logger.error(u'批量更新帖子失败%s', e)
raise
return {
"message": "更新成功"
}
......@@ -58,6 +58,7 @@ urlpatterns = [
url(r'^topic/reply/batch_delete$', ReplyUpdateOrCreateView.as_view()),
url(r'^topic/reply/create$', ReplyCreate.as_view()),
url(r'^topic/related_pictorial_info$', TopicRelatePictorialInfo.as_view()),
url(r'^topic/ballot$', TopicBallot.as_view()),
# star相关
url(r'^celebrity/list$', CelebrityListView.as_view()),
......@@ -141,6 +142,10 @@ urlpatterns = [
url(r'^pictorial/create$', PictorialUpdateOrCreate.as_view()),
url(r'^pictorial/topics$', PictorialTopics.as_view()),
url(r'^pictorial/user/list$', PictorialUserList.as_view()),
url(r'^pictorial/feed/list$', PictorialFeedlListView.as_view()),
url(r'^pictorial/feed/rank$', PictorialFeedlRank.as_view()),
url(r'^pictorial/feed/delete$', PictorialFeedDelete.as_view()),
#运营位
url(r'^topic/home_recommend/list', TopicHomeRecommendList.as_view()),
......@@ -157,6 +162,7 @@ urlpatterns = [
url(r'^tools/virtual_vote$', VirtualVote.as_view()),
url(r'^tools/batch_update_topic_tag$', BatchUpdateTopicTag.as_view()),
url(r'^tools/batch_create_topic_with_ai_fashion_tag$', BatchCreateTopicWithAiFashionTag.as_view()),
url(r'^tools/add_virt_fans', AddVirtFans.as_view()),
# 母词
url(r'^word_parent/list$', WordParentListView.as_view()),
......
......@@ -27,17 +27,21 @@ class WordParentInfoView(APIView):
class WordParentCreateView(APIView):
def post(self, request):
name = request.POST.get('name', None)
children_words = json.loads(request.POST.get('children_words', '[]'))
content_ad = request.POST.get('content_ad', '')
makeup_ad = request.POST.get('makeup_ad', '')
dress_ad = request.POST.get('dress_ad', '')
gender = request.POST.get('gender', 0)
if not name:
return r'缺少参数'
data = self.rpc['venus/sun/word_parent/add'](name=name, children_words=children_words, content_ad=content_ad, makeup_ad=makeup_ad, dress_ad=dress_ad, gender=gender).unwrap()
data = {}
data["name"] = request.POST.get('name', None)
children_words = request.POST.get('children_words')
data["children_words"] = json.loads(children_words) if children_words else []
data["content_ad"] = request.POST.get('content_ad', None)
data["makeup_ad"] = request.POST.get('makeup_ad', None)
data["dress_ad"] = request.POST.get('dress_ad', None)
data["gender"] = request.POST.get('gender', None)
makeup_pictorial_ids = request.POST.get('makeup_pictorial_ids')
clothing_pictorial_ids = request.POST.get('clothing_pictorial_ids')
data["makeup_pictorial_ids"] = json.loads(makeup_pictorial_ids) if makeup_pictorial_ids else []
data["clothing_pictorial_ids"] = json.loads(clothing_pictorial_ids) if clothing_pictorial_ids else []
data = self.rpc['venus/sun/word_parent/add'](data=data).unwrap()
return data
......@@ -45,18 +49,22 @@ class WordParentCreateView(APIView):
class WordParentUpdateView(APIView):
def post(self, request):
id_ = request.POST.get('id', None)
name = request.POST.get('name', None)
children_words = json.loads(request.POST.get('children_words', '[]'))
content_ad = request.POST.get('content_ad', None)
makeup_ad = request.POST.get('makeup_ad', None)
dress_ad = request.POST.get('dress_ad', None)
gender = request.POST.get('gender', None)
if not id_:
return r'缺少参数'
data = self.rpc['venus/sun/word_parent/edit'](id_=id_, name=name, children_words=children_words, content_ad=content_ad, makeup_ad=makeup_ad, dress_ad=dress_ad, gender=gender).unwrap()
data = {}
data["id"] = request.POST.get('id', None)
data["name"] = request.POST.get('name', None)
children_words = request.POST.get('children_words')
data["children_words"] = json.loads(children_words) if children_words else []
data["content_ad"] = request.POST.get('content_ad', None)
data["makeup_ad"] = request.POST.get('makeup_ad', None)
data["dress_ad"] = request.POST.get('dress_ad', None)
data["gender"] = request.POST.get('gender', None)
makeup_pictorial_ids = request.POST.get('makeup_pictorial_ids')
clothing_pictorial_ids = request.POST.get('clothing_pictorial_ids')
data["makeup_pictorial_ids"] = json.loads(makeup_pictorial_ids) if makeup_pictorial_ids else []
data["clothing_pictorial_ids"] = json.loads(clothing_pictorial_ids) if clothing_pictorial_ids else []
data = self.rpc['venus/sun/word_parent/edit'](data=data).unwrap()
if not data:
return r'更新失败'
......
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