fix:第三批动态及输出结构调整

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

@@ -57,5 +57,13 @@ object NgChangeExtractArgs {
     , "company_land_publicity"
     , "company_land_transfer"
 
+
+
+    , "company_equity_info"
+//    , "company_equity_pledge"
+    , "company_judicial_assistance"
+    , "company_land_mortgage"
+//    , "company_mortgage_info"
+
   ).map(r => NgChangeExtractArgs(tableName = r))
-}
+}

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

@@ -0,0 +1,13 @@
+
+
+package com.winhc.bigdata.spark.ng.change.table
+
+import com.winhc.bigdata.spark.ng.change.NgCompanyChangeHandle
+import com.winhc.bigdata.spark.utils.DateUtils
+
+case class company_equity_info(equCols: Seq[String], is_inc:Boolean) extends NgCompanyChangeHandle {
+
+
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("reg_date"),newMap("update_time"))
+}
+

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

@@ -0,0 +1,13 @@
+
+
+package com.winhc.bigdata.spark.ng.change.table
+
+import com.winhc.bigdata.spark.ng.change.NgCompanyChangeHandle
+import com.winhc.bigdata.spark.utils.DateUtils
+
+case class company_judicial_assistance(equCols: Seq[String], is_inc:Boolean) extends NgCompanyChangeHandle {
+
+
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("fz_publicity_date"),newMap("update_time"))
+}
+

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

@@ -0,0 +1,13 @@
+
+
+package com.winhc.bigdata.spark.ng.change.table
+
+import com.winhc.bigdata.spark.ng.change.NgCompanyChangeHandle
+import com.winhc.bigdata.spark.utils.DateUtils
+
+case class company_land_mortgage(equCols: Seq[String], is_inc:Boolean) extends NgCompanyChangeHandle {
+
+
+  override protected def getBizDate(newMap: Map[String, String]): String = DateUtils.getBizDate(newMap("start_date"),newMap("update_time"))
+}
+

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/CompanyDynamicRecord.scala

@@ -44,7 +44,8 @@ case class CompanyDynamicRecord(id: String,
                                 dynamic_info: Map[String, Any],
                                 agg_detail_text: String,
                                 agg_detail_rowkey: Seq[RowkeyInfo],
-                                change_time: String,
+                                biz_time:String,
+                                dynamic_time:String,
                                 update_time: String,
                                 create_time: String
                                ) {
@@ -68,8 +69,8 @@ case class CompanyDynamicRecord(id: String,
         dynamic_info,
         agg_detail_text,
         agg_detail_rowkey,
-
-        change_time,
+        biz_time,
+        dynamic_time,
         update_time,
         create_time
       )
@@ -91,8 +92,9 @@ case class CompanyDynamicRecord(id: String,
       , dynamic_info.toJson()
       , agg_detail_text
       , agg_detail_rowkey_str
-      , s"${CollapseKeyArgs.transform(tn)}_${change_time}"
-      , change_time
+      , s"${CollapseKeyArgs.transform(tn)}_${dynamic_time}"
+      , biz_time
+      , dynamic_time
       , update_time
       , create_time
       , 0L

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/NgCompanyDynamic.scala

@@ -43,11 +43,10 @@ case class NgCompanyDynamic(s: SparkSession,
          |    ,dynamic_info STRING COMMENT '动态展示层的相关数据，json格式'
          |    ,agg_detail_text STRING COMMENT '聚合类型的json数据，规范优先'
          |    ,agg_detail_rowkey STRING COMMENT '聚合类型rowkey的多项rowkey字段，结构：tn@@rowkey,tn@@rowkey'
-         |---    ,old_record STRING COMMENT '上一个版本数据json格式'
-         |---    ,new_record STRING COMMENT '当前版本数据json格式'
-         |    ,collapse_key STRING COMMENT '用于折叠的字段，concat_ws("_",tn,change_time)'
-         |    ,change_time string COMMENT '变更时间（业务展示 yyyy-MM-dd）'
-         |    ,update_time STRING  COMMENT  '更新时间'
+         |    ,collapse_key STRING COMMENT '用于折叠的字段，concat_ws("_",tn,dynamic_time)。跟据动态时间来折叠'
+         |    ,biz_time string COMMENT '业务上的变更时间（业务展示 yyyy-MM-dd）'
+         |    ,dynamic_time STRING  COMMENT  '动态时间，用于业务展示（yyyy-MM-dd HH:mm:ss 存量数据为业务变更时间，增量数据为当前动态新建时间）'
+         |    ,update_time STRING COMMENT '更新时间'
          |    ,create_time STRING COMMENT '创建时间'
          |    ,deleted BIGINT  COMMENT '非0删除'
          |)
@@ -184,8 +183,8 @@ object NgCompanyDynamic {
       "spark.hadoop.odps.spark.local.partition.amt" -> "1000000"
     )
     val spark = SparkUtils.InitEnv(this.getClass.getSimpleName, config)
-
-    NgCompanyDynamic(spark, NgCompanyDynamicArgs.getStartArgs, NgCompanyDynamicArgs.getAggArgs, inc = false).calc()
+    val inc = false
+    NgCompanyDynamic(spark, NgCompanyDynamicArgs.getStartArgs(inc), NgCompanyDynamicArgs.getAggArgs, inc = inc).calc()
     spark.stop()
   }
 

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/NgCompanyDynamicArgs.scala

@@ -27,8 +27,8 @@ case class NgAcrossTabAggArgs(tabs: Seq[String]
 
 object NgCompanyDynamicArgs {
 
-  def getStartArgs: Seq[NgCompanyDynamicArgs] = {
-    val handles = ReflectUtils.subObject[NgCompanyDynamicHandle](classOf[NgCompanyDynamicHandle], this.getClass.getPackage.getName)
+  def getStartArgs(is_inc:Boolean = true): Seq[NgCompanyDynamicArgs] = {
+    val handles = ReflectUtils.subObject[NgCompanyDynamicHandle](classOf[NgCompanyDynamicHandle], this.getClass.getPackage.getName,is_inc)
     handles.map(ch => {
       val tn: String = ch.getClass.getSimpleName
       NgCompanyDynamicArgs(tn = tn, flat_map = ch.flat_map, group_by_pre = ch.group_by_pre, group_by_key = ch.group_by_key, group_by_flat_map = ch.group_by_flat_map, filter = ch.filter)
@@ -45,7 +45,7 @@ object NgCompanyDynamicArgs {
   def main(args: Array[String]): Unit = {
 //    val handles = ReflectUtils.subObject[NgCompanyDynamicHandle](classOf[NgCompanyDynamicHandle], this.getClass.getPackage.getName)
 //    val orNull1 = handles.find(_.getClass.getSimpleName.contains("auction_tracking")).get
-    val args1 = getStartArgs
+    val args1 = getStartArgs()
     val orNull = args1.find(_.tn.equals("auction_tracking")).orNull
     orNull.flat_map.apply(null)
     println(args1)

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/NgCompanyDynamicHandle.scala

@@ -3,12 +3,19 @@ package com.winhc.bigdata.spark.ng.dynamic
 import com.winhc.bigdata.spark.ng.dynamic.utils.CompanyDynamicUtils
 import org.apache.spark.internal.Logging
 
+import scala.annotation.meta.{getter, setter}
+
 /**
  * @author: XuJiakai
  * @date: 2021/6/23 10:35
  */
 trait NgCompanyDynamicHandle extends Serializable with Logging {
 
+  @getter
+  @setter
+  protected val is_inc: Boolean //false 为存量
+
+
   def filter: (String, String, Seq[String], Map[String, String], Map[String, String]) => Boolean = CompanyDynamicUtils.default_filter
 
   def flat_map: (ChangeExtract) => Seq[CompanyDynamicRecord]
@@ -41,10 +48,11 @@ trait NgCompanyDynamicHandle extends Serializable with Logging {
     val biz_date = change_extract.biz_date
     val rowkey = change_extract.rowkey
     val update_time = change_extract.update_time
+    val date = if(is_inc) update_time else biz_date
 
 
     CompanyDynamicRecord(
-      id = CompanyDynamicUtils.generateId(rowkey, biz_date, tn, update_field)
+      id = CompanyDynamicUtils.generateId(rowkey, date, tn, update_field)
       , association_entity_info = association_entity_info
       , rowkey = rowkey
       , tn = tn
@@ -53,9 +61,11 @@ trait NgCompanyDynamicHandle extends Serializable with Logging {
       , dynamic_info = dynamic_info
       , agg_detail_text = null
       , agg_detail_rowkey = null
-      , change_time = biz_date
+      , biz_time = biz_date
+      , dynamic_time = date
       , update_time = update_time
       , create_time = create_time
     )
   }
+
 }

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/auction_tracking.scala

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class auction_tracking() extends DailyAggHandle with SimpleDailyDynamic {
+case class auction_tracking(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/bankruptcy_open_case.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        破产信息
  */
-case class bankruptcy_open_case() extends DailyAggHandle with SimpleDailyDynamic {
+case class bankruptcy_open_case(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company.scala

@@ -9,7 +9,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/22 16:04
  */
-case class company() extends NgCompanyDynamicHandle {
+case class company(is_inc:Boolean) extends NgCompanyDynamicHandle {
   private def getCompanyDynamicRecord(change_extract: ChangeExtract, dynamic_code: String, dynamic_info: Map[String, String], update_field: String): CompanyDynamicRecord = {
     val company_id = change_extract.company_id
     val company_name = change_extract.company_name

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_abnormal_info.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/6/29 15:07
  *        经营异常
  */
-case class company_abnormal_info() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_abnormal_info(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_brief_cancel_announcement.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        简易注销
  */
-case class company_brief_cancel_announcement() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_brief_cancel_announcement(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_check_info.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_check_info() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_check_info(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_court_announcement.scala

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_court_announcement() extends DailyAggHandle with ComplexDailyDynamic{
+case class company_court_announcement(is_inc:Boolean) extends DailyAggHandle with ComplexDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_court_open_announcement.scala

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_court_open_announcement() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_court_open_announcement(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_court_register.scala

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_court_register() extends DailyAggHandle  with ComplexDailyDynamic{
+case class company_court_register(is_inc:Boolean) extends DailyAggHandle  with ComplexDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_dishonest_info.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        失信
  */
-case class company_dishonest_info() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_dishonest_info(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_double_random_check_info.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_double_random_check_info() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_double_random_check_info(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_env_punishment.scala

@@ -9,7 +9,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_env_punishment() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_env_punishment(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_equity_info.scala

@@ -0,0 +1,22 @@
+
+
+package com.winhc.bigdata.spark.ng.dynamic.handle
+
+import com.winhc.bigdata.spark.implicits.MapHelper._
+import com.winhc.bigdata.spark.ng.dynamic.utils.{ComplexDailyDynamic, DailyAggHandle}
+import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskLevelType}
+
+/**
+ * @author: XuJiakai
+ * @date: 2021/7/13 15:07
+ *        股权冻结
+ */
+case class company_equity_info(is_inc:Boolean) extends DailyAggHandle with ComplexDailyDynamic {
+
+
+  override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
+    getEntity(new_data.getOrEmptyStr("pledgor_info"),"pledgor_id","pledgor",NgCompanyRiskLevelType.Caution,"")++
+      getEntity(new_data.getOrEmptyStr("pledgee_info"),"pledgee_id","pledgee",NgCompanyRiskLevelType.Positive,"")
+  }
+}
+

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_finance.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_finance() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_finance(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_holder.scala

@@ -8,7 +8,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/23 10:43
  */
-case class company_holder() extends NgCompanyDynamicHandle {
+case class company_holder(is_inc:Boolean) extends NgCompanyDynamicHandle {
   override def flat_map: (ChangeExtract) => Seq[CompanyDynamicRecord] = (change_extract: ChangeExtract) => {
     val change_fields = change_extract.change_fields
     val tn = change_extract.tn

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_illegal_info.scala

@@ -9,7 +9,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_illegal_info() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_illegal_info(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_judicial_assistance.scala

@@ -0,0 +1,27 @@
+
+
+package com.winhc.bigdata.spark.ng.dynamic.handle
+
+import com.winhc.bigdata.spark.implicits.MapHelper._
+import com.winhc.bigdata.spark.ng.dynamic.utils.{ComplexDailyDynamic, DailyAggHandle}
+import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskLevelType}
+
+/**
+ * @author: XuJiakai
+ * @date: 2021/7/13 15:07
+ *        股权冻结
+ */
+case class company_judicial_assistance(is_inc:Boolean) extends DailyAggHandle with ComplexDailyDynamic {
+
+  override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
+    Seq(
+      AssociationEntityInfo(keyno = new_data.getOrEmptyStr("executed_person_id")
+        , name = new_data.getOrEmptyStr("executed_person")
+        , risk_level = NgCompanyRiskLevelType.Caution, null)
+      ,AssociationEntityInfo(keyno = new_data.getOrEmptyStr("company_id")
+        , name = new_data.getOrEmptyStr("company_name")
+        , risk_level = NgCompanyRiskLevelType.Prompt, null)
+    )
+  }
+}
+

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_land_announcement.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        购地信息
  */
-case class company_land_announcement() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_land_announcement(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_land_mortgage.scala

@@ -0,0 +1,28 @@
+
+
+package com.winhc.bigdata.spark.ng.dynamic.handle
+
+import com.winhc.bigdata.spark.implicits.MapHelper._
+import com.winhc.bigdata.spark.ng.dynamic.utils.{ComplexDailyDynamic, DailyAggHandle}
+import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskLevelType}
+
+/**
+ * @author: XuJiakai
+ * @date: 2021/7/13 15:07
+ *        土地抵押
+ */
+case class company_land_mortgage(is_inc:Boolean) extends DailyAggHandle with ComplexDailyDynamic {
+
+
+  override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
+    Seq(
+      AssociationEntityInfo(keyno = new_data.getOrEmptyStr("mortgagor_company_id")
+        , name = new_data.getOrEmptyStr("mortgagor")
+        , risk_level = NgCompanyRiskLevelType.Caution, null)
+      ,AssociationEntityInfo(keyno = new_data.getOrEmptyStr("mortgagee_company_id")
+        , name = new_data.getOrEmptyStr("mortgagee")
+        , risk_level = NgCompanyRiskLevelType.Positive, null)
+    )
+  }
+}
+

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_land_publicity.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        地块公示
  */
-case class company_land_publicity() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_land_publicity(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_land_transfer.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        土地转让
  */
-case class company_land_transfer() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_land_transfer(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_license.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_license() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_license(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_license_creditchina.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_license_creditchina() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_license_creditchina(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_license_entpub.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_license_entpub() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_license_entpub(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_own_tax.scala

@@ -9,7 +9,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_own_tax() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_own_tax(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_public_announcement.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        公示催告
  */
-case class company_public_announcement() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_public_announcement(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_punishment_info.scala

@@ -9,7 +9,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_punishment_info() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_punishment_info(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_punishment_info_creditchina.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DynamicFiledUtils.createDynamicI
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_punishment_info_creditchina() extends DailyAggHandle with ComplexDailyDynamic{
+case class company_punishment_info_creditchina(is_inc:Boolean) extends DailyAggHandle with ComplexDailyDynamic{
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     val keyno = new_data.getOrEmptyStr("company_id")

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_send_announcement.scala

@@ -13,7 +13,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_send_announcement() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_send_announcement(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {
     try {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_tax_contravention.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_tax_contravention() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_tax_contravention(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_zxr.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        被执
  */
-case class company_zxr() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_zxr(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_zxr_final_case.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        终本
  */
-case class company_zxr_final_case() extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_zxr_final_case(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_zxr_restrict.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        限高
  */
-case class company_zxr_restrict() extends DailyAggHandle with SimpleDailyDynamic {
+case class company_zxr_restrict(is_inc:Boolean) extends DailyAggHandle with SimpleDailyDynamic {
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/restrictions_on_exit.scala

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/7/13 15:07
  *        限制出镜
  */
-case class restrictions_on_exit() extends DailyAggHandle  with SimpleDailyDynamic{
+case class restrictions_on_exit(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/zxr_evaluate_results.scala

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class zxr_evaluate_results() extends DailyAggHandle {
+case class zxr_evaluate_results(is_inc:Boolean) extends DailyAggHandle {
   override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     ("",Map(
       "code" -> "301901"

src/main/scala/com/winhc/bigdata/spark/ng/dynamic/utils/DynamicDimConfiguration.scala

@@ -247,9 +247,6 @@ object DynamicDimConfiguration {
     )
 
 
-
-
-
     , "bankruptcy_open_case" -> Map(
       "code" -> Map(
         "insert" -> "303101"
@@ -427,6 +424,55 @@ object DynamicDimConfiguration {
     )
 
 
+    , "company_equity_info" -> Map(
+      "code" -> Map(
+        "insert" -> "303901"
+      ),
+      "name" -> "股权出质",
+      "list_field" -> Map(
+        "related_company_name" -> Map(),
+        "related_company_id" -> Map(),
+        "entity" -> Map(
+          "type" -> "object",
+          "from" -> Seq("pledgee_info", "pledgor_info")
+        ),
+        "equity_amount" -> Map(),
+        "reg_date" -> Map()
+      )
+    )
+
+    , "company_judicial_assistance" -> Map(
+      "code" -> Map(
+        "insert" -> "304101"
+      ),
+      "sample" -> true,
+      "name" -> "股权冻结",
+      "list_field" -> Map(
+        "executed_person_id" -> Map(),
+        "executed_person" -> Map(),
+        "company_name" -> Map(),
+        "company_id" -> Map(),
+        "equity_amount" -> Map()
+      )
+    )
+    , "company_land_mortgage" -> Map(
+      "code" -> Map(
+        "insert" -> "304201"
+      ),
+      "sample" -> true,
+      "name" -> "土地抵押",
+      "list_field" -> Map(
+        "mortgagor_company_id" -> Map()
+        , "mortgagor" -> Map()
+        , "mortgagee_company_id" -> Map()
+        , "mortgagee" -> Map()
+        , "executed_person_name" -> Map()
+        , "executed_person_keyno" -> Map()
+        , "mortgage_amount" -> Map()
+        , "start_date" -> Map()
+        , "end_date" -> Map()
+      )
+    )
 
 
   )