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

不对机构黑名单做处理

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

@@ -210,8 +210,8 @@ object NdDataInput {
       ti.tidbMapTable(dbName = "jerry_prod", tableName = "data_feed_click")
       ti.tidbMapTable(dbName = "eagle", tableName = "feed_diary_boost")
 
-      val date8 = GmeiConfig.getMinusNDate(5)
-      val tidb_inupt = sc.sql(
+      val date8 = GmeiConfig.getMinusNDate(70)
+      val result00 = sc.sql(
         s"""
            |SELECT
            | split(service_id,'\\\\|')[1] as sid,split(cid,'\\\\|')[1] as cid
@@ -219,9 +219,9 @@ object NdDataInput {
            |where stat_date > '${date8}'
      """.stripMargin
       )
-      tidb_inupt.createOrReplaceTempView("tmp1")
-      tidb_inupt.show()
-      println(tidb_inupt.count())
+      result00.createOrReplaceTempView("tmp1")
+      result00.show()
+      println(result00.count())
 
       val yesteday = GmeiConfig.getMinusNDate(1).replace("-","")
       val result01 = sc.sql(
@@ -238,6 +238,34 @@ object NdDataInput {
       result01.show()
       println(result01.count())
 
+      val result02 = sc.sql(
+        s"""
+           |select a.sid as sid, a.cid as cid, a.ctag_id as ctag_id, a.clevel1_id as clevel1_id,
+           | b.tag_id as stag_id, c.level1_id as slevel1_id
+           |from tmp2 a
+           |left join online.tl_meigou_servicetag_view b on a.sid=b.service_id
+           |left join online.bl_tag_hierarchy_detail c on b.tag_id=c.id
+           |where b.partition_date='${yesteday}'
+           |and c.partition_date='${yesteday}'
+         """.stripMargin
+      )
+      result02.createOrReplaceTempView("tmp3")
+      result02.show()
+      println(result02.count())
+
+
+      val tidb_input = sc.sql(
+        s"""
+           |select sid as service_id,cid
+           |from tmp3
+           |where clevel1_id = slevel1_id
+         """.stripMargin
+      )
+      tidb_input.show()
+      println(tidb_input.count())
+
+
+
 
     }
   }