Merge branch 'yindanlei' into 'master'

add fangan_day report codes

See merge request !46

pm/fangan_day/etl/fangan_day.sql

@@ -9,7 +9,8 @@ SET role admin;
 
 
 ADD JAR hdfs:///user/hive/share/lib/udf/hive-udf-1.0-SNAPSHOT.jar;
-CREATE TEMPORARY FUNCTION convup AS 'com.gmei.hive.common.udf.UDFConvUpgrade';
+CREATE TEMPORARY FUNCTION convup AS 'com.gmei.hive.common.udf.UDFConvUpgrade';--进制转换函数，支持各种进制转换
+CREATE TEMPORARY FUNCTION setencryption AS 'com.gmei.hive.common.udf.UDFStringSetEncryption';--哈希函数,支持MD2、MD5、SHA-1、SHA-256、SHA-384、SHA-512
 
 INSERT OVERWRITE TABLE pm.tl_pm_fangan_d PARTITION (PARTITION_DAY = ${partition_day})
 
@@ -46,9 +47,9 @@ FROM
         SELECT concat_ws('-',substr(partition_date,1,4),substr(partition_date,5,2),substr(partition_date,7,2)) as partition_date,device_id,device_os_type
             ,case WHEN active_type = '4'  THEN '老活'
               WHEN active_type  in ('1','2')  then '新增' END as device_type
-            ,CASE WHEN (partition_date >= '20200725' AND partition_date <= '20200727' AND substr(convup(sha1(device_id),16,10),-1) in ('0','1'))
-                         or (partition_date = '20200724' AND substr(convup(sha1(device_id),16,10),-1) in ('0','1','2','3','4'))
-                         or (partition_date >= '20200728' AND substr(convup(sha1(device_id),16,10),-1) in ('0','1','2','3','4')) THEN '测试组A（方案库）'
+            ,CASE WHEN (partition_date >= '20200725' AND partition_date <= '20200727' AND substr(convup(setencryption(device_id,'sha-1'),16,10),-1) in ('0','1'))
+                         or (partition_date = '20200724' AND substr(convup(setencryption(device_id,'sha-1'),16,10),-1) in ('0','1','2','3','4'))
+                         or (partition_date >= '20200728' AND substr(convup(setencryption(device_id,'sha-1'),16,10),-1) in ('0','1','2','3','4')) THEN '测试组A（方案库）'
                 else '测试组B（无方案库）' END as grey_type
             ,CASE WHEN is_ai_channel = 'true' THEN 'AI'  ELSE '医美' END as channel_type
         FROM online.ml_device_day_active_status