all

src/main/scala/com/aliyun/odps/spark/examples/makedata/makedata_12_rosData_v3.scala

@@ -68,14 +68,14 @@ object makedata_12_rosData_v3 {
           }else{
             val return_mid_ts_list = labelJson.getString("return_mid_ts_list").split(",").map(r => {
               val midReturn = r.split(":")(0)
-              val ts = r.split(":")(1).toLong / 1000
+              val ts = r.split(":")(1).toLong
               (midReturn, ts)
             }).sortBy(_._2)
             var midSet = scala.collection.mutable.HashSet[String]()
             for ((midReturn, tsReturn) <- return_mid_ts_list){
               if (!midSet.contains(midReturn)){
                 midSet.add(midReturn)
-                if (tsReturn - logtimestamp <= 3600 && tsReturn - logtimestamp > 0){
+                if ((tsReturn / 1000 - logtimestamp / 1000) <= 3600 && tsReturn - logtimestamp > 0){
                   res.add(("1", feaJson))
                 }
               }