Merge branch 'dev'

handlers/PitcherPanelHandler.py

@@ -136,13 +136,19 @@ class ChannelOrderTrend(BaseHandler):
             channel = arg.get("channel")
             start = arg.get("start",self.get_n_days(-30)) if channel else arg.get("start",self.thisday)
             end = arg.get("end")
-            page = arg.get("page", 1)
-            page_size = arg.get("page_size", 10)
+            page = arg.get("page")
+            page_size = arg.get("page_size")
             order_by = arg.get("order_by", 'date')
             order = arg.get("order", 'desc')
+            data, total, total_data = get_channel_order_trend(user_id, channel, pitcher, start, end, page, page_size,
+                                                              order_by, order)
+            if arg.get("download"):
+                self.write_download("channelTrend_"+str(int(time.time())), data)
+            else:
+                self.write_json(data=data, total=total, total_data=total_data)
+
+
 
-            data,total,total_data=get_channel_order_trend(user_id,channel,pitcher,start,end,page,page_size,order_by,order)
-            self.write_json(data=data,total=total,total_data=total_data)
 
 class ChannelSummary(BaseHandler):
     def post(self):

handlers/PublicAnalysisHandler.py

@@ -72,7 +72,7 @@ class BookOverview(BaseHandler):
                 start = self.get_n_days(-int(date_range)+1)
             data, total = book_overview(start, end, book, type, page, page_size, order_by, order)
             if arg.get("download"):
-                self.write_download('BookOver_'+str(int(time.time())), data)
+                self.write_download(str(int(time.time())), data)
             self.write_json(data=data, total=total)
 
 
@@ -95,7 +95,7 @@ class PitcherOverview(BaseHandler):
 
                 data, total = pitcher_overview(user_id,start, end, pitcher, page, page_size, order_by, order)
                 if arg.get("download"):
-                    self.write_download('BookOver_'+str(int(time.time())), data)
+                    self.write_download(str(int(time.time())), data)
                 self.write_json(data=data, total=total)
             else:
                 self.write_fail(msg='user_id not found')