remove ruid_mapping

azkaban/adn/package/adn_interest_install.job

 type=command
 
-dependencies=adn_install_total_v1
+dependencies=adn_install_total
 command=sh -x adn_interest_install.sh
\ No newline at end of file

azkaban/adn/package/adn_interest_install.sh

@@ -14,7 +14,7 @@ month=${LOG_TIME:4:2}
 day=${LOG_TIME:6:2}
 
 
-INPUT_INSTALL_PATH="${DM_INSTALL_LIST}_v1/$year/$month/$day/adn_install"
+INPUT_INSTALL_PATH="${DM_INSTALL_LIST}/$year/$month/$day/adn_install"
 INPUT_APP_TAG_PATH="$APP_TAG_PATH/$year/$month/$day"
 OUTPUT_INTEREST_TAG="$DM_INTEREST_PATH/$year/$month/$day/adn_install"
 

azkaban/adn/package/adn_interest_request.job

 type=command
 
-dependencies=adn_request_pkg_total_v1
+dependencies=adn_request_pkg_total
 command=sh -x adn_interest_request.sh
\ No newline at end of file

azkaban/adn/package/adn_interest_request.sh

@@ -16,7 +16,7 @@ day=${LOG_TIME:6:2}
 
 check_await "$APP_TAG_PATH/$year/$month/$day/_SUCCESS"
 
-INPUT_INSTALL_PATH="${DM_INSTALL_LIST}_v1/$year/$month/$day/adn_request_sdk"
+INPUT_INSTALL_PATH="${DM_INSTALL_LIST}/$year/$month/$day/adn_request_sdk"
 INPUT_APP_TAG_PATH="$APP_TAG_PATH/${year}/${month}/${day}/"
 OUTPUT="$DM_INTEREST_PATH/$year/$month/$day/adn_request_sdk"
 

azkaban/adn/package/adn_request_other_interest.job

 type=command
-dependencies=adn_request_other_install_v1
+dependencies=adn_request_other_install
 command=sh -x adn_request_other_interest.sh
\ No newline at end of file

azkaban/adn/package/adn_request_other_interest.sh

@@ -12,7 +12,7 @@ year=${LOG_TIME:0:4}
 month=${LOG_TIME:4:2}
 day=${LOG_TIME:6:2}
 
-INPUT_INSTALL_PATH="${DM_INSTALL_LIST}_v1/$year/$month/$day/adn_request_other"
+INPUT_INSTALL_PATH="${DM_INSTALL_LIST}/$year/$month/$day/adn_request_other"
 INPUT_APP_TAG_PATH="$APP_TAG_PATH/$year/$month/$day"
 OUTPUT_PATH="$DM_INTEREST_PATH/${year}/${month}/${day}/adn_request_other"
 

azkaban/adn_sdk/adn_sdk_interest.job

 type=command
 
-dependencies=adn_sdk_install_v1
+dependencies=adn_sdk_install
 command=sh -x adn_sdk_interest.sh
\ No newline at end of file

azkaban/adn_sdk/adn_sdk_interest.sh

@@ -13,7 +13,7 @@ year=${LOG_TIME:0:4}
 month=${LOG_TIME:4:2}
 day=${LOG_TIME:6:2}
 
-INPUT_INSTALL_PATH="${DM_INSTALL_LIST}_v1/$year/$month/$day/adn_sdk"
+INPUT_INSTALL_PATH="${DM_INSTALL_LIST}/$year/$month/$day/adn_sdk"
 INPUT_APP_TAG_PATH="${APP_TAG_PATH}/$year/$month/$day"
 OUTPUT_PATH="${DM_INTEREST_PATH}/${year}/${month}/${day}/adn_sdk"
 

azkaban/adn_sdk/adn_sdk_v2_interest.sh

@@ -13,7 +13,7 @@ year=${LOG_TIME:0:4}
 month=${LOG_TIME:4:2}
 day=${LOG_TIME:6:2}
 
-INPUT_INSTALL_PATH="${DM_INSTALL_LIST}_v1/$year/$month/$day/adn_sdk_v2"
+INPUT_INSTALL_PATH="${DM_INSTALL_LIST}/$year/$month/$day/adn_sdk_v2"
 INPUT_APP_TAG_PATH="${APP_TAG_PATH}/$year/$month/$day"
 OUTPUT_PATH="${DM_INTEREST_PATH}/${year}/${month}/${day}/adn_sdk_v2"
 

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

@@ -120,7 +120,7 @@ class AdnOrgLogEtlHours extends CommonSparkJob with Serializable {
         } else {
           ""
         }
-        val f_ruid = if (StringUtils.isNotBlank(ruid) && ruid.length > 16) {
+        val f_ruid = if (StringUtils.isNotBlank(ruid) && ruid.length >= 16) {
           ruid
         } else {
           ""