Merge remote-tracking branch 'origin/master'

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

@@ -487,7 +487,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
     //司法案件主表
     sql(
       s"""
-         |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci.ads_judicial_case_relation_r1
+         |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci_dev.ads_judicial_case_relation_r1
          |SELECT
          |    judicase_id ,
          |    title       ,
@@ -543,7 +543,7 @@ case class JudicialCaseRelationPreNew(s: SparkSession, project: String, ds: Stri
     //明细表
     sql(
       s"""
-         |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci.ads_judicial_case_relation_r2
+         |INSERT ${if (isWindows) "INTO" else "OVERWRITE"} TABLE winhc_eci_dev.ads_judicial_case_relation_r2
          |SELECT
          |    id    ,
          |    judicase_id ,

src/main/scala/com/winhc/bigdata/spark/udf/NameAggs.scala

@@ -76,9 +76,9 @@ class NameAggs(max: Int) extends UserDefinedAggregateFunction {
   override def evaluate(buffer: Row): Any = {
     var yg_name = ""
     var bg_name = ""
-    val m0: Map[String, String] = buffer.getAs[Map[String, String]](0)
-    val m1: Map[String, String] = buffer.getAs[Map[String, String]](1)
-    println("m0" + m0 + "m1" + m1)
+    val m0: Map[String, String] = buffer.getAs[Map[String, String]](0).filter(_._2.split(s"$split",-1).length == 2)
+    val m1: Map[String, String] = buffer.getAs[Map[String, String]](1).filter(_._2.split(s"$split",-1).length == 2)
+    //println("m0" + m0 + "m1" + m1)
     if (m0.isEmpty && m1.isEmpty) {
       return Map("yg_name" -> yg_name, "bg_name" -> bg_name)
     }else if(!m0.isEmpty){

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

@@ -315,7 +315,7 @@ object BaseUtil {
   @deprecated
   private val case_pat = ".*([（\\(]\\d{4}[）\\)][^号]*号?).*".r
 
-  private val case_pat2 = "(((20\\d{2}|19\\d{2})|\\((20\\d{2}|19\\d{2})\\))[^号]{6,}号?).*".r
+  private val case_pat2 = "(((20\\d{2}|19\\d{2})|\\((20\\d{2}|19\\d{2})\\))[^号]{3,}号?).*".r
   private val year_pat = "(\\d{4}?)年".r
 
   /**
@@ -398,7 +398,7 @@ object BaseUtil {
     //    println(case_no_trim("（2015）怀执字第03601号号"))
     //    val seq = Seq("1", "3", "2", "7").mkString("\001")
     //    println(sortString(seq))
-    println(case_no_trim("中国贸仲京裁字第0394号"))
+    println(case_no_trim("(2019)鄂执7号"))
   }
 
 }