统一格式

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

@@ -182,7 +182,6 @@ object CompanyDynamic {
     , Args(tableName = "company_equity_info")
     , Args(tableName = "company_staff", bName = 1)
     , Args(tableName = "company", bName = 0)
-    , Args(tableName = "bankruptcy_open_case", bName = 1)
     , Args(tableName = "company_illegal_info", bName = 1)
     , Args(tableName = "company_land_publicity", bName = 1)
     , Args(tableName = "company_employment", bName = 1, aggs = 1)
@@ -193,8 +192,8 @@ object CompanyDynamic {
     , Args(tableName = "company_env_punishment", bName = 1)
     , Args(tableName = "company_punishment_info", bName = 1)
     , Args(tableName = "company_punishment_info_creditchina", bName = 1)
-    , Args(tableName = "bankruptcy_open_case", bName = 1)
     , Args(tableName = "company_public_announcement2_list", bName = 2)
+    , Args(tableName = "bankruptcy_open_case", bName = 1)
     , Args(tableName = "company_mortgage_info", bName = 1)
     , Args(tableName = "company_stock_announcement", bName = 1)
     , Args(tableName = "company_finance", bName = 1)

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

@@ -16,19 +16,9 @@ case class company_brief_cancel_announcement() extends CompanyDynamicHandle {
    * @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 = {
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
     "进行了简易注销"
   }
-
   /**
    * 变更时间
    *

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

@@ -16,22 +16,12 @@ case class company_land_mortgage() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("land_num")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""抵押土地评估金额:${new_map("evaluate_amount")}万元\n
-       |抵押金额：${new_map("mortgage_amount")}万元\n
-       |抵押开始时间：${new_map("start_date")}\n
-       |抵押结束时间：${new_map("end_date")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""抵押土地评估金额:${new_map("evaluate_amount")}万元
+       |抵押金额：${new_map("mortgage_amount")}万元
+       |抵押开始时间：${new_map("start_date")}
+       |抵押结束时间：${new_map("end_date")}""".stripMargin
   }
-
   /**
    * 变更时间
    *

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

@@ -16,20 +16,10 @@ case class company_land_transfer() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("num")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""转让价格:${new_map("merchandise_price")}万元\n
-       |成交时间：${new_map("merchandise_time")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""转让价格:${new_map("merchandise_price")}万元
+       |成交时间：${new_map("merchandise_time")}""".stripMargin
   }
-
   /**
    * 变更时间
    *

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

@@ -16,20 +16,10 @@ case class company_mortgage_info() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("reg_num")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""被担保债权数额:${new_map("amount")}\n
-       |债务人履行债务期限：${new_map("term")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""被担保债权数额:${new_map("amount")}
+       |债务人履行债务期限：${new_map("term")}""".stripMargin
   }
-
   /**
    * 变更时间
    *

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

@@ -16,22 +16,12 @@ case class company_public_announcement2_list()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("bill_type") + new_map("bill_num")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""票号:${new_map("bill_num")}\n
-       |申请人：${new_map("cname")}\n
-       |票面金额：${new_map("start_date")}\n
-       |公告日期：${new_map("end_date")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""票号:${new_map("bill_num")}
+       |申请人：${new_map("cname")}
+       |票面金额：${new_map("start_date")}
+       |公告日期：${new_map("end_date")}""".stripMargin
   }
-
   /**
    * 变更时间
    *

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

@@ -16,21 +16,11 @@ case class company_punishment_info() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("punish_number")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""决定日期:${new_map("decision_date")}\n
-       |违法行为类型：${new_map("type")}\n
-       |行政处罚内容：${new_map("content")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""决定日期:${new_map("decision_date")}
+       |违法行为类型：${new_map("type")}
+       |行政处罚内容：${new_map("content")}""".stripMargin
   }
-
   /**
    * 变更时间
    *

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

@@ -16,21 +16,11 @@ case class company_punishment_info_creditchina() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("punish_number")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""决定日期:${new_map("decision_date")}\n
-       |违法行为类型：${new_map("type")}\n
-       |行政处罚结果：${new_map("result")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""决定日期:${new_map("decision_date")}
+       |违法行为类型：${new_map("type")}
+       |行政处罚结果：${new_map("result")}""".stripMargin
   }
-
   /**
    * 变更时间
    *

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

@@ -16,20 +16,10 @@ case class company_stock_announcement()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("title")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""公告名称:${new_map("title")}\n
-       |公告日期：${new_map("time")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""公告名称:${new_map("title")}
+       |公告日期：${new_map("time")}""".stripMargin
   }
-
   /**
    * 变更时间
    *

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

@@ -16,22 +16,12 @@ case class company_zxr_restrict()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map("case_no")
-
-  /**
-   * 变更内容
-   *
-   * @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 = {
-    s"""案号:${new_map("case_no")}\n
-       |限消令对象:${new_map("name")}\n
-       |立案日期:${new_map("case_create_time")}\n
-       |发布日期:${new_map("update_time")}\n""".stripMargin
+  override def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    s"""案号:${new_map("case_no")}
+       |限消令对象:${new_map("name")}
+       |立案日期:${new_map("case_create_time")}
+       |发布日期:${new_map("update_time")}""".stripMargin
   }
-
   /**
    * 变更时间
    *