From 070f9a9f5d4e47d0e0f96d333d2f6c2de34ce529 Mon Sep 17 00:00:00 2001
From: sh <2022704648@qq.com>
Date: Mon, 1 Aug 2022 14:08:33 +0800
Subject: [PATCH] 修改Spark 入库时 id为int

---
 juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/handle/service/SparkEtlService.java | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/handle/service/SparkEtlService.java b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/handle/service/SparkEtlService.java
index 548e6d5..cbb3429 100644
--- a/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/handle/service/SparkEtlService.java
+++ b/juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/handle/service/SparkEtlService.java
@@ -61,9 +61,9 @@ public class SparkEtlService implements Serializable {
     //SaveMode.Ignore 若表不存在，则创建表，并存入数据；若表存在的情况下，直接跳过数据的存储，不会报错
     private SaveMode SPARK_MODE = SaveMode.Append;
 
-    private String TABLE_MINOR = "mr_minor_copy1";
-    private String TABLE_FAMILY = "mr_family_copy1";
-    private String TABLE_SCHOOL = "mr_school_copy1";
+    private String TABLE_MINOR = "mr_minor";
+    private String TABLE_FAMILY = "mr_family";
+    private String TABLE_SCHOOL = "mr_school";
 
     @PostConstruct
     private void init() {
@@ -147,7 +147,7 @@ public class SparkEtlService implements Serializable {
         JavaRDD<Row> rowRDD = minorsJavaRDD.zipWithUniqueId().map(new Function<Tuple2<Minor, Long>, Row>() {
             @Override
             public Row call(Tuple2<Minor, Long> v1) throws Exception {
-                String id = v1._2.toString();
+                long id = v1._2;
                 Minor minor = v1._1;
                 String name = minor.getName();
                 String sys_org_code = minor.getSysOrgCode();
@@ -197,7 +197,7 @@ public class SparkEtlService implements Serializable {
 //        schemaFields.add(DataTypes.createStructField("updateTime", DataTypes.StringType, true));
 
         List<StructField> schemaFields = new ArrayList<StructField>();
-        schemaFields.add(DataTypes.createStructField("id", DataTypes.StringType, false));
+        schemaFields.add(DataTypes.createStructField("id", DataTypes.IntegerType, false));
         schemaFields.add(DataTypes.createStructField("name", DataTypes.StringType, true));
         schemaFields.add(DataTypes.createStructField("sys_org_code", DataTypes.StringType, true));
         schemaFields.add(DataTypes.createStructField("household_num", DataTypes.StringType, true));
@@ -243,7 +243,7 @@ public class SparkEtlService implements Serializable {
         JavaRDD<Row> rowRDD = familiesJavaRDD.zipWithUniqueId().map(new Function<Tuple2<Family, Long>, Row>() {
             @Override
             public Row call(Tuple2<Family, Long> v1) throws Exception {
-                String id = v1._2.toString();
+                long id = v1._2;
                 Family family = v1._1;
                 String name = family.getName();
                 String sys_org_code = family.getSysOrgCode();
@@ -281,7 +281,7 @@ public class SparkEtlService implements Serializable {
 //        schemaFields.add(DataTypes.createStructField("reason", DataTypes.StringType, true));
 //        schemaFields.add(DataTypes.createStructField("other", DataTypes.StringType, true));
 //        schemaFields.add(DataTypes.createStructField("createTime", DataTypes.StringType, true));
-        schemaFields.add(DataTypes.createStructField("id", DataTypes.StringType, false));
+        schemaFields.add(DataTypes.createStructField("id", DataTypes.IntegerType, false));
         schemaFields.add(DataTypes.createStructField("name", DataTypes.StringType, true));
         schemaFields.add(DataTypes.createStructField("sys_org_code", DataTypes.StringType, true));
         schemaFields.add(DataTypes.createStructField("household_num", DataTypes.StringType, true));
@@ -327,7 +327,7 @@ public class SparkEtlService implements Serializable {
         JavaRDD<Row> rowRDD = mrSchoolsJavaRDD.zipWithUniqueId().map(new Function<Tuple2<MrSchool, Long>, Row>() {
             @Override
             public Row call(Tuple2<MrSchool, Long> v1) throws Exception {
-                String id = v1._2.toString();
+                long id = v1._2;
                 MrSchool mrSchool = v1._1;
                 String name = mrSchool.getName();
                 String sys_org_code = mrSchool.getSysOrgCode();
@@ -370,7 +370,7 @@ public class SparkEtlService implements Serializable {
 //        schemaFields.add(DataTypes.createStructField("phoneTwo", DataTypes.StringType, true));
 //        schemaFields.add(DataTypes.createStructField("phone", DataTypes.StringType, true));
 //        schemaFields.add(DataTypes.createStructField("createTime", DataTypes.StringType, true));
-        schemaFields.add(DataTypes.createStructField("id", DataTypes.StringType, false));
+        schemaFields.add(DataTypes.createStructField("id", DataTypes.IntegerType, false));
         schemaFields.add(DataTypes.createStructField("name", DataTypes.StringType, true));
         schemaFields.add(DataTypes.createStructField("sys_org_code", DataTypes.StringType, true));
         schemaFields.add(DataTypes.createStructField("identity", DataTypes.StringType, true));
--
libgit2 0.21.4