Merge remote-tracking branch 'origin/master'

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

@@ -41,7 +41,7 @@ case class company_bid_list() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 
   /**
    *

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

@@ -44,5 +44,5 @@ case class company_brief_cancel_announcement() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "高风险信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "4"
 }

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

@@ -1,35 +0,0 @@
-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_brief_cancel_announcement_result()  extends CompanyDynamicHandle {
-  /**
-    * 信息描述
-    *
-    * @param old_map
-    * @param new_map
-    * @return
-    */
-  override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = new_map.getOrElse("name", null)
-
-
-  /**
-    * 风险等级
-    *
-    * @param old_map
-    * @param new_map
-    * @return
-    */
-  override protected def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "高风险"
-
-  /**
-    * 变更内容
-    *
-    * @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): String = new_map.toJson(Seq("cname->公司名称", "brief_cancel_result->简易注销结果", "announcement_apply_date->公告申请日期"))
-
-}

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

@@ -42,5 +42,5 @@ case class company_env_punishment()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "警示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "3"
 }

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

@@ -42,5 +42,5 @@ case class company_land_announcement() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "利好信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "1"
 }

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

@@ -53,10 +53,10 @@ case class company_land_mortgage() extends CompanyDynamicHandle {
     if (mortType != null && !mortType.isEmpty) {
       //抵押权人
       if(mortType.equals("mortgagee") || mortType.equals("bothtwo")) {
-        "提示信息"
+        "2"
       }
       else{//抵押人
-        "警示信息"
+        "3"
       }
     }
     else{

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

@@ -42,5 +42,5 @@ case class company_land_publicity() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 }

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

@@ -51,10 +51,10 @@ case class company_land_transfer() extends CompanyDynamicHandle {
     if (mortType != null && !mortType.isEmpty) {
       //现有土地使用权人
       if(mortType.equals("now") || mortType.equals("bothtwo")) {
-        "提示信息"
+        "2"
       }
       else{//原有土地使用权人
-        "警示信息"
+        "3"
       }
     }
     else{

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

@@ -44,5 +44,5 @@ case class company_liquidating_info() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "高风险信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "4"
 }

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

@@ -45,5 +45,5 @@ case class company_mortgage_info() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "警示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "3"
 }

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

@@ -47,7 +47,7 @@ case class company_public_announcement2_list()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
   /**
    *
    * @param rowkey

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

@@ -46,5 +46,5 @@ case class company_punishment_info() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "警示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "3"
 }

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

@@ -46,5 +46,5 @@ case class company_punishment_info_creditchina() extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "警示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "3"
 }

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

@@ -48,10 +48,10 @@ case class company_send_announcement_list()extends CompanyDynamicHandle {
   override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = {
     if(new_map("defendant_cids").contains("cid"))//原告
       {
-        "警示信息"
+        "3"
       }
     else {
-        "提示信息"
+        "2"
       }
   }
   /**

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

@@ -45,5 +45,5 @@ case class company_stock_announcement()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 }

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

@@ -47,5 +47,5 @@ case class company_zxr_restrict()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "高风险"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "4"
 }