Browse Source

fix: 动态dynamic_info

许家凯 3 years ago
parent
commit
c9c902f11a

+ 12 - 2
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/NgCompanyDynamic.scala

@@ -93,7 +93,7 @@ case class NgCompanyDynamic(s: SparkSession,
       val filter = args_map(r.tn).filter
       if (filter == null) {
         true
-//        CompanyDynamicUtils.default_filter(r.update_type, r.biz_date, r.change_fields, r.old_data, r.new_data)
+        //        CompanyDynamicUtils.default_filter(r.update_type, r.biz_date, r.change_fields, r.old_data, r.new_data)
       } else {
         filter.apply(r.update_type, r.biz_date, r.change_fields, r.old_data, r.new_data)
       }
@@ -184,7 +184,17 @@ object NgCompanyDynamic {
     )
     val spark = SparkUtils.InitEnv(this.getClass.getSimpleName, config)
     val inc = false
-    NgCompanyDynamic(spark, NgCompanyDynamicArgs.getStartArgs(inc), NgCompanyDynamicArgs.getAggArgs, inc = inc).calc()
+    val tn = "all"
+    var dynamicArgs = NgCompanyDynamicArgs.getStartArgs(inc)
+    var aggArgs = NgCompanyDynamicArgs.getAggArgs
+    if (!"all".equals(tn)) {
+      val set = tn.split(",").toSet
+      dynamicArgs = dynamicArgs.filter(r => set.contains(r.tn))
+      aggArgs = aggArgs.filter(r=>{
+       r.tabs.forall(s => set.contains(s))
+      })
+    }
+    NgCompanyDynamic(spark, dynamicArgs, aggArgs, inc = inc).calc()
     spark.stop()
   }
 }

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

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

+ 2 - 3
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_court_open_announcement.scala

@@ -2,9 +2,8 @@
 
 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}
-import com.winhc.bigdata.spark.ng.dynamic.utils.{DailyAggHandle, SimpleDailyDynamic}
-import com.winhc.bigdata.spark.ng.dynamic.utils.DynamicFiledUtils.createSimpleDynamicInfo
 
 import scala.collection.mutable
 
@@ -12,7 +11,7 @@ import scala.collection.mutable
  * @author: XuJiakai
  * @date: 2021/6/29 15:07
  */
-case class company_court_open_announcement(is_inc:Boolean) extends DailyAggHandle  with SimpleDailyDynamic{
+case class company_court_open_announcement(is_inc:Boolean) extends DailyAggHandle  with ComplexDailyDynamic{
 
 
   override def getAssociationEntityInfo(new_data: Map[String, String]): Seq[AssociationEntityInfo] = {

+ 1 - 6
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/utils/DynamicDimConfiguration.scala

@@ -38,16 +38,12 @@ object DynamicDimConfiguration {
       "code" -> Map(
         "insert" -> "302101"
       ),
-      "sample" -> true,
       "name" -> "开庭公告",
       "list_field" -> Map(
         "start_date" -> Map(),
         "case_no" -> Map(),
         "case_reason" -> Map(),
-    /*    "litigant" -> Map(
-          "type" -> "object",
-          "from" -> Seq("plaintiff_info", "defendant_info")
-        ),*/
+
         "defendant_info" -> Map("type" -> "json"),
         "plaintiff_info" -> Map("type" -> "json")
       )
@@ -255,7 +251,6 @@ object DynamicDimConfiguration {
       "code" -> Map(
         "insert" -> "303101"
       ),
-      "sample" -> true,
       "name" -> "破产信息",
       "list_field" -> Map(
         "case_no" -> Map(),