简易注销维度

src/main/scala/com/winhc/bigdata/spark/jobs/chance/ChangeExtract.scala

@@ -312,6 +312,7 @@ object ChangeExtract {
     , Args(tableName = "company_send_announcement_list", primaryFields = "title")//送达公告
     , Args(tableName = "company_annual_report_out_guarantee", primaryFields = "id")//年报-对外担保
     , Args(tableName = "company_zxr_restrict", primaryFields = "status")//限制消费令，发现最新状态
+    , Args(tableName = "company_brief_cancel_announcement", primaryFields = "credit_code")//简易注销
 
     , Args(tableName = "company_zxr_final_case", primaryFields = "identity_num")//终本案件
     , Args(tableName = "company_license_creditchina", primaryFields = "licence_content")//行政许可-信用中国

src/main/scala/com/winhc/bigdata/spark/jobs/chance/table/company_brief_cancel_announcement.scala

@@ -0,0 +1,24 @@
+
+package com.winhc.bigdata.spark.jobs.chance.table
+
+import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
+import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+
+/**
+ * @Author: Yan Yongnian
+ * @Date: 2020/8/19
+ * @Description:
+ */
+
+
+//简易注销
+
+case class company_brief_cancel_announcement(equCols: Seq[String]) extends CompanyChangeHandle {
+  override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("company_name"), s"${newMap("company_name")}简易注销发生变更")
+
+  override def getInsertTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("company_name"), s"新增${newMap("company_name")}简易注销")
+
+  override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "简易注销", Array("company_name", "reg_number", "credit_code", "announcement_term", "reg_authority"))
+
+  override def getBizTime(newMap: Map[String, String]): String = newMap("announcement_end_date")
+}

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

@@ -200,6 +200,7 @@ object CompanyDynamic {
     , Args(tableName = "company_send_announcement_list", bName = 1)
     , Args(tableName = "company_annual_report_out_guarantee", bName = 1)
     , Args(tableName = "company_zxr_restrict", bName = 1)
+    , Args(tableName = "company_brief_cancel_announcement", bName = 1)
 
     , Args(tableName = "company_zxr_final_case", bName = 1)//终本案件
     , Args(tableName = "company_license_creditchina", bName = 1)//行政许可-信用中国
@@ -241,7 +242,7 @@ object CompanyDynamic {
 
     val config = EsConfig.getEsConfigMap ++ mutable.Map(
       "spark.hadoop.odps.project.name" -> project,
-      "spark.hadoop.odps.spark.local.partition.amt" -> "10"
+      "spark.hadoop.odps.spark.local.partition.amt" -> "1000"
     )
     val spark = SparkUtils.InitEnv("CompanyDynamic", config)
     val cd = CompanyDynamicUtil(spark, project, ds)

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

@@ -32,7 +32,7 @@ trait CompanyDynamicHandle {
     , "" -> "judicial_assistance" //股权冻结
     , "company_public_announcement2_list" -> "company_public_announcement2_list" //公示催告
     , "" -> "serious_violation" //严重违法
-    , "" -> "simple_cancellation" //简易注销
+    , "company_brief_cancel_announcement" -> "company_brief_cancel_announcement" //简易注销
     , "company_equity_info" -> "stock_pledge" //股权出质
     , "company_tax_contravention" -> "tax_illegal" //税收违法
     , "company_own_tax" -> "tax_owenotice" //欠税公告
@@ -83,7 +83,7 @@ trait CompanyDynamicHandle {
     , "company_env_punishment" -> "16" // 环保处罚
     , "company_equity_info" -> "17" // 股权出质
     , "" -> "18" // 严重违法
-    , "" -> "19" // 简易注销
+    , "company_brief_cancel_announcement" -> "19" // 简易注销
     , "company_own_tax" -> "20" // 欠税公告
     , "company_tax_contravention" -> "21" // 税收违法
     , "" -> "22" // 股权冻结
@@ -119,7 +119,7 @@ trait CompanyDynamicHandle {
     , "" -> "4" //股权冻结
     , "" -> "4" //司法拍卖
     , "" -> "4" //清算信息
-    , "" -> "4" //简易注销
+    , "company_brief_cancel_announcement" -> "4" //简易注销
     , "" -> "4" //严重违法
     , "" -> "3" //裁判文书（被告）
     , "" -> "3" //裁判文书（被执行人）

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

@@ -0,0 +1,48 @@
+package com.winhc.bigdata.spark.jobs.dynamic.tables
+
+import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
+
+/**
+ * @Author yyn
+ * @Date 2020/8/19
+ * @Description
+ */
+//简易注销
+case class company_brief_cancel_announcement() extends CompanyDynamicHandle {
+  /**
+   * 信息描述
+   *
+   * @param old_map
+   * @param new_map
+   * @return
+   */
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("announcement_term")
+
+  /**
+   * 变更内容
+   *
+   * @param old_map
+   * @param new_map
+   * @return
+   */
+  override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
+    "进行了简易注销"
+  }
+
+  /**
+   * 变更时间
+   *
+   * @param new_map
+   * @return
+   */
+//  override def get_change_time(new_map: Map[String, String]): String = new_map("biz_date")
+
+  /**
+   * 风险等级
+   *
+   * @param old_map
+   * @param new_map
+   * @return
+   */
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "高风险信息"
+}

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

@@ -54,7 +54,7 @@ case class company_land_transfer() extends CompanyDynamicHandle {
         "提示信息"
       }
       else{//原有土地使用权人
-        "提示信息"
+        "警示信息"
       }
     }
     else{