Jelajahi Sumber

fix: dynamic_info修改为Any

许家凯 3 tahun lalu
induk
melakukan
5f70adedcb
16 mengubah file dengan 18 tambahan dan 17 penghapusan
  1. 3 3
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/CompanyDynamicRecord.scala
  2. 1 0
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/NgCompanyDynamic.scala
  3. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/NgCompanyDynamicHandle.scala
  4. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/auction_tracking.scala
  5. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_abnormal_info.scala
  6. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_court_announcement.scala
  7. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_court_open_announcement.scala
  8. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_court_register.scala
  9. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_env_punishment.scala
  10. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_illegal_info.scala
  11. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_own_tax.scala
  12. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_punishment_info.scala
  13. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_punishment_info_creditchina.scala
  14. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_send_announcement.scala
  15. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/company_tax_contravention.scala
  16. 1 1
      src/main/scala/com/winhc/bigdata/spark/ng/dynamic/handle/zxr_evaluate_results.scala

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

@@ -39,7 +39,7 @@ case class CompanyDynamicRecord(id: String,
                                 tn: String,
                                 update_type: String,
                                 dynamic_code: String,
-                                dynamic_info: Map[String, String],
+                                dynamic_info: Map[String, Any],
                                 agg_detail_text: String,
                                 agg_detail_rowkey: Seq[RowkeyInfo],
                                 old_record: Map[String, String],
@@ -92,8 +92,8 @@ case class CompanyDynamicRecord(id: String,
       , dynamic_info.toJson()
       , agg_detail_text
       , agg_detail_rowkey_str
-      , old_record.toJson()
-      , new_record.toJson()
+      , null
+      , null
       , s"${tn}_${change_time}"
       , change_time
       , update_time

+ 1 - 0
src/main/scala/com/winhc/bigdata/spark/ng/dynamic/NgCompanyDynamic.scala

@@ -39,6 +39,7 @@ case class NgCompanyDynamic(s: SparkSession,
          |    ,update_type STRING COMMENT '动态类型:insert,update,deleted,remove'
          |    ,risk_level STRING COMMENT '变更风险等级'
          |    ,risk_level_detail STRING COMMENT '变更风险等级'
+         |    ,dynamic_code STRING COMMENT 'dynamic_info code'
          |    ,dynamic_info STRING COMMENT '动态展示层的相关数据,json格式'
          |    ,agg_detail_text STRING COMMENT '聚合类型的json数据,规范优先'
          |    ,agg_detail_rowkey STRING COMMENT '聚合类型rowkey的多项rowkey字段,结构:tn@@rowkey,tn@@rowkey'

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

@@ -28,7 +28,7 @@ trait NgCompanyDynamicHandle extends Serializable with Logging {
 
   protected def getCompanyDynamicRecord(change_extract: ChangeExtract
                                         , dynamic_code: String
-                                        , dynamic_info: Map[String, String]
+                                        , dynamic_info: Map[String, Any]
                                         , update_field: String
                                         , association_entity_info: Seq[AssociationEntityInfo]
                                         , create_time: String = null

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

@@ -13,7 +13,7 @@ import scala.collection.mutable
  * @date: 2021/6/29 15:07
  */
 case class auction_tracking() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -12,7 +12,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DailyAggHandle
  *        经营异常
  */
 case class company_abnormal_info() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     ("", Map(
       "code" -> "301901"
       , "description" -> "新增经营异常"

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

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @date: 2021/6/29 15:07
  */
 case class company_court_announcement() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @date: 2021/6/29 15:07
  */
 case class company_court_open_announcement() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -12,7 +12,7 @@ import scala.collection.mutable
  * @date: 2021/6/29 15:07
  */
 case class company_court_register() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DailyAggHandle
  * @date: 2021/6/29 15:07
  */
 case class company_env_punishment() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DailyAggHandle
  * @date: 2021/6/29 15:07
  */
 case class company_illegal_info() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DailyAggHandle
  * @date: 2021/6/29 15:07
  */
 case class company_own_tax() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DailyAggHandle
  * @date: 2021/6/29 15:07
  */
 case class company_punishment_info() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -10,7 +10,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DailyAggHandle
  * @date: 2021/6/29 15:07
  */
 case class company_punishment_info_creditchina() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     null
   }
 

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

@@ -13,7 +13,7 @@ import scala.collection.mutable
  * @date: 2021/6/29 15:07
  */
 case class company_send_announcement() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     ("",Map(
       "code" -> "301701"
       , "description" -> "新增送达公告"

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

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.utils.DailyAggHandle
  * @date: 2021/6/29 15:07
  */
 case class company_tax_contravention() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     ("", Map(
       "code" -> "301801"
       , "description" -> "新增询价评估"

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

@@ -11,7 +11,7 @@ import com.winhc.bigdata.spark.ng.dynamic.{AssociationEntityInfo, NgCompanyRiskL
  * @date: 2021/6/29 15:07
  */
 case class zxr_evaluate_results() extends DailyAggHandle {
-  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, String]) = {
+  override def getDynamicInfo(new_data: Map[String, String]): (String, Map[String, Any]) = {
     ("",Map(
       "code" -> "301901"
       , "description" -> "新增询价评估"