bug fix

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

@@ -474,56 +474,24 @@ object GetPortrait {
 
       val stat_date = param.date
 
-      val test1 = sc.sql(
-        s"""
-           |select a.diary_id,a.tag_id,b.tag_type,b.level1_id,b.level2_id,b.level3_id
-           |		from online.tl_hdfs_diary_tags_view a
-           |		left join online.bl_tag_hierarchy_detail b
-           |		on a.tag_id = b.id
-           |		where a.partition_date = '20181218'
-           |		and b.partition_date = '20181218'
-         """.stripMargin
-      )
-      test1.show()
-
-      val test2 = sc.sql(
-        s"""
-           |select c.diary_id,c.tag_type,
-           |		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,a.tag_id,b.tag_type,b.level1_id,b.level2_id,b.level3_id
-           |		from online.tl_hdfs_diary_tags_view a
-           |		left join online.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
-         """.stripMargin
-      )
-      test2.show()
-
       val diary_tag = sc.sql(
         s"""
-           |select d.diary_id,
-           |concat_ws(',',collect_set(d.level1_ids)) as level1_ids,
-           |concat_ws(',',collect_set(d.level2_ids)) as level2_ids,
-           |concat_ws(',',collect_set(d.level3_ids)) as level3_ids from
-           |	(select c.diary_id,c.tag_type,
+           |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,a.tag_id,b.tag_type,b.level1_id,b.level2_id,b.level3_id
-           |		from online.tl_hdfs_diary_tags_view a
-           |		left join online.bl_tag_hierarchy_detail b
+           |	(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 = '${stat_date}'
            |		and b.partition_date = '${stat_date}') c
-           |	group by c.diary_id,c.tag_type) d
-           |group by d.diary_id
+           |	group by c.diary_id
          """.stripMargin
       )
       diary_tag.show()
+      println(diary_tag.count())
+
 
 
       sc.stop()