去除机构和黑名单

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

@@ -34,7 +34,7 @@ object GmeiConfig extends Serializable {
     val sparkConf = new SparkConf
     sparkConf.set("spark.sql.crossJoin.enabled", "true")
     sparkConf.set("spark.debug.maxToStringFields", "100")
-    sparkConf.set("spark.sql.broadcastTimeout",  "1000")
+    sparkConf.set("spark.sql.broadcastTimeout",  "6000")
 
     if (!sparkConf.contains("spark.master")) {
       sparkConf.setMaster("local[3]")

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

@@ -319,7 +319,7 @@ object coincidence_xinyang {
       meigou_pay_device_all.show()
 
       //截止目前获得的与新氧重合的用户数咨询统计
- /*     val zixun_num_all = sc.sql(
+      val zixun_num_all = sc.sql(
         s"""
            |select count(cl_id)  as zixun_num_all
            |from online.tl_hdfs_maidian_view
@@ -342,7 +342,7 @@ object coincidence_xinyang {
          """.stripMargin
       )
       zixun_device_all.show()
-*/
+
       val zixun_num_co = sc.sql(
         s"""
            |select count(cl_id)  as zixun_num_co