Merge remote-tracking branch 'origin/master'

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

@@ -313,7 +313,6 @@ object ChangeExtract {
     , Args(tableName = "company_bid_list", primaryFields = "title")
     , Args(tableName = "company_land_transfer", primaryFields = "num,location")
     , Args(tableName = "company_employment", primaryFields = "title,url_path")
-    , Args(tableName = "company_brief_cancel_announcement_result", primaryFields = "cid,main_id")
     , Args(tableName = "company_env_punishment", primaryFields = "punish_number")
     , Args(tableName = "company_icp", primaryFields = "domain")
     , Args(tableName = "company_punishment_info", primaryFields = "punish_number")

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,7 +20,7 @@ case class bankruptcy_open_case(equCols: Seq[String]) extends CompanyChangeHandl
     str
   }
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("public_date")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("public_date"),newMap("update_time"))
 
   override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("case_no"), s"${newMap("case_no")}破产重整发生变更")
 

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_bid_list(equCols: Seq[String]) extends CompanyChangeHandle {
 
   override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "招投标", Array("publish_time", "title", "purchaser", "province", "abs"))
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("publish_time")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("publish_time"),newMap("update_time"))
 }

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_brief_cancel_announcement(equCols: Seq[String]) extends Compa
 
   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")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("announcement_end_date"),newMap("update_time"))
 }

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

@@ -1,20 +0,0 @@
-
-package com.winhc.bigdata.spark.jobs.chance.table
-
-import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
-
-/**
- * @Author: XuJiakai
- * @Date: 2020/7/9 16:44
- * @Description: fixme 不能运行
- */
-case class company_brief_cancel_announcement_result(equCols: Seq[String]) extends CompanyChangeHandle {
-  override def getUpdateTitle(newMap: Map[String, String]): String = "简易注销信息发生变更"
-
-  override def getInsertTitle(newMap: Map[String, String]): String = "新增简易注销信息"
-
-  override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "简易注销", Array("cid", "brief_cancel_result"))
-
-  override def getBizTime(newMap: Map[String, String]): String = newMap("update_time")
-}

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: XuJiakai
@@ -20,5 +20,5 @@ case class company_env_punishment(equCols: Seq[String]) extends CompanyChangeHan
 
   override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "环保处罚", Array("name", "department", "punish_number", "punish_basis", "law_break", "reason", "content", "deleted"))
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("publish_time")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("publish_time"),newMap("update_time"))
 }

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_land_announcement(equCols: Seq[String]) extends CompanyChange
 
   override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "购地信息", Array("project_name", "project_loc", "area", "tran_price", "e_number"))
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("actual_start_time")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("actual_start_time"),newMap("update_time"))
 }

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_land_mortgage(equCols: Seq[String]) extends CompanyChangeHand
 
   override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "土地抵押", Array("land_mark", "land_num", "land_aministrative_area", "land_loc", "land_area", "use_right_num", "use_for", "area", "evaluate_amount", "mortgage_amount", "start_date", "end_date"))
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("start_date")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("start_date"),newMap("update_time"))
 }

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,7 +20,7 @@ case class company_land_publicity(equCols: Seq[String]) extends CompanyChangeHan
     str
   }
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("publication_start_date")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("publication_start_date"),newMap("update_time"))
 
   override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("title"), s"${newMap("title")}地块公示发生变更")
 

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_land_transfer(equCols: Seq[String]) extends CompanyChangeHand
 
   override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "土地转让", Array("merchandise_time", "user_pre", "user_now", "location", "area", "merchandise_price", "aministrative_area"))
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("merchandise_time")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("merchandise_time"),newMap("update_time"))
 }

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_public_announcement2_list(equCols: Seq[String]) extends Compa
 
   override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "公示催告", Array("applicant_cid", "owner_cid", "drawer_cid", "gather_name_cid", "bill_type", "bill_num", "bill_amt"))
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("publish_date")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("publish_date"),newMap("update_time"))
 }

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,7 +20,7 @@ case class company_punishment_info(equCols: Seq[String]) extends CompanyChangeHa
     str
   }
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("decision_date")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("decision_date"),newMap("update_time"))
 
   override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("punish_number"), s"${newMap("punish_number")}行政处罚发生变更")
 

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,7 +20,7 @@ case class company_punishment_info_creditchina(equCols: Seq[String]) extends Com
     str
   }
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("decision_date")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("decision_date"),newMap("update_time"))
 
   override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("punish_number"), s"${newMap("punish_number")}行政处罚-信用中国发生变更")
 

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

@@ -2,7 +2,7 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
@@ -20,5 +20,5 @@ case class company_send_announcement_list(equCols: Seq[String]) extends CompanyC
 
   override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.getTags(newMap, "送达公告", Array("court", "case_no", "area", "case_reason", "plaintiff", "defendant"))
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("start_date")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("start_date"),newMap("update_time"))
 }

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

@@ -2,12 +2,12 @@
 package com.winhc.bigdata.spark.jobs.chance.table
 
 import com.winhc.bigdata.spark.jobs.chance.CompanyChangeHandle
-import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
 
 /**
  * @Author: Yan Yongnian
  * @Date: 2020/8/14
- * @Description: fixme 不能运行
+ * @Description:限制消费令
  */
 //限制消费令
 case class company_zxr_restrict(equCols: Seq[String]) extends CompanyChangeHandle with Serializable {
@@ -17,7 +17,7 @@ case class company_zxr_restrict(equCols: Seq[String]) extends CompanyChangeHandl
     str
   }
 
-  override def getBizTime(newMap: Map[String, String]): String = newMap("case_create_time")
+  override def getBizTime(newMap: Map[String, String]): String = DateUtils.getNotNullStr(newMap("case_create_time"),newMap("update_time"))
 
   override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("case_no"), s"${newMap("case_no")}限制消费令发生变更")
 

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

@@ -26,10 +26,10 @@ case class bankruptcy_open_case() extends CompanyDynamicHandle {
    * @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("respondent")\n
-       |申请人：$new_map("applicant")\n
-       |公开日期：$new_map("public_date")\n""".stripMargin
+    s"""案号:${new_map("case_no")}\n
+       |被申请人：${new_map("respondent")}\n
+       |申请人：${new_map("applicant")}\n
+       |公开日期：${new_map("public_date")}\n""".stripMargin
   }
 
   /**

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

@@ -26,10 +26,10 @@ case class company_land_mortgage() extends CompanyDynamicHandle {
    * @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
+    s"""抵押土地评估金额:${new_map("evaluate_amount")}万元\n
+       |抵押金额：${new_map("mortgage_amount")}万元\n
+       |抵押开始时间：${new_map("start_date")}\n
+       |抵押结束时间：${new_map("end_date")}\n""".stripMargin
   }
 
   /**

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

@@ -26,8 +26,8 @@ case class company_land_transfer() extends CompanyDynamicHandle {
    * @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
+    s"""转让价格:${new_map("merchandise_price")}万元\n
+       |成交时间：${new_map("merchandise_time")}\n""".stripMargin
   }
 
   /**

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

@@ -26,8 +26,8 @@ case class company_mortgage_info() extends CompanyDynamicHandle {
    * @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
+    s"""被担保债权数额:${new_map("amount")}\n
+       |债务人履行债务期限：${new_map("term")}\n""".stripMargin
   }
 
   /**

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

@@ -26,10 +26,10 @@ case class company_public_announcement2_list()extends CompanyDynamicHandle {
    * @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
+    s"""票号:${new_map("bill_num")}\n
+       |申请人：${new_map("cname")}\n
+       |票面金额：${new_map("start_date")}\n
+       |公告日期：${new_map("end_date")}\n""".stripMargin
   }
 
   /**

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

@@ -26,9 +26,9 @@ case class company_punishment_info() extends CompanyDynamicHandle {
    * @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
+    s"""决定日期:${new_map("decision_date")}\n
+       |违法行为类型：${new_map("type")}\n
+       |行政处罚内容：${new_map("content")}\n""".stripMargin
   }
 
   /**

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

@@ -26,9 +26,9 @@ case class company_punishment_info_creditchina() extends CompanyDynamicHandle {
    * @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
+    s"""决定日期:${new_map("decision_date")}\n
+       |违法行为类型：${new_map("type")}\n
+       |行政处罚结果：${new_map("result")}\n""".stripMargin
   }
 
   /**

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

@@ -26,8 +26,8 @@ case class company_send_announcement_list()extends CompanyDynamicHandle {
    * @return
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
-    s"""发布日期:$new_map("start_date")\n
-       |法院名称：$new_map("court")\n""".stripMargin
+    s"""发布日期:${new_map("start_date")}\n
+       |法院名称：${new_map("court")}\n""".stripMargin
   }
 
   /**

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

@@ -26,8 +26,8 @@ case class company_stock_announcement()extends CompanyDynamicHandle {
    * @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
+    s"""公告名称:${new_map("title")}\n
+       |公告日期：${new_map("time")}\n""".stripMargin
   }
 
   /**

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

@@ -26,10 +26,10 @@ case class company_zxr_restrict()extends CompanyDynamicHandle {
    * @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
+    s"""案号:${new_map("case_no")}\n
+       |限消令对象:${new_map("name")}\n
+       |立案日期:${new_map("case_create_time")}\n
+       |发布日期:${new_map("update_time")}\n""".stripMargin
   }
 
   /**