Bläddra i källkod

Merge branch 'master' of http://gogs.seec.seecoder.cn/DingXiaoYu/AI-Backend

191250028 3 år sedan
förälder
incheckning
ec541ff73c

+ 1 - 1
java_compile/src/main/java/com/example/services/FileService.java

@@ -73,7 +73,7 @@ public class FileService {
             }
             //暂时只接受csv
             return  "csv".equals(fileType) ? csvAdapter.Csv2Parquet(file.getAbsolutePath(), filename, userId) : 0;
-        }finally {
+        } finally {
             //上传失败也必须将文件在本地删除,否则会堆积
             file.delete();
         }

+ 2 - 0
java_compile/src/main/scala/com/example/data/CsvAdapter.scala

@@ -64,8 +64,10 @@ class CsvAdapter extends SparkConnect{
     val df = sparkSession.read
       .option("header", "true")
       .option("inferSchema", "true")
+      .option("encoding","GBK")
       .csv(csvHdfsLoc)
       .persist()
+
     /*//-> 2. Preprocessing file(String to Int & nulls fill)
     val strFeatures = df.schema.filter(_.dataType.equals(StringType)).map(_.name)