Merge branch 'weiyimin' into 'master'

Weiyimin

See merge request !102

pm/daily_content/en-cn.properties

@@ -3,4 +3,5 @@ home_content_detail=首页内容数据-分日明细
 home_content_by_month=首页内容数据-月均
 ai_content_detail=ai内容数据-分日明细
 ai_content_by_month=ai内容数据-月均
-home_content_retention=分类用户次留
+home_content_retention=分类用户次留
\ No newline at end of file
+search_content_detail=搜索到内容的转化
\ No newline at end of file

pm/daily_content/etl/create_daily_search_content.sql

+--***************************************************************
+--*脚本名称:
+--*功能: 内容日报-简化版-for 思璟
+--*业务名称: pm
+--*输入数据:
+--*作者: weiyimin@igengmei.com
+--*更新时间:
+--***************************************************************
+
+--设置全局变量&UDF
+SET mapreduce.job.queuename=data;
+
+--使用bl数据库
+USE pm;
+
+--创建BL层内部表
+CREATE TABLE IF NOT EXISTS pm.tl_pm_search_content
+(
+ day_id string comment '{"chs_name":"当天日期","description":"","etl":"","value":"","remark":""}',
+ device_os_type string comment '{"chs_name":"设备类型","description":"","etl":"","value":"","remark":""}',
+ active_type string comment '{"chs_name":"活跃类型","description":"","etl":"","value":"","remark":""}',
+ channel string comment '{"chs_name":"渠道","description":"","etl":"","value":"","remark":""}',
+ dau BIGINT comment '{"chs_name":"日活","description":"","etl":"","value":"","remark":""}',
+ search_uv BIGINT comment '{"chs_name":"搜索uv","description":"","etl":"","value":"","remark":""}',
+ search_uv_in_dau string comment '{"chs_name":"搜索uv/dau","description":"","etl":"","value":"","remark":""}',
+ do_search_uv BIGINT comment '{"chs_name":"完成搜索uv","description":"","etl":"","value":"","remark":""}',
+ do_search_pv BIGINT comment '{"chs_name":"完成搜索pv","description":"","etl":"","value":"","remark":""}',
+ do_search_rate string comment '{"chs_name":"完成搜索的用户比例","description":"","etl":"","value":"","remark":""}',
+ search_times string comment '{"chs_name":"搜索用户人均使用次数","description":"","etl":"","value":"","remark":""}',
+ search_diary_to_content_uv BIGINT comment '{"chs_name":"来源于搜索日记tab的日记及帖子页uv","description":"","etl":"","value":"","remark":""}',
+ search_diary_to_content_pv BIGINT comment '{"chs_name":"来源于搜索日记tab的日记及帖子页pv","description":"","etl":"","value":"","remark":""}',
+ search_diary_to_content_uv_rate string comment '{"chs_name":"来源于搜索日记tab的日记及帖子页uv/搜索uv","description":"","etl":"","value":"","remark":""}',
+ search_qa_to_content_uv BIGINT comment '{"chs_name":"来源于搜索问答tab的问答页uv","description":"","etl":"","value":"","remark":""}',
+ search_qa_to_content_pv BIGINT comment '{"chs_name":"来源于搜索问答tab的问答页pv","description":"","etl":"","value":"","remark":""}',
+ search_qa_to_content_uv_rate string comment '{"chs_name":"来源于搜索问答tab的问答页uv/搜索uv","description":"","etl":"","value":"","remark":""}',
+ diary_tab_ctr string comment '{"chs_name":"日记tab ctr","description":"","etl":"","value":"","remark":""}',
+ diary_tab_pv_per_uv string comment '{"chs_name":"日记tab卡片点击pv/uv","description":"","etl":"","value":"","remark":""}',
+ qa_tab_ctr string comment '{"chs_name":"问答tab ctr","description":"","etl":"","value":"","remark":""}',
+ qa_tab_pv_per_uv string comment '{"chs_name":"问答tab卡片点击pv/uv","description":"","etl":"","value":"","remark":""}',
+ content_pv_in_search_uv string comment '{"chs_name":"来源于搜索日记和问答tab的内容页PV/搜索uv","description":"","etl":"","value":"","remark":""}',
+ diary_second_pv_in_search_uv string comment '{"chs_name":"来源于搜索日记tab的内容二跳PV/搜索uv","description":"","etl":"","value":"","remark":""}',
+ qa_second_pv_in_search_uv string comment '{"chs_name":"来源于搜索问答tab的内容二跳PV/搜索uv","description":"","etl":"","value":"","remark":""}',
+ content_pagestay_in_search_uv string comment '{"chs_name":"来源于搜索日记及问答tab的内容总时长/搜索uv(s)","description":"","etl":"","value":"","remark":""}',
+ avg_contents string comment '{"chs_name":"完成搜索用户人均阅读内容篇数","description":"","etl":"","value":"","remark":""}',
+ search_retention string comment '{"chs_name":"功能次留","description":"","etl":"","value":"","remark":""}'
+)comment '内容日报-搜索到内容的转化'
+PARTITIONED BY (PARTITION_DAY STRING comment '分区日期')
+ROW FORMAT DELIMITED
+FIELDS TERMINATED BY '\t'
+COLLECTION ITEMS TERMINATED BY '\002'
+MAP KEYS TERMINATED BY '\003'
+LINES TERMINATED BY '\n'
+STORED AS TEXTFILE;
\ No newline at end of file

pm/daily_content/job/step3.job

 #step3.job
 type=command
 dependencies=step2
-command=curl -X GET http://localhost:8553/api/report/email/daily_content/weiyimin@igengmei.com/hanyingyue@igengmei.com,jiaqingqing@igengmei.com
+command=curl -X GET http://localhost:8553/api/report/email/daily_content/liudi@igengmei.com,shenzheng@igengmei.com,wangxin@igengmei.com,zhaoyang@igengmei.com/weiyimin@igengmei.com,hanyingyue@igengmei.com,jiaqingqing@igengmei.com
\ No newline at end of file

pm/daily_content/report/home_content_retention.sql

@@ -3,12 +3,12 @@ select substr(day_id,1,6) `日期`
         ,active_type `活跃`
         ,channel `渠道`
         ,round(avg(home_good_click_uv),0) as `首页good click设备数`
-        ,round(avg(if(home_good_click_quality=0,NULL,home_good_click_quality)),2) as `首页gc用户次留率/全站次留率`
+        ,concat(round(avg(if(home_good_click_quality=0,NULL,home_good_click_quality))*100,2),'%') as `首页gc用户次留率/全站次留率`
         ,round(avg(home_ungood_click_uv),0) as `点击首页卡片但非gc设备数`
-        ,round(avg(if(home_ungood_click_quality=0,NULL,home_ungood_click_quality)),2) as `点击首页卡片但非gc设备次留率/全站次留率`
+        ,concat(round(avg(if(home_ungood_click_quality=0,NULL,home_ungood_click_quality))*100,2),'%') as `点击首页卡片但非gc设备次留率/全站次留率`
         ,round(avg(no_click_uv),0) as `未点击首页feed卡片设备数`
-        ,round(avg(if(no_click_uv_quality=0,NULL,no_click_uv_quality)),2) as `未点击首页feed卡片设备次留率/全站次留率`
-        ,round(avg(if(home_good_click_retention_quality=0,NULL,home_good_click_retention_quality)),2) as `当天点击首页feed卡片，且次日依旧点击的次留率/全站次留率`
+        ,concat(round(avg(if(no_click_uv_quality=0,NULL,no_click_uv_quality))*100,2),'%') as `未点击首页feed卡片设备次留率/全站次留率`
+        ,concat(round(avg(if(home_good_click_retention_quality=0,NULL,home_good_click_retention_quality))*100,2),'%') as `当天点击首页feed卡片，且次日依旧点击的次留率/全站次留率`
 FROM pm.tl_pm_content_retention
 where partition_day>='20201018' and partition_day <= regexp_replace(DATE_SUB(current_date,1) ,'-','')
 group by substr(day_id,1,6),device_os_type,active_type,channel

pm/daily_content/report/search_content_detail.sql

+select day_id as `日期`
+    ,device_os_type as `平台`
+    ,active_type as `活跃`
+    ,channel as `渠道`
+    ,dau as `dau`
+    ,search_uv as `搜索uv`
+    ,search_uv_in_dau as `搜索uv/dau`
+    ,do_search_uv as `完成搜索uv`
+    ,do_search_pv as `完成搜索pv`
+    ,do_search_rate as `完成搜索的用户比例`
+    ,search_times as `搜索用户人均使用次数`
+    ,search_diary_to_content_uv`来源于搜索日记tab的日记及帖子页uv`
+    ,search_diary_to_content_pv `来源于搜索日记tab的日记及帖子页pv`
+    ,search_diary_to_content_uv_rate`来源于搜索日记tab的日记及帖子页uv/搜索uv`
+    ,search_qa_to_content_uv`来源于搜索问答tab的问答页uv`
+    ,search_qa_to_content_pv`来源于搜索问答tab的问答页pv`
+    ,search_qa_to_content_uv_rate`来源于搜索问答tab的问答页uv/搜索uv`
+    ,diary_tab_ctr`日记tab ctr`
+    ,diary_tab_pv_per_uv`日记tab卡片点击pv/uv`
+    ,qa_tab_ctr`问答tab ctr`
+    ,qa_tab_pv_per_uv`问答tab卡片点击pv/uv`
+    ,content_pv_in_search_uv as `来源于搜索日记和问答tab的内容页PV/搜索uv`
+    ,diary_second_pv_in_search_uv`来源于搜索日记tab的内容二跳PV/搜索uv`
+    ,qa_second_pv_in_search_uv`来源于搜索问答tab的内容二跳PV/搜索uv`
+    ,content_pagestay_in_search_uv as `来源于搜索日记及问答tab的内容总时长/搜索uv(s)`
+    ,avg_contents as `完成搜索用户人均阅读内容篇数`
+    ,search_retention as `功能次留`
+FROM pm.tl_pm_search_content
+where partition_day>='20201109' and partition_day <= regexp_replace(DATE_SUB(current_date,1) ,'-','')
+order by `日期`,`平台`,`活跃`,`渠道`
\ No newline at end of file

pm/wel_clue_by_channel/report/welfare_by_channel.sql

@@ -49,12 +49,12 @@ SELECT
       SELECT action_date,cl_id,count(1) as wel_pv
       FROM
       (
-        SELECT concat_ws('-',substr(partition_date,0,4),substr(partition_date,5,2),substr(partition_date,7,2)) AS action_date,cl_id
-    		FROM online.bl_hdfs_maidian_updates
-    		WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
+            SELECT concat_ws('-',substr(partition_date,0,4),substr(partition_date,5,2),substr(partition_date,7,2)) AS action_date,cl_id
+            FROM online.bl_hdfs_maidian_updates
+            WHERE partition_date >= REGEXP_REPLACE(trunc(date_sub(current_date(),8),'MM'),'-','')
             AND partition_date <=regexp_replace(date_sub(current_date(),1),'-','')
-    			AND page_name in ('welfare_detail','organization_detail','expert_detail')
-    			AND action = 'page_view'
+            AND page_name in ('welfare_detail','organization_detail','expert_detail')
+            AND action = 'page_view'
       )a
       LEFT JOIN
       ( -- 2.去掉疑似机构刷量的PV和UV