|
@@ -1,5 +1,6 @@
|
|
package com.winhc.bigdata.spark.utils
|
|
package com.winhc.bigdata.spark.utils
|
|
|
|
|
|
|
|
+import com.winhc.bigdata.spark.implicits.CaseClass2JsonHelper._
|
|
import com.winhc.bigdata.spark.utils.BaseUtil.cleanup
|
|
import com.winhc.bigdata.spark.utils.BaseUtil.cleanup
|
|
import org.apache.commons.lang3.StringUtils
|
|
import org.apache.commons.lang3.StringUtils
|
|
|
|
|
|
@@ -10,18 +11,22 @@ import org.apache.commons.lang3.StringUtils
|
|
|
|
|
|
case class human(id: String, name: String)
|
|
case class human(id: String, name: String)
|
|
|
|
|
|
|
|
+case class holder(id: String, `type`: String, name: String)
|
|
|
|
+
|
|
case class CompanyName(show: String, value: String)
|
|
case class CompanyName(show: String, value: String)
|
|
|
|
|
|
|
|
|
|
object CompanyIndexUtils {
|
|
object CompanyIndexUtils {
|
|
def getHuman(id: String, name: String): human = human(id, name)
|
|
def getHuman(id: String, name: String): human = human(id, name)
|
|
|
|
|
|
|
|
+ def get_holder(id: String, `type`: String, name: String): String = holder(id, `type`, name).toJson()
|
|
|
|
+
|
|
|
|
|
|
def getCompanyName(name: String): CompanyName = {
|
|
def getCompanyName(name: String): CompanyName = {
|
|
if (StringUtils.isEmpty(name)) null
|
|
if (StringUtils.isEmpty(name)) null
|
|
else {
|
|
else {
|
|
val value = cleanup(name)
|
|
val value = cleanup(name)
|
|
- CompanyName(name.replaceAll("\t;","").trim, value)
|
|
|
|
|
|
+ CompanyName(name.replaceAll("\t;", "").trim, value)
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|