fix: 动态加入统一捕获异常

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

@@ -143,12 +143,21 @@ object CompanyDynamic {
         val cname = r.getAs[String]("cname")
         if (biz_date == null)
           None
-        val result = handle.handle(rowkey, biz_date, cid, if (fields == null) null else fields.split(","), old_data, new_data, cname)
-        if (result == null) {
-          None
-        }
-        else {
-          result.map(res => Row(CompanyDynamicHandleUtils.getDynamicId(res._1, res._4, res._7, res._6), res._1, res._2, res._3, res._4.replaceAll("null", ""), res._5, res._6, res._7, res._8, res._9, res._10, DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")))
+        try {
+          val result = handle.handle(rowkey, biz_date, cid, if (fields == null) null else fields.split(","), old_data, new_data, cname)
+          if (result == null) {
+            None
+          }
+          else {
+            result.map(res => Row(CompanyDynamicHandleUtils.getDynamicId(res._1, res._4, res._7, res._6), res._1, res._2, res._3, res._4.replaceAll("null", ""), res._5, res._6, res._7, res._8, res._9, res._10, DateFormatUtils.format(new Date(), "yyyy-MM-dd HH:mm:ss")))
+          }
+        } catch {
+          case e: Exception => {
+            log.error(e.getMessage, e)
+            log.error("new_data: {}", new_data)
+            log.error("old_data: {}", old_data)
+          }
+            None
         }
       })
 

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

@@ -1,9 +1,8 @@
 package com.winhc.bigdata.spark.jobs.dynamic.tables
-import com.winhc.bigdata.spark.implicits.MapHelper._
 
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandle
 
-case class company_zxr_list() extends CompanyDynamicHandle{
+case class company_zxr_list() extends CompanyDynamicHandle {
   /**
    * 信息描述
    *
@@ -11,16 +10,12 @@ case class company_zxr_list() extends CompanyDynamicHandle{
    * @param new_map
    * @return
    */
-  override protected 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 protected def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = new_map.toJson(Seq("case_create_time->立案日期","case_no->案号","exec_money->执行标的"))
+  override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
+    if ("1".equals(new_map("deleted"))) {
+      return null
+    }
+    new_map("case_no")
+  }
 
   /**
    * 风险等级
@@ -29,33 +24,6 @@ case class company_zxr_list() extends CompanyDynamicHandle{
    * @param new_map
    * @return
    */
-  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"
 
-  /**
-   *
-   * @param rowkey
-   * @param cid
-   * @param change_fields
-   * @param old_map
-   * @param new_map
-   * @return cid
-   *         cname
-   *         info_type
-   *         rta_desc
-   *         change_content
-   *         change_time
-   *         biz_id
-   *         sub_info_type
-   *         info_risk_level
-   *         winhc_suggest
-   */
-  override def handle(rowkey: String, bizDate: String, cid: String, change_fields: Seq[String], old_map: Map[String, String], new_map: Map[String, String], cname: String, suggestion: String): Seq[(String, String, String, String, String, String, String, String, String, String)] = {
-    if ("1".equals(new_map("deleted"))) {
-      return Seq.empty
-    }
-
-    super.handle(rowkey, bizDate, cid, change_fields, old_map, new_map, cname, "该企业是被执行人")
-
-
-  }
 }