ソースを参照

feat: 调整限高写入es的字段

许家凯 3 年 前
コミット
6c817326cc

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/ng/utils/export_company_index_2_es.scala

@@ -177,7 +177,7 @@ object export_company_index_2_es {
       , "rowkey,keyno,name,case_no,court,gist_dd,reg_time,performance,pub_date,status,deleted".split(","))
 
     , export_2_es_args("company_zxr_restrict"
-      , "rowkey,company_id,company_name,pid,person_name,sex,card_num,court_name,case_create_time,case_no,status,deleted".split(","))
+      , "rowkey,company_id,company_name,pid,person_name,sex,card_num,applicant_info,court_name,case_create_time,case_no,status,deleted".split(","))
 
     , export_2_es_args("company_equity_info"
       , "rowkey,related_company_name,related_company_id,reg_number,pledgor_info,equity_amount,pledgee_info,reg_date,state,deleted".split(","))

+ 8 - 6
src/main/scala/com/winhc/bigdata/spark/utils/BaseUtil.scala

@@ -1,21 +1,20 @@
 package com.winhc.bigdata.spark.utils
 
 import cn.hutool.core.util.StrUtil
+import com.alibaba.fastjson.serializer.SerializeFilter
 import com.alibaba.fastjson.{JSON, JSONArray, JSONPath}
 import com.winhc.bigdata.spark.implicits.RegexUtils._
 import org.apache.commons.lang3.StringUtils
 import org.apache.commons.lang3.time.DateFormatUtils
-import org.apache.spark.sql.{Row, SparkSession}
+import org.apache.spark.sql.SparkSession
+import org.json4s.DefaultFormats
+import org.json4s.jackson.Json
+
 import java.security.MessageDigest
 import java.text.SimpleDateFormat
 import java.util
 import java.util.regex.Pattern
 import java.util.{Calendar, Date, Locale}
-
-import com.alibaba.fastjson.serializer.SerializeFilter
-import org.json4s.DefaultFormats
-import org.json4s.jackson.Json
-
 import scala.collection.{immutable, mutable}
 import scala.collection.mutable.ListBuffer
 
@@ -445,6 +444,9 @@ object BaseUtil {
    * @return
    */
   def toDBC(str: String): String = {
+    if(str==null){
+      return null
+    }
     val c = str.toCharArray
     for (i <- 0 until c.length) {
       if (c(i) == 12288) {