repair bug

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

@@ -102,7 +102,7 @@ object strategy_other {
          """.stripMargin
       )
 
-/*      //device_id尾号1点击日记本用户数
+      //device_id尾号1点击日记本用户数
       val clk_diary_device = sc.sql(
         s"""
            |select '${param.date}' as stat_date, count(distinct(device_id)) as clk_diary_device
@@ -116,56 +116,56 @@ object strategy_other {
          """.stripMargin
       )
 
-      //所有有点击用户日记本点击数
-      val clk_active_all = sc.sql(
-        s"""
-           |select '${param.date}' as stat_date, count(cid_id) as clk_active_all
-           |from data_feed_click jd inner join device_id_old
-           |on jd.device_id = device_id_old.device_id
-           |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
-           |and jd.device_id not in (select device_id from bl_device_list)
-           |and jd.device_id not in (select device_id from blacklist)
-           |and jd.stat_date ='${param.date}'
-         """.stripMargin
-      )
-
-//所有有点击用户日记本曝光数
-      val imp_active_all = sc.sql(
-        s"""
-           |select '${param.date}' as stat_date, count(cid_id) as imp_active_all
-           |from data_feed_exposure je inner join device_id_old
-           |on je.device_id = device_id_old.device_id
-           |where je.cid_type = 'diary'
-           |and je.device_id in (select distinct(device_id) from data_feed_click where stat_date = '${param.date}')
-           |and je.device_id not in (select device_id from bl_device_list)
-           |and je.device_id not in (select device_id from blacklist)
-           |and je.stat_date ='${param.date}'
-         """.stripMargin
-      )
-
-      //策略命中用户点击日记本用户数
-      val clk_diary_device_cover = sc.sql(
-        s"""
-           |select '${param.date}' as stat_date,count(distinct(device_id)) as clk_diary_device_cover
-           |from merge_queue_table
-           |where device_id in (select distinct(device_id) from data_feed_click where stat_date = '${param.date}')
-         """.stripMargin
-      )
-
-      //策略命中用户总数
-      val device_all_cover = sc.sql(
-        s"""
-           |select '${param.date}' as stat_date,count(distinct(device_id)) as device_all_cover
-           |from merge_queue_table
-         """.stripMargin
-      )*/
+      /*      //所有有点击用户日记本点击数
+            val clk_active_all = sc.sql(
+              s"""
+                 |select '${param.date}' as stat_date, count(cid_id) as clk_active_all
+                 |from data_feed_click jd inner join device_id_old
+                 |on jd.device_id = device_id_old.device_id
+                 |where  (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
+                 |and jd.device_id not in (select device_id from bl_device_list)
+                 |and jd.device_id not in (select device_id from blacklist)
+                 |and jd.stat_date ='${param.date}'
+               """.stripMargin
+            )
+
+      //所有有点击用户日记本曝光数
+            val imp_active_all = sc.sql(
+              s"""
+                 |select '${param.date}' as stat_date, count(cid_id) as imp_active_all
+                 |from data_feed_exposure je inner join device_id_old
+                 |on je.device_id = device_id_old.device_id
+                 |where je.cid_type = 'diary'
+                 |and je.device_id in (select distinct(device_id) from data_feed_click where stat_date = '${param.date}')
+                 |and je.device_id not in (select device_id from bl_device_list)
+                 |and je.device_id not in (select device_id from blacklist)
+                 |and je.stat_date ='${param.date}'
+               """.stripMargin
+            )
+
+            //策略命中用户点击日记本用户数
+            val clk_diary_device_cover = sc.sql(
+              s"""
+                 |select '${param.date}' as stat_date,count(distinct(device_id)) as clk_diary_device_cover
+                 |from merge_queue_table
+                 |where device_id in (select distinct(device_id) from data_feed_click where stat_date = '${param.date}')
+               """.stripMargin
+            )
+
+            //策略命中用户总数
+            val device_all_cover = sc.sql(
+              s"""
+                 |select '${param.date}' as stat_date,count(distinct(device_id)) as device_all_cover
+                 |from merge_queue_table
+               """.stripMargin
+            )*/
 
 
 
       val result = clk_active_1.join(imp_active_1,"stat_date")
         //.join(clk_active_all,"stat_date")
         //.join(imp_active_all,"stat_date")
-        //.join(clk_diary_device,"stat_date")
+        .join(clk_diary_device,"stat_date")
         //.join(clk_diary_device_cover,"stat_date")
       result.show()