world to worldwide

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

@@ -280,7 +280,7 @@ object EsmmPredData {
            |select concat(tmp1.device_id,",",tmp1.city_id) as device_city, tmp1.merge_queue from
            |(select device_id,city_id,similarity_cid as merge_queue from nd_device_cid_similarity_matrix
            |union
-           |select device_id,city_id,native_queue as merge_queue from ffm_diary_queue
+           |select device_id,if(city_id='world','worldwide',city_id) city_id,native_queue as merge_queue from ffm_diary_queue
            |union
            |select device_id,city_id,search_queue as merge_queue from search_queue) as tmp1
            |where tmp1.device_id in (select distinct device_id from data_feed_click where stat_date='${yesteday_have_seq}')
@@ -312,7 +312,8 @@ object EsmmPredData {
       val native_data = sc.sql(
         s"""
            |select distinct a.device_id,a.city_id,b.native_queue from data_feed_click a
-           |left join biz_feed_diary_queue b on a.city_id = b.city_id
+           |left join (select if(city_id='world','worldwide',city_id) city_id,native_queue from biz_feed_diary_queue) b
+           |on a.city_id = b.city_id
            |where a.stat_date='${yesteday_have_seq}' and b.native_queue != ""
          """.stripMargin
       )