bugfix

src/main/scala/com/winhc/bigdata/spark/model/CompanyIntellectualsScore.scala

@@ -74,7 +74,8 @@ object CompanyIntellectualsScore {
     val (flag, time, kind, project) = tabMapping.getOrElse(sourceTable, ("", "", "", ""))
     if (flag.isEmpty || time.isEmpty || kind.isEmpty || project.isEmpty) {
       println("model table not find !!! ")
-      sys.exit(-1)
+      //sys.exit(0)
+      return
     }
 
     //专利分成两部分

src/main/scala/com/winhc/bigdata/spark/utils/BaseUtil.scala

@@ -21,7 +21,7 @@ object BaseUtil {
 
   def getPartion(t: String, @transient spark: SparkSession) = {
     val ps = getPartitions(t, spark)
-    if (ps.length > 1) {
+    if (ps.size > 0) {
       ps.last
     } else {
       ""
@@ -30,7 +30,7 @@ object BaseUtil {
 
   def getFirstPartion(t: String, @transient spark: SparkSession) = {
     val ps = getPartitions(t, spark)
-    if (ps.length > 1) {
+    if (ps.size > 0) {
       ps.head
     } else {
       ""

src/main/scala/com/winhc/bigdata/spark/utils/CompanyIncrForCidUtils.scala

@@ -31,7 +31,7 @@ case class CompanyIncrForCidUtils(s: SparkSession,
     //增量ads最后一个分区
     val lastDsIncAds = BaseUtil.getPartion(inc_ads_company_tb, spark)
 
-    val list = sql(s"show partitions $inc_ods_company").collect.toList.map(_.getString(0).split("=")(1))
+    val list = sql(s"show partitions $inc_ods_company_tb").collect.toList.map(_.getString(0).split("=")(1))
     //增量ods第一个分区
     val firstDsIncOds = list.head
     //增量ods最后一个分区//落表分区
@@ -47,6 +47,7 @@ case class CompanyIncrForCidUtils(s: SparkSession,
 
     println(
       s"""
+         |remainDs:$remainDs
          |lastDsIncOds:$lastDsIncOds
          |lastDsIncAds:$lastDsIncAds
          |runDs:$runDs

src/main/scala/com/winhc/bigdata/spark/utils/CompanyIncrForCidsUtils.scala

@@ -39,7 +39,7 @@ case class CompanyIncrForCidsUtils(s: SparkSession,
     //增量ads最后一个分区
     val lastDsIncAds = BaseUtil.getPartion(inc_ads_company_tb, spark)
 
-    val list = sql(s"show partitions $inc_ods_company").collect.toList.map(_.getString(0).split("=")(1))
+    val list = sql(s"show partitions $inc_ods_company_tb").collect.toList.map(_.getString(0).split("=")(1))
     //增量ods第一个分区
     val firstDsIncOds = list.head
     //增量ods最后一个分区//落表分区
@@ -55,6 +55,7 @@ case class CompanyIncrForCidsUtils(s: SparkSession,
 
     println(
       s"""
+         |remainDs:$remainDs
          |lastDsIncOds:$lastDsIncOds
          |lastDsIncAds:$lastDsIncAds
          |runDs:$runDs