MOD:修改数据格式

handlers/PitcherPanelHandler.py

@@ -5,6 +5,7 @@ import time
 import pandas as pd
 import json
 from data_manage.operate import get_user_name_by_id
+
 log = logger()
 
 
@@ -22,14 +23,14 @@ class PitcherPanelChannel(BaseHandler):
             end = args.get("end", self.get_n_days(0))
             page = args.get("page")
             page_size = args.get("page_size")
-            order_by=args.get("order_by",'cost')
-            order=args.get("order", 'desc')
-            data_range=args.get('date_range')
+            order_by = args.get("order_by", 'cost')
+            order = args.get("order", 'desc')
+            data_range = args.get('date_range')
             if data_range:
                 end = self.get_n_days(0)
-                start = self.get_n_days(-int(args['date_range'])+1)
-            data,total=get_pitcher_panel_channel(pitcher, channel, start, end, page, page_size, order_by, order)
-            self.write_json(data=data,total=total)
+                start = self.get_n_days(-int(args['date_range']) + 1)
+            data, total = get_pitcher_panel_channel(pitcher, channel, start, end, page, page_size, order_by, order)
+            self.write_json(data=data, total=total)
 
 
 class PitcherPanelDaily(BaseHandler):
@@ -37,19 +38,19 @@ class PitcherPanelDaily(BaseHandler):
         if not self._au:
             self.write_fail(msg='auth error')
         else:
-            args=self.get_args()
+            args = self.get_args()
             print(args)
             user_id = args.get('user_id')
-            pitcher = args.get("pitcher",get_user_name_by_id(user_id))
-            start = args.get("start",self.get_n_days(-7))
+            pitcher = args.get("pitcher", get_user_name_by_id(user_id))
+            start = args.get("start", self.get_n_days(-7))
             end = args.get("end")
             page = args.get("page")
             page_size = args.get("page_size")
             order_by = args.get("order_by", 'date')
             order = args.get("order", 'desc')
 
-            data,total,total_data = get_pitcher_panel_daily(pitcher, start, end, page, page_size, order_by, order)
-            self.write_json(data=data,total=total,total_data=total_data)
+            data, total, total_data = get_pitcher_panel_daily(pitcher, start, end, page, page_size, order_by, order)
+            self.write_json(data=data, total=total, total_data=total_data)
 
 
 class PitcherPanelOverview(BaseHandler):
@@ -57,9 +58,9 @@ class PitcherPanelOverview(BaseHandler):
         if not self._au:
             self.write_fail(msg='auth error')
         else:
-            args=self.get_args()
+            args = self.get_args()
             user_id = args.get("user_id")
-            pitcher = args.get("pitcher",get_user_name_by_id(user_id))
+            pitcher = args.get("pitcher", get_user_name_by_id(user_id))
             data = get_pitcher_panel_overview(pitcher)
             self.write_json(data)
 
@@ -70,27 +71,26 @@ class ChannelOverview(BaseHandler):
         if not self._au:
             self.write_fail(msg='auth error')
         else:
-            args=self.get_args()
-            print(args)
-            user_id =args.get('user_id')
-            channel=args.get("channel")
-            pitcher=args.get("pitcher")
-            start=args.get("start",self.thisday)
-            end=args.get("end")
-            stage=args.get("stage")
+            args = self.get_args()
+            user_id = args.get('user_id')
+            channel = args.get("channel")
+            pitcher = args.get("pitcher")
+            start = args.get("start", self.thisday)
+            end = args.get("end")
+            stage = args.get("stage")
             page = args.get("page")
             book = args.get('book')
             page_size = args.get("page_size")
             order_by = args.get("order_by", 'date')
             order = args.get("order", 'desc')
-            data,total,total_data = get_channel_overview(user_id,channel,pitcher,stage,book,start,end,page,page_size,order_by,order)
+            data, total, total_data = get_channel_overview(user_id, channel, pitcher, stage, book, start, end, page,
+                                                           page_size, order_by, order)
             if args.get("download"):
                 self.write_download(str(int(time.time())), data)
             else:
                 self.write_json(data=data, total=total, total_data=total_data)
 
 
-
 class ChannelAgainOrderTrend(BaseHandler):
     def post(self):
         if not self._au:
@@ -101,7 +101,7 @@ class ChannelAgainOrderTrend(BaseHandler):
             channel = args.get("channel")
             date = args.get("date", self.get_n_days(-8))
             if channel:
-                data=get_channel_again_order_trend(channel,date)
+                data = get_channel_again_order_trend(channel, date)
                 self.write_json(data)
             else:
                 self.write_json([])
@@ -115,17 +115,17 @@ class ChannelActive(BaseHandler):
             args = self.get_args()
             print(args)
             user_id = args.get('user_id')
-            pitcher=args.get("pitcher")
+            pitcher = args.get("pitcher")
             channel = args.get("channel")
-            start = args.get("start",self.thisday)
+            start = args.get("start", self.thisday)
             end = args.get("end")
             page = args.get("page", 1)
             page_size = args.get("page_size", 10)
             order_by = args.get("order_by", 'date')
             order = args.get("order", 'desc')
 
-            data,total=get_channel_active(user_id,channel,pitcher,start,end,page,page_size,order_by,order)
-            self.write_json(data=data,total=total)
+            data, total = get_channel_active(user_id, channel, pitcher, start, end, page, page_size, order_by, order)
+            self.write_json(data=data, total=total)
 
 
 class ChannelOrderTrend(BaseHandler):
@@ -135,10 +135,10 @@ class ChannelOrderTrend(BaseHandler):
         else:
             arg = self.get_args()
             print(arg)
-            user_id =arg.get('user_id')
-            pitcher=arg.get("pitcher")
+            user_id = arg.get('user_id')
+            pitcher = arg.get("pitcher")
             channel = arg.get("channel")
-            start = arg.get("start",self.get_n_days(-30)) if channel else arg.get("start",self.thisday)
+            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")
             page_size = arg.get("page_size")
@@ -147,13 +147,11 @@ class ChannelOrderTrend(BaseHandler):
             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)
+                self.write_download("channelTrend_" + str(int(time.time())), data)
             else:
                 self.write_json(data=data, total=total, total_data=total_data)
 
 
-
-
 class ChannelSummary(BaseHandler):
     def post(self):
 
@@ -173,9 +171,10 @@ class ChannelSummary(BaseHandler):
             state = arg.get("state")
             start = arg.get("start")
             end = arg.get("end")
-            data, total, total_data = get_channel_summary(user_id,channel, pitcher, page, page_size, order_by, order, state, location,start,end)
+            data, total, total_data = get_channel_summary(user_id, channel, pitcher, page, page_size, order_by, order,
+                                                          state, location, start, end)
             if arg.get("download"):
-                self.write_download("channel_"+str(int(time.time())), data)
+                self.write_download("channel_" + str(int(time.time())), data)
             else:
                 self.write_json(data=data, total=total, total_data=total_data)
 
@@ -199,9 +198,10 @@ class ChannelPitcherSummary(BaseHandler):
             state = arg.get("state")
             start = arg.get("start")
             end = arg.get("end")
-            data, total, total_data = get_pitcher_channel_summary(user_id,channel, pitcher, page, page_size, order_by, order, state, location,start,end)
+            data, total, total_data = get_pitcher_channel_summary(user_id, channel, pitcher, page, page_size, order_by,
+                                                                  order, state, location, start, end)
             if arg.get("download"):
-                self.write_download("channel_"+str(int(time.time())), data)
+                self.write_download("channel_" + str(int(time.time())), data)
             else:
                 self.write_json(data=data, total=total, total_data=total_data)
 
@@ -215,20 +215,15 @@ class PitcherTrend(BaseHandler):
             print(arg)
             user_id = arg.get('user_id')
             if user_id:
-                pitcher=arg.get('pitcher',get_user_name_by_id(user_id))
-                start=arg.get("start",self.thisday)
-                end=arg.get("end")
+                pitcher = arg.get('pitcher', get_user_name_by_id(user_id))
+                start = arg.get("start", self.thisday)
+                end = arg.get("end")
                 page = arg.get("page")
                 page_size = arg.get("page_size")
                 order_by = arg.get("order_by", 'dt')
                 order = arg.get("order", 'desc')
 
-                data,total,total_data=get_pitcher_trend(pitcher,start,end,page,page_size,order_by,order)
-                self.write_json(data=data,total=total,total_data=total_data)
+                data, total, total_data = get_pitcher_trend(pitcher, start, end, page, page_size, order_by, order)
+                self.write_json(data=data, total=total, total_data=total_data)
             else:
                 self.write_fail(msg='user_id not found')
-
-
-
-
-

urls.py

@@ -1,4 +1,4 @@
-from handlers.PitcherPanelHandler import*
+from handlers.PitcherPanelHandler import *
 from handlers.ApiHandler import YgApiHandler
 from handlers.GitHookHandler import *
 from handlers.PublicAnalysisHandler import *
@@ -6,9 +6,8 @@ from handlers.TaskHandler import *
 from handlers import OperateHandler
 from handlers import AnalysisHandler
 
-
 urls = [
-    (r'/data/version',GetVersion),  # 获取版本号
+    (r'/data/version', GetVersion),  # 获取版本号
     (r'/data/pitcher_panel/daily', PitcherPanelDaily),  # 投手日期汇总
     (r'/data/pitcher_panel/overview', PitcherPanelOverview),  # 投手今天概况
     (r'/data/channel_stat/overview', ChannelOverview),  # 公众号广告投放数据
@@ -27,18 +26,12 @@ urls = [
 
     (r'/data/image/rank', ImageRank),  # 图片消耗排行
 
-
     # 整体分析
     (r'/data/boss_panel/summary', BossPanelSummary),  # 整体概况图
 
-
-
-
     # 主动刷新任务
     (r'/task/src_book_info', SrcBookInfo),  # 刷新书籍卡点
 
-
-
     # 外部接口
     (r'/api/get_yangguang_data', YgApiHandler),  # 阳光订单回调接口
 
@@ -47,7 +40,7 @@ urls = [
     (r'/api/git_hook/qc_web', QcWebHook),
 
     # 广告排行榜
-    (r'/data/advertisement/ad_rank',AdvertisementRank),  # 素材消耗排行
+    (r'/data/advertisement/ad_rank', AdvertisementRank),  # 素材消耗排行
 
     # CRUD
     (r'/operate/channel_group.*', OperateHandler.ChannelGroupHandler),  # 公众号分组设置
@@ -55,6 +48,4 @@ urls = [
     # 自助分析
     (r'/data/analysis.*', AnalysisHandler.ChannelAnalysisHandler),
 
-
-
-]
+]