Merge branch 'weiyimin' into 'master'

Weiyimin

See merge request !25

pm/daily_recommend_strategy/en-cn.properties

-daily_recommend_strategy=首页推荐策略日报
+daily_recommend_strategy=首页推荐策略及内容页ctr日报
\ No newline at end of file
+home_recommend_strategy=首页推荐策略日报
+content_ctr=内容详情页灰度ctr
\ No newline at end of file

pm/daily_recommend_strategy/etl/create_content_grey.sql

+--***************************************************************
+--*脚本名称:
+--*功能: 首页推荐策略日报
+--*业务名称: pm
+--*输入数据:
+--*作者: weiyimin@igengmei.com
+--*更新时间:
+--***************************************************************
+
+--设置全局变量&UDF
+SET mapreduce.job.queuename=data;
+
+--使用bl数据库
+USE pm;
+
+--创建BL层内部表
+CREATE TABLE IF NOT EXISTS pm.tl_pm_contentpage_ctr
+(
+ 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":""}',
+ grey_type string comment '{"chs_name":"灰度类型","description":"","etl":"","value":"","remark":""}',
+ page_name string comment '{"chs_name":"页面名称","description":"","etl":"","value":"","remark":""}',
+ content_pv bigint comment '{"chs_name":"内容详情页pv","description":"","etl":"","value":"","remark":""}',
+ content_uv bigint comment '{"chs_name":"内容详情页uv","description":"","etl":"","value":"","remark":""}',
+ wel_exp_pv bigint comment '{"chs_name":"你可能喜欢美购卡片曝光pv","description":"","etl":"","value":"","remark":""}',
+ content_exp_pv bigint comment '{"chs_name":"你可能喜欢内容卡片曝光pv","description":"","etl":"","value":"","remark":""}',
+ wel_click_pv bigint comment '{"chs_name":"你可能喜欢美购卡片点击pv","description":"","etl":"","value":"","remark":""}',
+ content_click_pv bigint comment '{"chs_name":"你可能喜欢内容卡片点击pv","description":"","etl":"","value":"","remark":""}',
+ slide_wel_click_pv bigint comment '{"chs_name":"横划卡片点击pv","description":"","etl":"","value":"","remark":""}',
+ self_wel_click_pv bigint comment '{"chs_name":"关联卡片点击pv","description":"","etl":"","value":"","remark":""}'
+)comment '内容详情页卡片ctr'
+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_recommend_strategy/report/content_ctr.sql

+SELECT
+    day_id as `日期`,
+    device_os_type as `设备类型`,
+    active_type as `活跃类型`,
+    grey_type as `灰度`,
+    page_name as `页面`,
+    NVL(CONCAT(ROUND(wel_click_pv/wel_exp_pv*100,2),'%'),0) as `内容页你可能喜欢美购卡片点击PV/该类卡片曝光PV`,
+    NVL(CONCAT(ROUND(content_click_pv/content_exp_pv*100,2),'%'),0) as `内容页你可能喜欢内容卡片点击PV/该类卡片曝光PV`,
+    content_pv as `内容详情页pv`,
+    content_uv as `内容详情页uv`,
+    wel_exp_pv as `你可能喜欢美购卡片曝光pv`,
+    content_exp_pv as `你可能喜欢内容卡片曝光pv`,
+    wel_click_pv as `你可能喜欢美购卡片点击pv`,
+    content_click_pv as `你可能喜欢内容卡片点击pv`,
+    slide_wel_click_pv as `横划卡片点击pv`,
+    self_wel_click_pv as `关联卡片点击pv`
+FROM pm.tl_pm_contentpage_ctr
+WHERE partition_day>='20200730' and partition_day<=regexp_replace(DATE_SUB(current_date,1) ,'-','')
+order by 1 desc,2,3,4,5
\ No newline at end of file

pm/daily_recommend_strategy/report/daily_recommend_strategy.sql → pm/daily_recommend_strategy/report/home_recommend_strategy.sql

@@ -4,12 +4,12 @@ SELECT
     active_type as `活跃类型`,
     card_content_type as `卡片类型`,
     recommend_type as `推荐类型`,
-    NVL(CONCAT(ROUND((navbar_search+highlight_word+self_welfare_card+recommend_welfare_card+recommend_content_card*0.2)/card_exposure*100,2),'%'),0) as `来自首页推荐内容卡片的的有效二跳pv/首页卡片精准曝光PV`,
+    NVL(CONCAT(ROUND((navbar_search+highlight_word+self_welfare_card+recommend_welfare_card+recommend_content_card*0.2+transfer_card+video_consultation)/card_exposure*100,2),'%'),0) as `来自首页推荐内容卡片的的有效二跳pv/首页卡片精准曝光PV`,
     NVL(CONCAT(ROUND(card_click/card_exposure*100,2),'%'),0) as `首页卡片点击PV/首页卡片精准曝光PV`,
-    NVL(CONCAT(ROUND((navbar_search+highlight_word+self_welfare_card+recommend_welfare_card+recommend_content_card*0.2)/card_click*100,2),'%'),0) as `来自首页推荐内容卡片的的有效二跳pv/首页卡片点击PV`,
+    NVL(CONCAT(ROUND((navbar_search+highlight_word+self_welfare_card+recommend_welfare_card+recommend_content_card*0.2+transfer_card+video_consultation)/card_click*100,2),'%'),0) as `来自首页推荐内容卡片的的有效二跳pv/首页卡片点击PV`,
     card_click as `首页卡片点击PV`,
     card_exposure as `首页卡片精准曝光PV`,
-    (navbar_search+highlight_word+self_welfare_card+recommend_welfare_card+recommend_content_card*0.2)as `有效二跳pv`,
+    (navbar_search+highlight_word+self_welfare_card+recommend_welfare_card+recommend_content_card*0.2+transfer_card+video_consultation)as `有效二跳pv`,
     avg_page_stay as `来自I的单PV平均浏览时长`,
     navbar_search as `来自I的搜索框+搜索按钮点击PV`,
     highlight_word as `来自I的文内搜索点击PV`,
@@ -17,8 +17,7 @@ SELECT
     recommend_welfare_card as `来自I的推荐商品+查看全部商品点击pv`,
     recommend_content_card as `来自I的推荐内容点击pv`,
     '未配置' as `来自I的推荐专题点击pv`,
-    '未上线' as `来自I的转诊点击pv`,
-    '未上线' as `来自I的视频面诊点击pv`
-FROM pm.tl_pm_recommend_strategy_d
+    transfer_card as `来自I的转诊点击pv`,
+    video_consultation as `来自I的视频面诊点击pv`FROM pm.tl_pm_recommend_strategy_d
 WHERE partition_day>='20200627' and partition_day<=regexp_replace(DATE_SUB(current_date,1) ,'-','')
 order by `日期` desc ,`设备类型`,`活跃类型`,`卡片类型`,`推荐类型`;
\ No newline at end of file

pm/meigou_detail_page/job/step2.job

 #step2.job
 type=command
 dependencies=step1_1,step1_2,step1_3
-command=curl -X GET http://localhost:8553/api/report/email/meigou_detail_page/liudi@igengmei.com,wangxin@igengmei.com,zhaofei@igengmei.com/weiyimin@igengmei.com,yindanlei@igengmei.com,wangyan@igengmei.com
+command=curl -X GET http://localhost:8553/api/report/email/meigou_detail_page/liudi@igengmei.com,wangxin@igengmei.com,dailiang@igengmei.com,zhanghaoyu@igengmei.com,cp-sunyinghe@igengmei.com,zhaofei@igengmei.com/weiyimin@igengmei.com,yindanlei@igengmei.com,wangyan@igengmei.com
\ No newline at end of file