Browse Source

fix: 企业动态init调整

许家凯 4 years ago
parent
commit
e6353ef6e6

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

@@ -38,7 +38,8 @@ object CompanyDynamic {
         s"""
            |CREATE TABLE IF NOT EXISTS ${getEnvProjectName(env, project)}.$targetTab
            |(
-           |    cid  STRING COMMENT '公司id'
+           |    id  STRING COMMENT '唯一标示,cid-sub_info_type-change_time'
+           |    ,cid  STRING COMMENT '公司id'
            |    ,cname  STRING COMMENT '公司name'
            |    ,info_type STRING COMMENT '变更分类,大类'
            |    ,rta_desc STRING COMMENT '变更信息描述,变更标题'

+ 2 - 1
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/CompanyDynamicForDayCount.scala

@@ -27,7 +27,8 @@ case class CompanyDynamicForDayCount(s: SparkSession,
       s"""
          |CREATE TABLE IF NOT EXISTS ${getEnvProjectName(env, project)}.$targetTab
          |(
-         |    cid  STRING COMMENT '公司id'
+         |    id  STRING COMMENT '唯一标示,cid-sub_info_type-change_time'
+         |    ,cid  STRING COMMENT '公司id'
          |    ,cname  STRING COMMENT '公司name'
          |    ,info_type STRING COMMENT '变更分类,大类'
          |    ,rta_desc STRING COMMENT '变更信息描述,变更标题'

+ 2 - 1
src/main/scala/com/winhc/bigdata/spark/jobs/message/IntellectualMessage.scala

@@ -2,6 +2,7 @@ package com.winhc.bigdata.spark.jobs.message
 
 import java.util.Date
 
+import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamic.env
 import com.winhc.bigdata.spark.jobs.dynamic.CompanyDynamicHandleUtils
 import com.winhc.bigdata.spark.udf.MapAggs
 import com.winhc.bigdata.spark.utils.BaseUtil.isWindows
@@ -53,7 +54,7 @@ case class IntellectualMessage(s: SparkSession, project: String,
   val t6 = s"company_copyright_works_list" //软著作权
   val res_tb = s"$project.tmp_xf_ads_intellectual_message" //聚合结果表
   //  val res_tb_res = s"$project.tmp_xf_ads_intellectual_message_res" //转换输出结果表
-  val res_tb_res = s"winhc_eci.ads_company_dynamic" //转换输出结果表
+  val res_tb_res = s"${getEnvProjectName(env, project)}.ads_company_dynamic" //转换输出结果表
 
   val tn = "intellectual"