Merge branch 'weiyimin' into 'master'

push codes

See merge request !44

pm/clue_daily/job/step1_13.job

+#step1_13.job
+type=command
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive ml mid_ml_c_ct_dv_device_inc_d
\ No newline at end of file

pm/clue_daily/job/step1_4.job

 #step1_3.job
 type=command
-command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive online ml_user_updates
+command=sh /home/bi/bi-report/lib/shell/waitsuccess.sh hive ml ml_c_ct_ui_user_dimen_inc_d
\ No newline at end of file

pm/clue_daily/report/clue_daily.sql

-SELECT mas.partition_date `日期`
+SELECT day_id `日期`
 		,device_os_type `系统`
 		,active_type `新老`
 		,grey_type `是否灰度`
@@ -48,4 +48,5 @@ SELECT mas.partition_date `日期`
 		,valid_call_dev_qa as `有效电话线索设备数-需求自测`
 		,valid_call_num_qa as `有效电话线索人次-需求自测`
 FROM pm.tl_pm_userclue_d
-where partition_day=regexp_replace(date_sub(current_date,1),'-','')
+where partition_day in ('20200901','202001001','20201101','20201201','20210101',regexp_replace(date_sub(current_date,1),'-',''))
\ No newline at end of file
+order by `日期`,`系统`,`新老`,`是否灰度`

pm/search_related/etl/search_related.sql

@@ -33,7 +33,8 @@ FROM
 					       and page_name in ('diary_detail','topic_detail','post_detail','user_post_detail'
 					       	,'doctor_post_detail','question_detail','answer_detail','question_answer_detail')  then '内容详情页搜索框'
 					  when action ='详情页高亮词' then '详情页高亮词搜索'
-					  when action='大家都在看' then '首页feed大家都在看'
+					  when action='新首页-大家都在看' then '新首页-大家都在看'
+					  when action='旧首页-大家都在看' then '旧首页-大家都在看'
 					  when action='热搜词' then '美购首页热搜词' else null end as search_entrance
 				,count(cl_id) as search_pv
 				,count(distinct cl_id) as search_uv
@@ -64,7 +65,7 @@ FROM
 
 			union all
 
-			SELECT partition_date,cl_id,null as page_name,'大家都在看' as action, null as referrer_link
+			SELECT partition_date,cl_id,null as page_name,'新首页-大家都在看' as action, null as referrer_link
 			FROM online.bl_hdfs_maidian_updates
 			where partition_date = regexp_replace(DATE_SUB(current_date,1) ,'-','')
 			AND action = 'on_click_card'
@@ -73,6 +74,15 @@ FROM
 			AND params['card_type']='search_word'
 			--AND page_name='home' android的page_name为空
 
+            union all
+
+			SELECT partition_date,cl_id,page_name,'旧首页-大家都在看' as action, null as referrer_link
+			FROM online.bl_hdfs_maidian_updates
+			where partition_date>='20200801' and  partition_date <= regexp_replace(DATE_SUB(current_date,1) ,'-','')
+			AND action = 'do_search'
+			and params['input_type']='everyone_watch'
+			and params['tab']='精选'
+			and page_name='home'
 			union all
 
 			SELECT partition_date,cl_id,page_name,'热搜词' as action, null as referrer_link
@@ -104,7 +114,8 @@ FROM
 					       and page_name in ('diary_detail','topic_detail','post_detail','user_post_detail'
 					       	,'doctor_post_detail','question_detail','answer_detail','question_answer_detail')  then '内容详情页搜索框'
 					  when action ='详情页高亮词' then '详情页高亮词搜索'
-					  when action='大家都在看' then '首页feed大家都在看'
+					  when action='新首页-大家都在看' then '新首页-大家都在看'
+					  when action='旧首页-大家都在看' then '旧首页-大家都在看'
 					  when action='热搜词' then '美购首页热搜词' else null end
 		having search_entrance is not null
 	)t