From 759caa5440603bc803a15dfda17879e9379e5a09 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E4=BC=9F?= <250213850@qq.com>
Date: Tue, 22 Feb 2022 17:24:38 +0800
Subject: [PATCH] =?UTF-8?q?1.=E6=96=B0=E6=89=8B=E5=BC=95=E5=AF=BC-?=
 =?UTF-8?q?=E6=96=B0=E6=89=8B=E5=BC=95=E5=AF=BC=E6=BB=9E=E7=95=99=EF=BC=8C?=
 =?UTF-8?q?=E6=8A=8A=E4=B9=8B=E5=89=8D=E6=80=BB=E4=BA=BA=E6=95=B0=EF=BC=88?=
 =?UTF-8?q?=E6=AF=8F=E6=97=A5=E6=B4=BB=E8=B7=83=E4=BA=BA=E6=95=B0=EF=BC=89?=
 =?UTF-8?q?=E6=8D=A2=E6=88=90=E6=80=BB=E4=BA=BA=E6=95=B0=EF=BC=88=E6=AF=8F?=
 =?UTF-8?q?=E6=97=A5=E6=96=B0=E5=A2=9E=E4=BA=BA=E6=95=B0=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/api_v1/endpoints/query.py | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/api/api_v1/endpoints/query.py b/api/api_v1/endpoints/query.py
index c44769a..56fcb08 100644
--- a/api/api_v1/endpoints/query.py
+++ b/api/api_v1/endpoints/query.py
@@ -20,6 +20,7 @@ from db.redisdb import get_redis_pool, RedisDrive
 
 from models.behavior_analysis import BehaviorAnalysis, CombinationEvent
 from models.user_analysis import UserAnalysis
+from models.x_analysis import XAnalysis
 from utils import DfToStream
 
 router = APIRouter()
@@ -961,6 +962,9 @@ async def scatter_model(
     await analysis.init(data_where=current_user.data_where)
     event_type = analysis.events[0]['eventName']
     res = await analysis.scatter_model_sql()
+    end_date=analysis.end_date
+    start_date=analysis.start_date
+    where=analysis.events[-1]['quotaname']
     sql = res['sql']
 
     #查询买量渠道owner为kuaiyou3的日注册玩家等级分布
@@ -1090,6 +1094,14 @@ async def scatter_model(
                                            'p': list_p}}
                 #resp['list'][dt] = {'总体': {'n': [labels_dict.get(i, 0) for i in labels], 'total': total,
                 #                          'p': [round(labels_dict.get(i, 0) * 100 / total, 2) for i in labels]}}
+    if where =="step_id" and event_type == "guide":
+        sql=f"""SELECT toDate(addHours({game}.event."#event_time", 8)) AS date, count(DISTINCT {game}.event."#account_id") AS values FROM {game}.event WHERE addHours({game}.event."#event_time", 8) >= '{start_date}' AND addHours({game}.event."#event_time", 8) <= '{end_date}' AND {game}.event."#event_name" = 'create_account' GROUP BY toDate(addHours({game}.event."#event_time", 8)) ORDER BY date"""
+        df = await ckdb.query_dataframe(sql)
+        for i in range(len(df)):
+            resp['list'][str(df['date'][i])]['总体']['total']=int(df['values'][i])
+
+
+
         return schemas.Msg(code=0, msg='ok', data=resp)
 
         # bins_s = pd.cut(tmp_df['values'], bins=bins,
@@ -1241,4 +1253,6 @@ async def user_property_model(
     return schemas.Msg(code=0, msg='ok', data={
         'value': data,
         'title': title
-    })
\ No newline at end of file
+    })
+
+