wx-group / juvenile-prosecution

Commit 28334b9f666685737c041a91584887b7b2af4ced

Authored by wxy
2 parents 7f4d2506 070f9a9f

Merge branch 'master' of http://47.92.121.189:8081/wx-group/juvenile-prosecution

Inline Side-by-side
Showing 1 changed file with 9 additions and 9 deletions
juvenile-prosecution-boot/jeecg-boot-module-system/src/main/java/org/jeecg/modules/handle/service/SparkEtlService.java
  View file @28334b9
... ... @@ -61,9 +61,9 @@ public class SparkEtlService implements Serializable {
61 61 //SaveMode.Ignore 若表不存在，则创建表，并存入数据；若表存在的情况下，直接跳过数据的存储，不会报错
62 62 private SaveMode SPARK_MODE = SaveMode.Append;
63 63  
64   - private String TABLE_MINOR = "mr_minor_copy1";
65   - private String TABLE_FAMILY = "mr_family_copy1";
66   - private String TABLE_SCHOOL = "mr_school_copy1";
  64 + private String TABLE_MINOR = "mr_minor";
  65 + private String TABLE_FAMILY = "mr_family";
  66 + private String TABLE_SCHOOL = "mr_school";
67 67  
68 68 @PostConstruct
69 69 private void init() {
... ... @@ -147,7 +147,7 @@ public class SparkEtlService implements Serializable {
147 147 JavaRDD<Row> rowRDD = minorsJavaRDD.zipWithUniqueId().map(new Function<Tuple2<Minor, Long>, Row>() {
148 148 @Override
149 149 public Row call(Tuple2<Minor, Long> v1) throws Exception {
150   - String id = v1._2.toString();
  150 + long id = v1._2;
151 151 Minor minor = v1._1;
152 152 String name = minor.getName();
153 153 String sys_org_code = minor.getSysOrgCode();
... ... @@ -197,7 +197,7 @@ public class SparkEtlService implements Serializable {
197 197 // schemaFields.add(DataTypes.createStructField("updateTime", DataTypes.StringType, true));
198 198  
199 199 List<StructField> schemaFields = new ArrayList<StructField>();
200   - schemaFields.add(DataTypes.createStructField("id", DataTypes.StringType, false));
  200 + schemaFields.add(DataTypes.createStructField("id", DataTypes.IntegerType, false));
201 201 schemaFields.add(DataTypes.createStructField("name", DataTypes.StringType, true));
202 202 schemaFields.add(DataTypes.createStructField("sys_org_code", DataTypes.StringType, true));
203 203 schemaFields.add(DataTypes.createStructField("household_num", DataTypes.StringType, true));
... ... @@ -243,7 +243,7 @@ public class SparkEtlService implements Serializable {
243 243 JavaRDD<Row> rowRDD = familiesJavaRDD.zipWithUniqueId().map(new Function<Tuple2<Family, Long>, Row>() {
244 244 @Override
245 245 public Row call(Tuple2<Family, Long> v1) throws Exception {
246   - String id = v1._2.toString();
  246 + long id = v1._2;
247 247 Family family = v1._1;
248 248 String name = family.getName();
249 249 String sys_org_code = family.getSysOrgCode();
... ... @@ -281,7 +281,7 @@ public class SparkEtlService implements Serializable {
281 281 // schemaFields.add(DataTypes.createStructField("reason", DataTypes.StringType, true));
282 282 // schemaFields.add(DataTypes.createStructField("other", DataTypes.StringType, true));
283 283 // schemaFields.add(DataTypes.createStructField("createTime", DataTypes.StringType, true));
284   - schemaFields.add(DataTypes.createStructField("id", DataTypes.StringType, false));
  284 + schemaFields.add(DataTypes.createStructField("id", DataTypes.IntegerType, false));
285 285 schemaFields.add(DataTypes.createStructField("name", DataTypes.StringType, true));
286 286 schemaFields.add(DataTypes.createStructField("sys_org_code", DataTypes.StringType, true));
287 287 schemaFields.add(DataTypes.createStructField("household_num", DataTypes.StringType, true));
... ... @@ -327,7 +327,7 @@ public class SparkEtlService implements Serializable {
327 327 JavaRDD<Row> rowRDD = mrSchoolsJavaRDD.zipWithUniqueId().map(new Function<Tuple2<MrSchool, Long>, Row>() {
328 328 @Override
329 329 public Row call(Tuple2<MrSchool, Long> v1) throws Exception {
330   - String id = v1._2.toString();
  330 + long id = v1._2;
331 331 MrSchool mrSchool = v1._1;
332 332 String name = mrSchool.getName();
333 333 String sys_org_code = mrSchool.getSysOrgCode();
... ... @@ -370,7 +370,7 @@ public class SparkEtlService implements Serializable {
370 370 // schemaFields.add(DataTypes.createStructField("phoneTwo", DataTypes.StringType, true));
371 371 // schemaFields.add(DataTypes.createStructField("phone", DataTypes.StringType, true));
372 372 // schemaFields.add(DataTypes.createStructField("createTime", DataTypes.StringType, true));
373   - schemaFields.add(DataTypes.createStructField("id", DataTypes.StringType, false));
  373 + schemaFields.add(DataTypes.createStructField("id", DataTypes.IntegerType, false));
374 374 schemaFields.add(DataTypes.createStructField("name", DataTypes.StringType, true));
375 375 schemaFields.add(DataTypes.createStructField("sys_org_code", DataTypes.StringType, true));
376 376 schemaFields.add(DataTypes.createStructField("identity", DataTypes.StringType, true));
... ...