fix: 司法案件fix bugs

src/main/scala/com/winhc/bigdata/spark/jobs/judicial/JudicialCaseRelation_CaseAgg.scala

@@ -33,24 +33,24 @@ case class JudicialCaseRelation_CaseAgg(s: SparkSession,
   is_id_card_udf()
 
   def etl(ds: String): Unit = {
-    /*AsyncExtract.startAndWait(spark, Seq(
+    AsyncExtract.startAndWait(spark, Seq(
       ("dishonest etl...", () => {
         etl_company_dishonest_info(ds)
         true
       })
       ,
-//      ("wenshu etl...", () => {
-//        etl_wenshu(ds)
-//        true
-//      })
-//      ,
+      ("wenshu etl...", () => {
+        etl_wenshu(ds)
+        true
+      })
+      ,
       ("company_zxr etl...", () => {
         etl_company_zxf(ds)
         true
       })
-    ))*/
+    ))
 
-    //    etc_dwd_judicial_case(ds)
+        etc_dwd_judicial_case(ds)
     relationByGroup()
   }
 
@@ -460,7 +460,7 @@ case class JudicialCaseRelation_CaseAgg(s: SparkSession,
 
     sql(
       s"""
-         |--- INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci_dev.ads_judicial_case_relation
+         |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci_dev.ads_judicial_case_relation
          |SELECT  id_1
          |        ,id_2
          |        ,case_no_1
@@ -495,7 +495,6 @@ case class JudicialCaseRelation_CaseAgg(s: SparkSession,
          |        ) AS t2
          |WHERE   t2.num = 1
          |""".stripMargin)
-      .show(500, false)
 
   }
 

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

@@ -55,9 +55,9 @@ object case_connect_utils {
 
     for (char <- current_party.mkString("").toCharArray.map(_.toString).filter(vague_word.contains(_))) {
       for (userName <- current_party) {
-        for (splitUser <- userName.split(char)) {
+        for (splitUser <- userName.replace(char,"\001").split("\001")) {
           val all_str = connect_party.mkString("")
-          if (!all_str.contains(splitUser.substring(0, 1))) {
+          if (StringUtils.isNotEmpty(splitUser) && (!all_str.contains(splitUser.substring(0, 1)))) {
             return false
           }
         }
@@ -96,14 +96,18 @@ object case_connect_utils {
   }
 
   def main(args: Array[String]): Unit = {
-    //    val current_case_party_list: Seq[String] = Seq("张三", "张二", "张一", "张四")
-    //    val connect_case_party_list: Seq[String] = Seq("张三", "张二")
-    //
-    //    val current_case_no = ""
-    //    val connect_case_no = ""
-    //    val current_court_name = ""
-    //    val connect_court_name = ""
+    val current_case_party_list: Seq[String] = Seq("乐视控股（北京）有限公司", "贾跃亭", "甘薇", "贾跃民", "武汉信用小额贷款股份有限公司")
+    val connect_case_party_list: Seq[String] = Seq("贾跃民")
+
+    val current_case_no = "(2017)鄂01民初3720号"
+    val connect_case_no = "(2017)鄂01民初3720号"
+    val current_court_name = "湖北省武汉市中级人民法院"
+    val connect_court_name = "湖北省武汉市中级人民法院"
     //
-    //    println(isConnect(current_case_party_list, connect_case_party_list, current_case_no, connect_case_no, current_court_name, connect_court_name))
+    println(isConnect(current_case_party_list, connect_case_party_list, current_case_no, connect_case_no, current_court_name, connect_court_name))
+    var userName = "jasdfja*sldfjk"
+    var char = "*"
+
+    println(userName.replace(char,"\001").split("\001").mkString("\t"))
   }
 }