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

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

@@ -472,27 +472,26 @@ object GetPortrait {
       val ti = new TiContext(sc)
       ti.tidbMapTable(dbName = "jerry_prod",tableName = "data_feed_click")
 
+      val stat_date = param.date
+
       val diary_tag = sc.sql(
         s"""
-           |select d.diary_id,
-           |(case when d.tag_type = '1' then d.level1_ids else "" end) level1_ids,
-           |(case when d.tag_type = '2' then d.level2_ids else "" end) level2_ids,
-           |(case when d.tag_type = '3' then d.level3_ids else "" end) level3_ids from
-           |	(select c.diary_id,c.tag_type,
-           |		concat_ws(c.level1_id) as level1_ids
-           |		concat_ws(c.level2_id) as level2_ids
-           |		concat_ws(c.level3_id) as level3_ids from
-           |	(select a.diary_id,a.tag_id,b.tag_type,b.level1_id,b.level2_id,b.level3_id
+           |select c.diary_id,
+           |		concat_ws(',',collect_set(cast(c.level1_id as string))) as level1_ids,
+           |		concat_ws(',',collect_set(cast(c.level2_id as string))) as level2_ids,
+           |		concat_ws(',',collect_set(cast(c.level3_id as string))) as level3_ids from
+           |	(select a.diary_id,b.level1_id,b.level2_id,b.level3_id
            |		from tl_hdfs_diary_tags_view a
            |		left join bl_tag_hierarchy_detail b
            |		on a.tag_id = b.id
-           |		where a.partition_date = '20181218'
-           |		and b.partition_date = '20181218') c
-           |	group by c.diary_id,c.tag_type) d
-           |group by d.diary_id
+           |		where a.partition_date = '${stat_date}'
+           |		and b.partition_date = '${stat_date}') c
+           |	group by c.diary_id
          """.stripMargin
       )
       diary_tag.show()
+      println(diary_tag.count())
+
 
 
       sc.stop()