字段类型统一

src/main/scala/com/winhc/bigdata/spark/ng/relation/inc_company_relation.scala

@@ -39,15 +39,15 @@ case class inc_company_relation(s: SparkSession,
 
     def get_relation_holder(start_id: String, start_name: String, end_id: String,
                             end_name: String, percent: Double, deleted: Int, holder_type: Int, topic_type: String): String =
-      CompanyRelationUtils.get_relation_holder(start_id, start_name, end_id, end_name, percent, deleted, holder_type, topic_type)
+      CompanyRelationUtils.get_relation_holder(start_id, start_name, end_id, end_name, percent.toString, deleted.toString, holder_type.toString, topic_type)
 
     def get_relation_staff(start_id: String, start_name: String, end_id: String,
                            end_name: String, staff_type: String, deleted: Int, topic_type: String): String =
-      CompanyRelationUtils.get_relation_staff(start_id, start_name, end_id, end_name, staff_type, deleted, topic_type)
+      CompanyRelationUtils.get_relation_staff(start_id, start_name, end_id, end_name, staff_type, deleted.toString, topic_type)
 
     def get_relation_legal_entity(start_id: String, start_name: String, end_id: String,
                                   end_name: String, deleted: Int, legal_entity_type: String, topic_type: String): String =
-      CompanyRelationUtils.get_relation_legal_entity(start_id, start_name, end_id, end_name, deleted, legal_entity_type, topic_type)
+      CompanyRelationUtils.get_relation_legal_entity(start_id, start_name, end_id, end_name, deleted.toString, legal_entity_type, topic_type)
 
 
     spark.udf.register("get_company_node", get_company_node _)

src/main/scala/com/winhc/bigdata/spark/ng/relation/inc_company_relation_v2.scala

@@ -47,15 +47,15 @@ case class inc_company_relation_v2(s: SparkSession,
 
     def get_relation_holder(start_id: String, start_name: String, end_id: String,
                             end_name: String, percent: Double, deleted: Int, holder_type: Int, topic_type: String): String =
-      CompanyRelationUtils.get_relation_holder(start_id, start_name, end_id, end_name, percent, deleted, holder_type, topic_type)
+      CompanyRelationUtils.get_relation_holder(start_id, start_name, end_id, end_name, percent.toString, deleted.toString, holder_type.toString, topic_type)
 
     def get_relation_staff(start_id: String, start_name: String, end_id: String,
                            end_name: String, staff_type: String, deleted: Int, topic_type: String): String =
-      CompanyRelationUtils.get_relation_staff(start_id, start_name, end_id, end_name, staff_type, deleted, topic_type)
+      CompanyRelationUtils.get_relation_staff(start_id, start_name, end_id, end_name, staff_type, deleted.toString, topic_type)
 
     def get_relation_legal_entity(start_id: String, start_name: String, end_id: String,
                                   end_name: String, deleted: Int, legal_entity_type: String, topic_type: String): String =
-      CompanyRelationUtils.get_relation_legal_entity(start_id, start_name, end_id, end_name, deleted, legal_entity_type, topic_type)
+      CompanyRelationUtils.get_relation_legal_entity(start_id, start_name, end_id, end_name, deleted.toString, legal_entity_type, topic_type)
 
     spark.udf.register("get_company_node", get_company_node _)
     spark.udf.register("get_person_node", get_person_node _)

src/main/scala/com/winhc/bigdata/spark/utils/CompanyRelationUtils.scala

@@ -1,8 +1,6 @@
 package com.winhc.bigdata.spark.utils
 
 import com.winhc.bigdata.spark.implicits.CaseClass2JsonHelper._
-import com.winhc.bigdata.spark.utils.BaseUtil.cleanup
-import org.apache.commons.lang3.StringUtils
 
 /**
  * @author: π
@@ -13,13 +11,13 @@ case class company_node(id: String, name: String, deleted: String, topic_type: S
 case class person_node(id: String, name: String, deleted: String, topic_type: String)
 
 case class relation_holder(start_id: String, start_name: String, end_id: String,
-                           end_name: String, percent: Double, deleted: Int, holder_type: Int, topic_type: String)
+                           end_name: String, percent: String, deleted: String, holder_type: String, topic_type: String)
 
 case class relation_staff(start_id: String, start_name: String, end_id: String,
-                          end_name: String, staff_type: String, deleted: Int, topic_type: String)
+                          end_name: String, staff_type: String, deleted: String, topic_type: String)
 
 case class relation_legal_entity(start_id: String, start_name: String, end_id: String,
-                                 end_name: String, deleted: Int, legal_entity_type: String, topic_type: String)
+                                 end_name: String, deleted: String, legal_entity_type: String, topic_type: String)
 
 
 object CompanyRelationUtils {
@@ -31,15 +29,15 @@ object CompanyRelationUtils {
     person_node(id, name, deleted, topic_type).toJson()
 
   def get_relation_holder(start_id: String, start_name: String, end_id: String,
-                          end_name: String, percent: Double, deleted: Int, holder_type: Int, topic_type: String): String =
+                          end_name: String, percent: String, deleted: String, holder_type: String, topic_type: String): String =
     relation_holder(start_id, start_name, end_id, end_name, percent, deleted, holder_type, topic_type).toJson()
 
   def get_relation_staff(start_id: String, start_name: String, end_id: String,
-                         end_name: String, staff_type: String, deleted: Int, topic_type: String): String =
+                         end_name: String, staff_type: String, deleted: String, topic_type: String): String =
     relation_staff(start_id, start_name, end_id, end_name, staff_type, deleted, topic_type).toJson()
 
   def get_relation_legal_entity(start_id: String, start_name: String, end_id: String,
-                                end_name: String, deleted: Int, legal_entity_type: String, topic_type: String): String =
+                                end_name: String, deleted: String, legal_entity_type: String, topic_type: String): String =
     relation_legal_entity(start_id, start_name, end_id, end_name, deleted, legal_entity_type, topic_type).toJson()
 
 }