Commit 8ad6d5a8 authored by 王志伟's avatar 王志伟

repair bug

parent 804a64a8
...@@ -74,15 +74,13 @@ object Recommendation_strategy_all { ...@@ -74,15 +74,13 @@ object Recommendation_strategy_all {
decive_id_oldUser.createOrReplaceTempView("device_id_old") decive_id_oldUser.createOrReplaceTempView("device_id_old")
val strategies = Seq("1$","[^1]$")
for (strategy <- strategies){
val clk_count_oldUser = sc.sql( val clk_count_oldUser = sc.sql(
s""" s"""
|select '${param.date}' as stat_date, count(cid_id) as get_clk_count_old |select '${param.date}' as stat_date, count(cid_id) as get_clk_count_old
|from data_feed_click jd inner join device_id_old |from data_feed_click jd inner join device_id_old
|on jd.device_id = device_id_old.decive_id |on jd.device_id = device_id_old.decive_id
|where (jd.cid_type = 'diary' or jd.cid_type = 'diary_video') |where (jd.cid_type = 'diary' or jd.cid_type = 'diary_video')
|and jd.device_id regexp'${strategy}' |and jd.device_id regexp'1$$'
|and jd.device_id not in (select device_id from bl_device_list) |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.device_id not in (select device_id from blacklist)
|and jd.stat_date ='${param.date}' |and jd.stat_date ='${param.date}'
...@@ -95,24 +93,18 @@ object Recommendation_strategy_all { ...@@ -95,24 +93,18 @@ object Recommendation_strategy_all {
|from data_feed_exposure je inner join device_id_old |from data_feed_exposure je inner join device_id_old
|on je.device_id = device_id_old.decive_id |on je.device_id = device_id_old.decive_id
|where je.cid_type = 'diary' |where je.cid_type = 'diary'
|and je.device_id regexp'${strategy}' |and je.device_id regexp'1$$'
|and je.device_id not in (select device_id from bl_device_list) |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.device_id not in (select device_id from blacklist)
|and je.stat_date ='${param.date}' |and je.stat_date ='${param.date}'
""".stripMargin """.stripMargin
) )
val result = clk_count_oldUser.join(imp_count_oldUser,"stat_date") val result = clk_count_oldUser.join(imp_count_oldUser,"stat_date")
result.show() result.show()
}
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment