diff --git a/daily_report/dreport.py b/daily_report/dreport.py index 0f604cf..8c5cd5f 100644 --- a/daily_report/dreport.py +++ b/daily_report/dreport.py @@ -184,21 +184,13 @@ class Report: and "jump_result"=1 """ try: activa = args['tga'].get_data(activa_sql)[0][0] - log.info(f"sql={activa_sql},values={activa}") new = args['tga'].get_data(new_sql)[0][0] - log.info(f"sql={new_sql},values={new}") share = args['tga'].get_data(share_sql)[0][0] - log.info(f"sql={share_sql},values={share}") timeonlie = args['tga'].get_data(timeonlie_sql)[0][0] or 0 - log.info(f"sql={timeonlie_sql},values={timeonlie}") ad_101 = args['tga'].get_data(ad_101_sql)[0][0] - log.info(f"sql={ad_101_sql},values={ad_101}") ad_1 = args['tga'].get_data(ad_1_sql)[0][0] - log.info(f"sql={ad_1_sql},values={ad_1}") ad_201 = args['tga'].get_data(ad_201_sql)[0][0] - log.info(f"sql={ad_201_sql},values={ad_201}") jumpout = args['tga'].get_data(jumpout_sql)[0][0] - log.info(f"sql={jumpout_sql},values={jumpout}") jump_per = round((100 * jumpout) / activa, 2) return [activa, new, share, timeonlie, ad_1, ad_101, ad_201, jump_per] except Exception: @@ -346,14 +338,13 @@ class Report: mp = MpInterface() fromappids = mp.get_fromappid_cn(args['gameid'], args['channelid']) f_keys = fromappids.keys() - if not f_keys: - continue - for f_key in f_keys: - args['fromappid'] = f_key - args['fromappid_cn'] = fromappids.get(f_key, None) or "未知" - temp['input'].append(self.get_input_fromappid(**args)) - temp['output'].append(self.get_output_fromappid(**args)) - print(temp) + if f_keys: + for f_key in f_keys: + args['fromappid'] = f_key + args['fromappid_cn'] = fromappids.get(f_key, None) or "未知" + temp['input'].append(self.get_input_fromappid(**args)) + temp['output'].append(self.get_output_fromappid(**args)) + print(temp) data.append(temp) return data