晏永年 4 jaren geleden
bovenliggende
commit
15e48e5bd8

+ 8 - 6
src/main/scala/com/winhc/bigdata/spark/jobs/JustiCase.scala

@@ -30,12 +30,12 @@ case class JustiCase(s: SparkSession,
          |SELECT  *,get_justicase_id(case_no) AS case_no_hash
          |FROM    $project.ods_$tableName
          |WHERE   ds=${ods_ds} AND ${toCol} IS NOT NULL AND LENGTH(${fromCol})>1
+         |""".stripMargin)
+/*
          |UNION
          |SELECT  *,get_justicase_id(case_no) AS case_no_hash
          |FROM    $project.inc_ods_$tableName
          |WHERE   ds=${inc_ods_ds} AND ${toCol} IS NOT NULL AND LENGTH(${fromCol})>1
-         |""".stripMargin)
-/*
           s"""SELECT *,get_justicase_id(case_no) AS case_no_hash FROM (
              |SELECT '(2016)闽02刑更704号' AS case_no, '(2008)厦刑初字第69号\n(2009)闽刑终字第133号\n(2012)厦刑执字第628号\n(2015)厦刑执字第485号' AS connect_case_no
              |UNION
@@ -88,10 +88,6 @@ case class JustiCase(s: SparkSession,
          |  SELECT  get_justicase_id(CASE_NO) AS case_no_hash, '0' AS flag, *
          |  FROM    $project.ods_$tableName
          |  WHERE   ds=${ods_ds}  AND ${toCol} IS NOT NULL
-         |  UNION
-         |  SELECT  get_justicase_id(CASE_NO) AS case_no_hash, '0' AS flag, *
-         |  FROM    $project.inc_ods_$tableName
-         |  WHERE   ds=${inc_ods_ds} AND ${toCol} IS NOT NULL
          |) A
          |LEFT JOIN
          |(
@@ -99,6 +95,12 @@ case class JustiCase(s: SparkSession,
          |) B
          |ON A.case_no_hash=B.case_no_hash
          |""".stripMargin)//.createOrReplaceTempView(s"tmp_graphx_$tableName")
+    /*
+         |  UNION
+         |  SELECT  get_justicase_id(CASE_NO) AS case_no_hash, '0' AS flag, *
+         |  FROM    $project.inc_ods_$tableName
+         |  WHERE   ds=${inc_ods_ds} AND ${toCol} IS NOT NULL
+    */
   }
 }
 

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/jobs/dynamic/tables/company_annual_report_out_guarantee.scala

@@ -42,5 +42,5 @@ case class company_annual_report_out_guarantee()extends CompanyDynamicHandle {
    * @param new_map
    * @return
    */
-  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "提示信息"
+  override def get_info_risk_level(old_map: Map[String, String], new_map: Map[String, String]): String = "2"
 }

+ 1 - 1
src/main/scala/com/winhc/bigdata/spark/utils/BaseUtil.scala

@@ -116,7 +116,7 @@ object BaseUtil {
     }
   }
   def BKDRHash(str: String): Long = {
-    val seed: Long = 131 // 31 131 1313 13131 131313 etc..
+    val seed: Long = 1313131313 // 31 131 1313 13131 131313 etc..
     var hash: Long = 0
     for (i <- 0 to str.length - 1) {
       hash = hash * seed + str.charAt(i)