Merge branch 'master' of http://139.224.213.4:3000/bigdata/Spark_Max

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamic.scala

@@ -208,15 +208,16 @@ object CompanyDynamic {
     , Args(tableName = "company_license_entpub", bName = 1) //行政许可-企业公示
     , Args(tableName = "company_license", bName = 1) //行政许可
     , Args(tableName = "company_check_info", bName = 1) //抽查检查
-    , Args(tableName = "company_court_announcement_list", bName = 1) //法院公告
-    , Args(tableName = "company_court_open_announcement_list", bName = 1) //开庭公告
-    , Args(tableName = "company_court_register_list", bName = 1) //立案信息
+    , Args(tableName = "company_court_announcement_list", bName = 2) //法院公告
+    , Args(tableName = "company_court_open_announcement_list", bName = 2) //开庭公告
+    , Args(tableName = "company_court_register_list", bName = 2) //立案信息
     , Args(tableName = "company_double_random_check_info", bName = 1) //双随机抽查
     , Args(tableName = "company_judicial_sale_combine_list", bName = 1) //司法拍卖
     , Args(tableName = "company_tax_contravention", bName = 1) //税收违法
     , Args(tableName = "wenshu_detail_combine", bName = 1) //裁判文书
     , Args(tableName = "company_holder", bName = 1) //裁判文书
     , Args(tableName = "company_annual_report_out_investment", bName = 1) //裁判文书
+    , Args(tableName = "company_own_tax", bName = 1) //欠税公告
   )
 
   private case class Args(project: String = "winhc_eci_dev"

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_check_info.scala

@@ -41,5 +41,5 @@ case class company_check_info() extends CompanyDynamicHandle {
    */
   override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = ""
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_announcement_list.scala

@@ -2,6 +2,7 @@ package com.winhc.bigdata.spark.jobs.dynamic.tables
 
 import com.winhc.bigdata.spark.implicits.MapHelper._
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
+import org.apache.commons.lang3.StringUtils
 
 /**
  * @Author: π
@@ -57,5 +58,14 @@ case class company_court_announcement_list() extends CompanyDynamicHandle {
     , "publish_date->刊登日期"
   ))
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    val oldcname = new_map("cname")
+    val litigant = new_map("litigant")
+    if (StringUtils.isNotBlank(oldcname)) {
+      if (oldcname.contains(litigant)) {
+        return "3"
+      }
+    }
+    "2"
+  }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_open_announcement_list.scala

@@ -2,6 +2,7 @@ package com.winhc.bigdata.spark.jobs.dynamic.tables
 
 import com.winhc.bigdata.spark.implicits.MapHelper._
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
+import org.apache.commons.lang3.StringUtils
 
 /**
  * @Author: π
@@ -43,16 +44,25 @@ case class company_court_open_announcement_list() extends CompanyDynamicHandle {
    */
   override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = new_map.toJson(Seq(
     "case_reason->案由"
-    ,"case_no->案号"
-    ,"start_date->开庭时间"
-    ,"area->地区"
-    ,"plan_date->排期日期"
-    ,"judge->审判长/主审人"
-    ,"litigant->当事人"
-    ,"court->法院"
-    ,"court_room->法庭"
-    ,"content->公告内容"
+    , "case_no->案号"
+    , "start_date->开庭时间"
+    , "area->地区"
+    , "plan_date->排期日期"
+    , "judge->审判长/主审人"
+    , "litigant->当事人"
+    , "court->法院"
+    , "court_room->法庭"
+    , "content->公告内容"
   ))
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    val oldcname = new_map("cname")
+    val defendant = new_map("defendant")//被告
+    if (StringUtils.isNotBlank(oldcname)) {
+      if (oldcname.contains(defendant)) {
+        return "3"
+      }
+    }
+    "2"
+  }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_court_register_list.scala

@@ -2,6 +2,7 @@ package com.winhc.bigdata.spark.jobs.dynamic.tables
 
 import com.winhc.bigdata.spark.implicits.MapHelper._
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
+import org.apache.commons.lang3.StringUtils
 
 /**
  * @Author: π
@@ -57,5 +58,14 @@ case class company_court_register_list() extends CompanyDynamicHandle {
     ,"third->第三人"
   ))
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    val oldcname = new_map("cname")
+    val defendant = new_map("defendant")
+    if (StringUtils.isNotBlank(oldcname)) {
+      if (oldcname.contains(defendant)) {
+        return "3"
+      }
+    }
+    "2"
+  }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_double_random_check_info.scala

@@ -42,5 +42,7 @@ case class company_double_random_check_info() extends CompanyDynamicHandle {
    */
   override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = ""
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    "2"
+  }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_judicial_sale_combine_list.scala

@@ -45,5 +45,7 @@ case class company_judicial_sale_combine_list() extends CompanyDynamicHandle {
     "source_id->address"
   ))
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    "4"
+  }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license.scala

@@ -44,5 +44,5 @@ case class company_license() extends CompanyDynamicHandle {
    */
   override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = ""
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license_creditchina.scala

@@ -45,5 +45,5 @@ case class company_license_creditchina() extends CompanyDynamicHandle {
    */
   override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = ""
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_license_entpub.scala

@@ -44,5 +44,5 @@ case class company_license_entpub() extends CompanyDynamicHandle {
    */
   override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = ""
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_tax_contravention.scala

@@ -71,5 +71,7 @@ case class company_tax_contravention() extends CompanyDynamicHandle {
     }
   }
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "警示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    "3"
+  }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_zxr_final_case.scala

@@ -54,5 +54,7 @@ case class company_zxr_final_case() extends CompanyDynamicHandle {
     ,"no_exec_amount->未履行金额"
   ))
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "风险信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    "4"
+  }
 }

src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/wenshu_detail_combine.scala

@@ -27,12 +27,12 @@ case class wenshu_detail_combine() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
     val t1 = new_map("name_type")
-    var t2 =""
-    if(StringUtils.isNotBlank(new_map("name_type"))){
-      if("y".equals(t1)){
-        t2 ="原告"
-      }else{
-        t2="被告"
+    var t2 = ""
+    if (StringUtils.isNotBlank(new_map("name_type"))) {
+      if ("y".equals(t1)) {
+        t2 = "原告"
+      } else {
+        t2 = "被告"
       }
     }
     s"""
@@ -52,5 +52,17 @@ case class wenshu_detail_combine() extends CompanyDynamicHandle {
    */
   override protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String): String = ""
 
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    val t1 = new_map("name_type")
+    var t2 = "2"
+    if (StringUtils.isNotBlank(new_map("name_type"))) {
+      if ("y".equals(t1)) {
+        t2 = "2"
+      } else {
+        t2 = "3"
+      }
+    }
+    t2
+  }
+
 }