1

handlers/HandlerBase.py

@@ -6,8 +6,9 @@ from tornado.web import RequestHandler
 from model.log import logger
 from model.common import errors
 log = logger()
+from model.DateUtils import DateUtils
 
-class BaseHandler(RequestHandler):
+class BaseHandler(RequestHandler,DateUtils):
     def __init__(self, application, request, **kwargs):
         RequestHandler.__init__(self, application, request, **kwargs)
         self._status_code = 200

handlers/PitcherPanelHandler.py

@@ -3,7 +3,6 @@ from model.log import logger
 from data_manage.pitcher_panel import *
 log = logger()
 
-
 class PitcherPanelChannel(BaseHandler):
 
     def post(self):
@@ -11,15 +10,15 @@ class PitcherPanelChannel(BaseHandler):
         print(args)
         pitcher = args.get("pitcher", '')
         channel = args.get("channel", '')
-        start = args.get("start", du.get_n_days(-1))
-        end = args.get("end", du.get_n_days(0))
+        start = args.get("start", self.get_n_days(-1))
+        end = args.get("end", self.get_n_days(0))
         page = args.get("page",1)
         page_size = args.get("page_size",10)
         order_by=args.get("order_by",'date')
         order=args.get("order", 'desc')
         if 'date_range' in list(args.keys()):
-            end = du.get_n_days(0)
-            start = du.get_n_days(-int(args['date_range']))
+            end = self.get_n_days(0)
+            start = self.get_n_days(-int(args['date_range']))
         data,total=get_pitcher_panel_channel(pitcher, channel, start, end, page, page_size, order_by, order)
         self.write_json(data=data,total=total)
 
@@ -27,16 +26,17 @@ class PitcherPanelChannel(BaseHandler):
 class PitcherPanelDaily(BaseHandler):
     def post(self):
         args=self.get_args()
+        print(args)
         pitcher = args.get("pitcher", '')
-        start = args.get("start", du.get_n_days(-1))
-        end = args.get("end", du.get_n_days(0))
+        start = args.get("start", self.get_n_days(-1))
+        end = args.get("end", self.get_n_days(0))
         page = args.get("page", '1')
         page_size = args.get("page_size", 10)
         order_by = args.get("order_by", 'date')
         order = args.get("order", 'desc')
         if 'date_range' in list(args.keys()):
-            end = du.get_n_days(0)
-            start = du.get_n_days(-int(args['date_range']))
+            end = self.get_n_days(0)
+            start = self.get_n_days(-int(args['date_range']))
 
         data,total = get_pitcher_panel_daily(pitcher, start, end, page, page_size, order_by, order)
         self.write_json(data=data,total=total)
@@ -63,8 +63,8 @@ class ChannelOverview(BaseHandler):
         order_by = args.get("order_by", 'date')
         order = args.get("order", 'desc')
         if 'date_range' in list(args.keys()):
-            end = du.get_n_days(0)
-            start = du.get_n_days(-int(args['date_range']))
+            end = self.get_n_days(0)
+            start = self.get_n_days(-int(args['date_range']))
         data,total =get_channel_overview(channel,pitcher,start,end,page,page_size,order_by,order)
         self.write_json(data=data,total=total)
 
@@ -75,7 +75,7 @@ class ChannelAgainOrderTrend(BaseHandler):
         print(args)
         pitcher=args.get("pitcher",'')
         channel = args.get("channel", '')
-        date = args.get("date",du.get_n_days(-8))
+        date = args.get("date",self.get_n_days(-8))
         data=get_channel_again_order_trend(channel,date,pitcher)
         self.write_json(data)
 
@@ -87,15 +87,15 @@ class ChannelActive(BaseHandler):
         print(args)
         pitcher=args.get("pitcher",'')
         channel = args.get("channel", '')
-        start = args.get("start", du.get_n_days(-7))
-        end = args.get("end", du.get_n_days(0))
+        start = args.get("start", self.get_n_days(-7))
+        end = args.get("end", self.get_n_days(0))
         page = args.get("page", 1)
         page_size = args.get("page_size", 10)
         order_by = args.get("order_by", 'date')
         order = args.get("order", 'desc')
         if 'date_range' in list(args.keys()):
-            end = du.get_n_days(0)
-            start = du.get_n_days(-int(args['date_range']))
+            end = self.get_n_days(0)
+            start = self.get_n_days(-int(args['date_range']))
         data,total=get_channel_active(channel,pitcher,start,end,page,page_size,order_by,order)
         self.write_json(data=data,total=total)
 
@@ -106,15 +106,15 @@ class ChannelOrderTrend(BaseHandler):
         print(arg)
         pitcher=arg.get("pitcher",'')
         channel = arg.get("channel", '')
-        start = arg.get("start", du.get_n_days(-30))
-        end = arg.get("end", du.get_n_days(0))
+        start = arg.get("start", self.get_n_days(-30))
+        end = arg.get("end", self.get_n_days(0))
         page = arg.get("page", 1)
         page_size = arg.get("page_size", 10)
         order_by = arg.get("order_by", 'date')
         order = arg.get("order", 'desc')
         if 'date_range' in list(arg.keys()):
-            end = du.get_n_days(0)
-            start = du.get_n_days(-int(arg['date_range']))
+            end = self.get_n_days(0)
+            start = self.get_n_days(-int(arg['date_range']))
         data,total=get_channel_order_trend(channel,pitcher,start,end,page,page_size,order_by,order)
         self.write_json(data=data,total=total)