Merge branch 'master' of git.wanmeizhensuo.com:ML/ffm-baseline

change test file

eda/feededa/src/main/scala/com/gmei/data_feed_exposure_precise.scala

@@ -648,9 +648,9 @@ object tag_value {
       val partition_date = stat_date.replace("-","")
 
 
-      val t1=0.25
-      val t2=0.5
-      val t3=1.0
+      val t1=2.5
+      val t2=5.0
+      val t3=10.0
 
       //level_id到权重映射
       val level1_id=sc.sql(
@@ -659,7 +659,7 @@ object tag_value {
            |from online.bl_tag_hierarchy_detail
            |where partition_date = '${partition_date}'
            |and id !=0
-           |and tag_type=1
+           |and tag_type='1'
        """.stripMargin
       )
       level1_id.createOrReplaceTempView("level1_id")
@@ -670,7 +670,7 @@ object tag_value {
            |from online.bl_tag_hierarchy_detail
            |where partition_date = '${partition_date}'
            |and id !=0
-           |and tag_type=2
+           |and tag_type='2'
        """.stripMargin
       )
       level2_id.createOrReplaceTempView("level2_id")
@@ -681,7 +681,7 @@ object tag_value {
            |from online.bl_tag_hierarchy_detail
            |where partition_date = '${partition_date}'
            |and id !=0
-           |and tag_type=3
+           |and tag_type='3'
        """.stripMargin
       )
       level3_id.createOrReplaceTempView("level3_id")