Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/scala/com/utils/Driver.scala

src/main/scala/com/config/MyConfigSession.scala

@@ -58,6 +58,7 @@ object MyConfigSession {
           		  |component_tag,app_version,device_type,device_brand,device_model,network_type,created from pica_log.picalog_trace_app_part
           		  | where  pseudo_session is not null and pseudo_session !=''
           		  | and pseudo_id !='' and extra_info !='com.picahealth.patient' and serviceName != 'trace3'
+                | and action!='ACTION_WEB_AFTER'
                 | and FROM_UNIXTIME(cast(substring(created,1,10) as bigint),'yyyy-MM-dd')=created_day and created is not null and created!=''
         		""".stripMargin //and `action`!='ACTION_EQUIP_INFO'
 
@@ -239,4 +240,7 @@ object MyConfigSession {
     final val JDBC_PSSWORD = "5$7FXgz#e5JWP08e"
     final val JDBC_TABLE = "schedule_job_record"
 
+    final val MENU_CODE_VIEW_PATH_SQL: String = "select distinct full_path view_path, menu_code from pica_ds.pica_bi_bi_menu_code_h5 where full_path is not Null"
+
+
 }

src/main/scala/com/session/SessionProcessTerm.scala

@@ -81,6 +81,7 @@ object SessionProcessTerm {
            | from  pica_log.picalog_trace_app_part
            | where  pseudo_session is not null and pseudo_session !='' and pseudo_id !='' and extra_info !='com.picahealth.patient'
            | and action!='ACTION_EQUIP_INFO'
+           | and action!='ACTION_WEB_AFTER'
            |  and created is not null and created!='' and FROM_UNIXTIME(cast(substring(created,1,10) as bigint),'yyyy-MM-dd')='${scnData}'
            |   and created_day='${scnData}' and ${elseFiler}
            |""".stripMargin

src/main/scala/com/utils/Driver.scala

 package com.utils
 
-import com.session.{SessionMenuCalc, SessionPathConvert, SessionProcess, SessionProcessPath, SessionProcessPathNew, SessionProcessTerm}
+import com.session.{SessionMenuCalc, SessionProcess,  SessionProcessPath, SessionProcessPathNew, SessionProcessTerm}
 import org.apache.hadoop.util.ProgramDriver
 
 /**
@@ -17,6 +17,7 @@ object Driver {
     driver.addClass("SessionProcessTerm",classOf[SessionProcessTerm],"传递日期参数--用户Session数据etl导入到dw_fact_log_sesson_term表")
     driver.addClass("SessionProcessPathNew",classOf[SessionProcessPathNew],"用户Session数据分析导入到dw_fact_log_session_path_new表")
     driver.addClass("SessionPathConvert",classOf[SessionPathConvert],"用户Session数据分析导入到dw_fact_log_session_path_convert表")
+    driver.addClass("LoopPicaLogTraceAppPart",classOf[LoopPicaLogTraceAppPart],"弃用以前的menucode与viepath 对应表，启用新的一套")
 
     driver.run(args)
   }