fix tracking etl job

src/main/scala/mobvista/dmp/datasource/adn/AdnOrgLogEtlHours.scala

@@ -120,6 +120,11 @@ class AdnOrgLogEtlHours extends CommonSparkJob with Serializable {
         } else {
           ""
         }
+        val f_ruid = if (StringUtils.isNotBlank(ruid) && ruid.length > 16) {
+          ruid
+        } else {
+          ""
+        }
 
         var f_platform = if (StringUtils.isNotBlank(platform)) {
           platform.toLowerCase()
@@ -129,7 +134,7 @@ class AdnOrgLogEtlHours extends CommonSparkJob with Serializable {
 
         f_platform = if (f_platform.contains("ios") || f_platform.contains("iphone") || deviceBrand.toLowerCase.contains("apple")
           || deviceModel.toLowerCase.contains("iphone") || deviceModel.toLowerCase.contains("ipad") || osVersion.toLowerCase.contains("ios")
-          || StringUtils.isNotBlank(f_idfa) || StringUtils.isNotBlank(f_idfv)) {
+          || StringUtils.isNotBlank(f_idfa) || StringUtils.isNotBlank(f_idfv) || StringUtils.isNotBlank(f_ruid)) {
           "ios"
         } else if (f_platform.contains("android") || osVersion.toLowerCase.contains("android") ||
           StringUtils.isNotBlank(f_imei) || StringUtils.isNotBlank(f_androidId) || StringUtils.isNotBlank(f_oaid) || StringUtils.isNotBlank(f_gaid)) {
@@ -138,10 +143,10 @@ class AdnOrgLogEtlHours extends CommonSparkJob with Serializable {
           "other"
         }
         if ((StringUtils.isNotBlank(f_idfa) || StringUtils.isNotBlank(f_idfv) || StringUtils.isNotBlank(f_imei) || StringUtils.isNotBlank(f_androidId) ||
-          StringUtils.isNotBlank(f_oaid) || StringUtils.isNotBlank(f_gaid) || StringUtils.isNotBlank(f_sysId) || StringUtils.isNotBlank(ruid)) &&
+          StringUtils.isNotBlank(f_oaid) || StringUtils.isNotBlank(f_gaid) || StringUtils.isNotBlank(f_sysId) || StringUtils.isNotBlank(f_ruid)) &&
           !"other".equals(f_platform)) {
           MRUtils.JOINER.join(date, time, timestamp, appId, f_platform, osVersion, sdkVersion, deviceModel, screenSize, countryCode,
-            language, ip, f_imei, mac, f_androidId, f_gaid, f_idfa, deviceBrand, f_sysId, packageName, strategy, f_oaid, f_idfv, ruid)
+            language, ip, f_imei, mac, f_androidId, f_gaid, f_idfa, deviceBrand, f_sysId, packageName, strategy, f_oaid, f_idfv, f_ruid)
         } else {
           null
         }