Browse Source

fix changeContent的格式

晏永年 4 years ago
parent
commit
f52eb38dd7

+ 4 - 4
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 4 - 4
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 2 - 2
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 2 - 2
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 4 - 4
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 3 - 3
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 3 - 3
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 2 - 2
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 2 - 2
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**

+ 4 - 4
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
    * @return
    */
    */
   override def get_change_content(old_map: Map[String, String], new_map: Map[String, String], cname: String = null): String = {
   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
   }
   }
 
 
   /**
   /**