MOD:fix bug

handlers/PublicAnalysisHandler.py

@@ -190,8 +190,6 @@ class AdvertisementIdea(BaseHandler):
             arg = self.get_args()
             data_type = arg.get('dataType', 'all')  # 数据是否是个人,个人是private,共有是all
             channel = arg.get('channel')  # 渠道-----朋友圈信息流,抖音,广点通等等,,,,,,选项朋友圈信息流,公众平台流量,先#TODO:先暂时放置
-            label_ids = arg.get('labels')  # 标签
-            collect = arg.get('collect')  # 是否用标签的数据
             page = arg.get('pageNum', 1)
             page_size = arg.get('pageSize', 20)
             order = 'desc' if arg.get('upOrder') else 'asc'  #
@@ -201,10 +199,11 @@ class AdvertisementIdea(BaseHandler):
             book = arg.get('novels')
             is_video = arg.get('type')
             is_singleimg = arg.get('singleImg', True)  # 是否是组图-----默认是没有
-            user_id = arg.get('userId', '192')  # TODO:测试默认192
+            user_id = arg.get('userId')
+            campaign_ids = arg.get('campaignIds')
 
             data = idea_rank(user_id, start, end, page, page_size, order, order_by,
-                             book, channel, is_singleimg, is_video, label_ids, collect, data_type)
+                             book, channel, is_singleimg, is_video, data_type, campaign_ids)
             self.write_json_tmp_java(data=data)
 
 
@@ -218,8 +217,6 @@ class AdvertisementMedia(BaseHandler):
             arg = self.get_args()
             data_type = arg.get('dataType', 'all')  # 数据是否是个人,个人是private,共有是all
             channel = arg.get('channel')  # 渠道-----朋友圈信息流,抖音,广点通等等,,,,,,选项朋友圈信息流,公众平台流量,先#TODO:先暂时放置
-            labels = arg.get('labels')  # 标签
-            collect = arg.get('collect')  # 是否用标签的数据
             page = arg.get('pageNum', 1)
             page_size = arg.get('pageSize', 20)
             order = 'desc' if arg.get('upOrder') else 'asc'  #
@@ -229,10 +226,11 @@ class AdvertisementMedia(BaseHandler):
             book = arg.get('novels')
             is_video = arg.get('type')
             is_singleimg = arg.get('singleImg', True)  # 是否是组图-----默认是没有
-            user_id = arg.get('userId', '192')  # TODO:测试默认192
+            user_id = arg.get('userId')
+            campaign_ids = arg.get('campaignIds')
 
             data = media_rank(user_id, start, end, page, page_size, order, order_by,
-                              book, channel, is_singleimg, is_video, labels, collect, data_type)
+                              book, channel, is_singleimg, is_video, data_type, campaign_ids)
             self.write_json_tmp_java(data=data)
 
 
@@ -246,8 +244,6 @@ class AdvertisementContent(BaseHandler):
             arg = self.get_args()
             data_type = arg.get('dataType', 'all')  # 数据是否是个人,个人是private,共有是all
             channel = arg.get('channel')  # 渠道-----朋友圈信息流,抖音,广点通等等,,,,,,选项朋友圈信息流,公众平台流量,先#TODO:先暂时放置
-            labels = arg.get('labels')  # 标签
-            collect = arg.get('collect')  # 是否用标签的数据
             page = arg.get('pageNum', 1)
             page_size = arg.get('pageSize', 20)
             order = 'desc' if arg.get('upOrder') else 'asc'  #
@@ -257,11 +253,12 @@ class AdvertisementContent(BaseHandler):
             book = arg.get('novels')
             is_video = arg.get('type')
             is_singleimg = arg.get('singleImg', True)  # 是否是组图-----默认是没有
-            user_id = arg.get('userId', '192')  # TODO:测试默认192
+            user_id = arg.get('userId')
+            campaign_ids = arg.get('campaignIds')
 
-            data = content_rank(user_id, start, end, page, page_size, order, order_by,
-                                book, channel, is_singleimg, is_video, labels, collect, data_type)
-            self.write_json_tmp_java(data=data)
+        data = content_rank(user_id, start, end, page, page_size, order, order_by,
+                            book, channel, is_singleimg, is_video, data_type, campaign_ids)
+        self.write_json_tmp_java(data=data)
 
 
 class LabelList(BaseHandler):