feat: ng空间下企业动态

src/main/scala/com/winhc/bigdata/spark/ng/change/NgChangeExtract.scala

@@ -183,9 +183,11 @@ object NgChangeExtract {
 
 
   private val startArgs = Seq(
-    Args(tableName = "company_holder", primaryFields = "percent,deleted")
+    Args(tableName = "company_holder", primaryFields = "amount,deleted")
     , Args(tableName = "company_staff", primaryFields = "staff_type,deleted")
     , Args(tableName = "company", primaryKey = "company_id", primaryFields = "name,cate_third_code,county_code,reg_capital_amount,legal_entity_name,deleted")
+    , Args(tableName = "company_tm", primaryFields = "status")
+    , Args(tableName = "company_icp", primaryFields = "domain")
   )
 
 

src/main/scala/com/winhc/bigdata/spark/ng/change/NgCompanyChangeHandle.scala

@@ -1,6 +1,7 @@
 package com.winhc.bigdata.spark.ng.change
 
 import com.winhc.bigdata.spark.utils.BaseUtil.cleanup
+import org.apache.commons.lang3.StringUtils
 import org.apache.spark.internal.Logging
 
 import scala.annotation.meta.{getter, setter}
@@ -139,4 +140,12 @@ trait NgCompanyChangeHandle extends Serializable with Logging {
       (eq, tmp.filter(!_._2).map(_._1).mkString(","))
     }
   }
+
+  protected def getValueOrNull(value: String, callBack: String): String = {
+    if (StringUtils.isNotBlank(value)) {
+      callBack
+    } else {
+      null
+    }
+  }
 }

src/main/scala/com/winhc/bigdata/spark/ng/change/table/company.scala

@@ -26,7 +26,7 @@ case class company(equCols: Seq[String]) extends NgCompanyChangeHandle with Seri
    * @param newMap
    * @return
    */
-  override protected def getUpdateTitle(newMap: Map[String, String]): String = ""
+  override protected def getUpdateTitle(newMap: Map[String, String]): String = "公司基本信息发生变化"
 
   /**
    * 如果数据发生新增，则显示该标题
@@ -34,7 +34,7 @@ case class company(equCols: Seq[String]) extends NgCompanyChangeHandle with Seri
    * @param newMap
    * @return
    */
-  override protected def getInsertTitle(newMap: Map[String, String]): String = ""
+  override protected def getInsertTitle(newMap: Map[String, String]): String = null
 
   /**
    * 如果数据发生移除，则显示该标题，deleted:x->9 删除不算
@@ -42,7 +42,7 @@ case class company(equCols: Seq[String]) extends NgCompanyChangeHandle with Seri
    * @param newMap
    * @return
    */
-  override protected def getDeletedTitle(newMap: Map[String, String]): String = ""
+  override protected def getDeletedTitle(newMap: Map[String, String]): String = null
 
   /**
    * 用于展示的标签
@@ -51,7 +51,7 @@ case class company(equCols: Seq[String]) extends NgCompanyChangeHandle with Seri
    * @param newMap
    * @return
    */
-  override protected def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ""
+  override protected def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = null
 
   /**
    * 获取变更的业务时间

src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_holder.scala

@@ -17,7 +17,7 @@ case class company_holder(equCols: Seq[String]) extends NgCompanyChangeHandle wi
    * @param newMap
    * @return
    */
-  override protected def getUpdateTitle(newMap: Map[String, String]): String = ""
+  override protected def getUpdateTitle(newMap: Map[String, String]): String = newMap("holder_name") + "股东出资发生变化"
 
   /**
    * 如果数据发生新增，则显示该标题
@@ -25,7 +25,7 @@ case class company_holder(equCols: Seq[String]) extends NgCompanyChangeHandle wi
    * @param newMap
    * @return
    */
-  override protected def getInsertTitle(newMap: Map[String, String]): String = ""
+  override protected def getInsertTitle(newMap: Map[String, String]): String = "新增股东：" + newMap("holder_name")
 
   /**
    * 如果数据发生移除，则显示该标题，deleted:x->9 删除不算
@@ -33,7 +33,7 @@ case class company_holder(equCols: Seq[String]) extends NgCompanyChangeHandle wi
    * @param newMap
    * @return
    */
-  override protected def getDeletedTitle(newMap: Map[String, String]): String = ""
+  override protected def getDeletedTitle(newMap: Map[String, String]): String = newMap("holder_name") + "股东退出"
 
   /**
    * 用于展示的标签

src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_icp.scala

@@ -0,0 +1,63 @@
+
+package com.winhc.bigdata.spark.ng.change.table
+
+import com.winhc.bigdata.spark.ng.change.NgCompanyChangeHandle
+import com.winhc.bigdata.spark.utils.ChangeExtractUtils
+
+/**
+ * @Author: XuJiakai
+ * @Date: 2020/7/9 16:44
+ * @Description:
+ */
+//网站
+case class company_icp(equCols: Seq[String]) extends NgCompanyChangeHandle {
+  /*
+    override def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("domain"), s"${newMap("domain")}网站备案发生变更")
+
+    override def getInsertTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("domain"), s"新增${newMap("domain")}网站备案")
+
+    override def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.get_ip_tags("网站备案", newMap("domain"), newMap("examine_date"), newMap("liscense"))
+  */
+
+  //  override def getBizTime(newMap: Map[String, String]): String = newMap("examine_date")
+  /**
+   * 如果数据发生更新，则显示该标题
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getUpdateTitle(newMap: Map[String, String]): String = null
+
+  /**
+   * 如果数据发生新增，则显示该标题
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getInsertTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("domain"), s"新增${newMap("domain")}网站备案")
+
+  /**
+   * 如果数据发生移除，则显示该标题，deleted:x->9 删除不算
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getDeletedTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("domain"), s"移除${newMap("domain")}网站备案")
+
+  /**
+   * 用于展示的标签
+   *
+   * @param oldMap
+   * @param newMap
+   * @return
+   */
+  override protected def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.get_ip_tags("网站备案", newMap("domain"), newMap("examine_date"), newMap("liscense"))
+
+  /**
+   * 获取变更的业务时间
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getBizDate(newMap: Map[String, String]): String = newMap("examine_date")
+}

src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_staff.scala

@@ -17,7 +17,7 @@ case class company_staff(equCols: Seq[String]) extends NgCompanyChangeHandle wit
    * @param newMap
    * @return
    */
-  override protected def getUpdateTitle(newMap: Map[String, String]): String = ""
+  override protected def getUpdateTitle(newMap: Map[String, String]): String = null
 
   /**
    * 如果数据发生新增，则显示该标题
@@ -25,7 +25,7 @@ case class company_staff(equCols: Seq[String]) extends NgCompanyChangeHandle wit
    * @param newMap
    * @return
    */
-  override protected def getInsertTitle(newMap: Map[String, String]): String = ""
+  override protected def getInsertTitle(newMap: Map[String, String]): String = "新增主要成员：" + newMap("staff_name")
 
   /**
    * 如果数据发生移除，则显示该标题，deleted:x->9 删除不算
@@ -33,7 +33,7 @@ case class company_staff(equCols: Seq[String]) extends NgCompanyChangeHandle wit
    * @param newMap
    * @return
    */
-  override protected def getDeletedTitle(newMap: Map[String, String]): String = ""
+  override protected def getDeletedTitle(newMap: Map[String, String]): String = newMap("staff_name") + "主要成员退出"
 
   /**
    * 用于展示的标签

src/main/scala/com/winhc/bigdata/spark/ng/change/table/company_tm.scala

@@ -0,0 +1,56 @@
+
+package com.winhc.bigdata.spark.ng.change.table
+
+import com.winhc.bigdata.spark.ng.change.NgCompanyChangeHandle
+import com.winhc.bigdata.spark.utils.{ChangeExtractUtils, DateUtils}
+
+/**
+ * @Author: XuJiakai
+ * @Date: 2020/7/9 16:44
+ * @Description:
+ */
+//商标
+case class company_tm(equCols: Seq[String]) extends NgCompanyChangeHandle {
+  /**
+   * 如果数据发生更新，则显示该标题
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getUpdateTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("tm_name"), s"${newMap("tm_name")}商标发生变更")
+
+  /**
+   * 如果数据发生新增，则显示该标题
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getInsertTitle(newMap: Map[String, String]): String = getValueOrNull(newMap("tm_name"), s"新增${newMap("tm_name")}商标")
+
+  /**
+   * 如果数据发生移除，则显示该标题，deleted:x->9 删除不算
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getDeletedTitle(newMap: Map[String, String]): String = null
+
+  /**
+   * 用于展示的标签
+   *
+   * @param oldMap
+   * @param newMap
+   * @return
+   */
+  override protected def getLabel(oldMap: Map[String, String], newMap: Map[String, String]): String = ChangeExtractUtils.get_ip_tags("商标", newMap("tm_name"), newMap("app_date"), newMap("reg_no"))
+
+
+  /**
+   * 获取变更的业务时间
+   *
+   * @param newMap
+   * @return
+   */
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("app_date"), newMap("update_time"))
+
+}