Bladeren bron

fix: 企业动态

- 股东的描述信息
- 动态输出限制,过滤1970年以前数据
许家凯 4 jaren geleden
bovenliggende
commit
d1f370f64e

+ 1 - 0
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamic.scala

@@ -174,6 +174,7 @@ object CompanyDynamic {
            |SELECT ${cols.mkString(",")}
            |FROM
            |    company_dynamic_tmp$tableName
+           |WHERE id IS NOT NULL
            |""".stripMargin)
     }
   }

+ 6 - 1
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamicHandleUtils.scala

@@ -10,6 +10,11 @@ import com.winhc.bigdata.spark.utils.DateUtils
  */
 object CompanyDynamicHandleUtils {
   def getDynamicId(cid: String, rta_desc: String, biz_id: String, change_time: String): String = {
-    s"$cid-${SecureUtil.md5(rta_desc + biz_id)}-${DateUtils.toUnixTimestamp(date = change_time)}"
+    val id = 9999999999L - DateUtils.toUnixTimestamp(date = change_time)
+    // 过滤1970年以前的数据
+    if (id < 0)
+      null
+    else
+      s"${cid}_${id}_${SecureUtil.md5(rta_desc + biz_id)}"
   }
 }

+ 2 - 2
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_holder.scala

@@ -26,9 +26,9 @@ case class company_holder() extends CompanyDynamicHandle {
    */
   override protected def get_rta_desc(old_map: Map[String, String], new_map: Map[String, String]): String = {
     if (old_map == null) {
-      "insert"
+      "新增股东"
     } else {
-      "update"
+      "股东出资发生变化"
     }
   }