add getOrElse

eda/node2vec/src/main/scala/com/gmei/Main.scala

@@ -184,7 +184,6 @@ object Main {
       GmeiConfig.writeToJDBCTable(similar_result, table="nd_cid_similarity_matrix", SaveMode.Overwrite)
 
 
-
       //3. cids queue map to device_id
       ti.tidbMapTable(dbName = GmeiConfig.config.getString("tidb.database"),tableName = "nd_cid_similarity_matrix")
 
@@ -198,14 +197,14 @@ object Main {
            |on a.cid = b.cid
            |where b.similarity_cid is not null
      """.stripMargin
-      ).na.fill(Map("city_id" -> "beijing"))
+      ).na.fill(Map("city_id"->"beijing"))
       device_id.show()
 
       val device_queue = device_id.rdd.map {item =>
         val parts = (item.getAs[String](fieldName = "device_id"),item.getAs[String](fieldName = "city_id"),item.getAs[String](fieldName = "similarity_cid"))
 
         Try {
-          (parts._1,Try(parts._2.toString.replace("worldwide","beijing")),Try(parts._3.toString.replace("diary|","")).getOrElse(null))
+          (parts._1,Try(parts._2.toString.replace("worldwide","beijing")).getOrElse(null),Try(parts._3.toString.replace("diary|","")).getOrElse(null))
         }.getOrElse(null)
       }.filter(_!=null).toDF("device_id","city_id","similarity_cid")
 
@@ -220,6 +219,3 @@ object Main {
     sys.exit(1)
   }
 }
-
-
-