|
@@ -1,7 +1,7 @@
|
|
|
package com.winhc.bigdata.spark.ng.jobs
|
|
|
|
|
|
import com.winhc.bigdata.spark.config.EsConfig
|
|
|
-import com.winhc.bigdata.spark.udf.BaseFunc
|
|
|
+import com.winhc.bigdata.spark.udf.{BaseFunc, CompanyIndexFunc}
|
|
|
import com.winhc.bigdata.spark.utils._
|
|
|
import org.apache.commons.lang3.StringUtils
|
|
|
import org.apache.spark.sql.SparkSession
|
|
@@ -15,17 +15,16 @@ import scala.collection.mutable
|
|
|
*/
|
|
|
case class CompanyIndexJob(s: SparkSession,
|
|
|
project: String //表所在工程名
|
|
|
- ) extends LoggingUtils with BaseFunc {
|
|
|
+ ) extends LoggingUtils with BaseFunc with CompanyIndexFunc {
|
|
|
@(transient@getter) val spark: SparkSession = s
|
|
|
|
|
|
|
|
|
reg_urd()
|
|
|
|
|
|
def reg_urd(): Unit = {
|
|
|
+ company_org_type_udf()
|
|
|
cleanup()
|
|
|
- // code2Name()
|
|
|
area_code()
|
|
|
-
|
|
|
import com.winhc.bigdata.spark.implicits.CaseClass2JsonHelper._
|
|
|
def history_name(cname: String, history_names: String): String = CompanyIndexUtils.getHistoryName(cname, history_names).toJson()
|
|
|
|
|
@@ -235,6 +234,7 @@ case class CompanyIndexJob(s: SparkSession,
|
|
|
| ,cate_third_code
|
|
|
| ,reg_status
|
|
|
| ,reg_status_std
|
|
|
+ | ,company_org_type_std
|
|
|
| ,company_type
|
|
|
| ,credit_code
|
|
|
| ,reg_capital
|
|
@@ -320,6 +320,7 @@ case class CompanyIndexJob(s: SparkSession,
|
|
|
| ,cate_third_code
|
|
|
| ,reg_status
|
|
|
| ,reg_status_std
|
|
|
+ | ,get_company_org_type_std(name,company_org_type) as company_org_type_std
|
|
|
| ,company_type
|
|
|
| ,credit_code
|
|
|
| ,reg_capital
|