add fangan_day report codes

pm/fangan_day/etl/create_fangan_day.sql

@@ -19,15 +19,17 @@ CREATE TABLE IF NOT EXISTS pm.tl_pm_fangan_d
  day_id string comment '{"chs_name":"日期","description":"","etl":"","value":"","remark":""}',
  grey_type string comment '{"chs_name":"灰度类型","description":"","etl":"","value":"","remark":""}',
  DAU_730 BIGINT comment '{"chs_name":"7.30及以上版本DAU","description":"","etl":"","value":"","remark":""}',
- new_DAU BIGINT comment '{"chs_name":"新用户DAU","description":"","etl":"","value":"","remark":""}',
- old_DAU BIGINT comment '{"chs_name":"老用户DAU","description":"","etl":"","value":"","remark":""}',
+ new_DAU BIGINT comment '{"chs_name":"新增DAU","description":"","etl":"","value":"","remark":""}',
+ old_DAU BIGINT comment '{"chs_name":"老活DAU","description":"","etl":"","value":"","remark":""}',
  quanzhong_DAU BIGINT comment '{"chs_name":"权重日活","description":"","etl":"","value":"","remark":""}',
  liucun DOUBLE comment '{"chs_name":"次日留存率(%)","description":"","etl":"","value":"","remark":""}',
  wel_pv BIGINT comment '{"chs_name":"商详PV","description":"","etl":"","value":"","remark":""}',
  wel_uv BIGINT comment '{"chs_name":"商详UV","description":"","etl":"","value":"","remark":""}',
  pay_num BIGINT comment '{"chs_name":"支付订单数","description":"","etl":"","value":"","remark":""}',
  valid_dev_num BIGINT comment '{"chs_name":"有效线索设备数","description":"","etl":"","value":"","remark":""}',
- valid_pv BIGINT comment '{"chs_name":"有效线索人次","description":"","etl":"","value":"","remark":""}'
+ valid_pv BIGINT comment '{"chs_name":"有效线索人次","description":"","etl":"","value":"","remark":""}',
+ true_valid_dev_num BIGINT comment '{"chs_name":"真实用户有效线索设备数","description":"","etl":"","value":"","remark":""}',
+ true_valid_pv BIGINT comment '{"chs_name":"真实用户有效线索人次","description":"","etl":"","value":"","remark":""}'
 )comment '方案灰度数据'
 PARTITIONED BY (PARTITION_DAY STRING comment '分区日期')
 ROW FORMAT DELIMITED

pm/fangan_day/job/step1_12.job

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

pm/fangan_day/job/step1_13.job

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

pm/fangan_day/job/step1_14.job

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

pm/fangan_day/job/step1_15.job

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

pm/fangan_day/job/step1_16.job

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

pm/fangan_day/job/step2.job

 #step2.job
 type=command
-dependencies=step1_1,step1_2,step1_3,step1_4,step1_5,step1_6,step1_7,step1_8,step1_9,step1_10,step1_11
+dependencies=step1_1,step1_2,step1_3,step1_4,step1_5,step1_6,step1_7,step1_8,step1_9,step1_10,step1_11,step1_12,step1_13,step1_14,step1_15,step1_16
 command=sh /home/bi/bi-report/lib/shell/hive fangan_day
\ No newline at end of file

pm/fangan_day/report/fangan_day.sql

@@ -4,8 +4,8 @@ SELECT
 		day_id AS `日期`
 		,grey_type AS `灰度类型`
 		,DAU_730 AS `7.30及以上版本DAU`
-		,new_DAU AS `新用户DAU`
-		,old_DAU AS `老用户DAU`
+		,new_DAU AS `新增DAU`
+		,old_DAU AS `老活DAU`
 		,quanzhong_DAU AS `权重日活`
 		,liucun AS `次日留存率(%)`
 		,wel_pv AS `商详PV`
@@ -13,5 +13,7 @@ SELECT
 		,pay_num AS `支付订单数`
 		,valid_dev_num AS `有效线索设备数`
 		,valid_pv AS `有效线索人次`
+		,true_valid_dev_num AS `真实用户有效线索设备数`
+		,true_valid_pv AS `真实用户有效线索人次`
 FROM pm.tl_pm_fangan_d
 where partition_day=regexp_replace(DATE_SUB(current_date,1) ,'-','')