|
@@ -1,18 +1,18 @@
|
|
|
package com.ruixuan.salesLeads.utils;
|
|
|
|
|
|
|
|
|
+import cn.hutool.core.text.csv.CsvWriter;
|
|
|
import com.ruixuan.common.utils.StringUtils;
|
|
|
import com.ruixuan.common.utils.file.FileUtils;
|
|
|
import de.siegmar.fastcsv.reader.CsvContainer;
|
|
|
import de.siegmar.fastcsv.reader.CsvReader;
|
|
|
import de.siegmar.fastcsv.reader.CsvRow;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
+import org.apache.poi.util.IOUtils;
|
|
|
+import org.bouncycastle.util.test.Test;
|
|
|
import org.springframework.web.multipart.MultipartFile;
|
|
|
|
|
|
-import java.io.BufferedReader;
|
|
|
-import java.io.File;
|
|
|
-import java.io.FileInputStream;
|
|
|
-import java.io.InputStreamReader;
|
|
|
+import java.io.*;
|
|
|
import java.nio.charset.Charset;
|
|
|
import java.nio.charset.StandardCharsets;
|
|
|
import java.util.ArrayList;
|
|
@@ -50,12 +50,16 @@ public class CsvImportUtil {
|
|
|
CsvContainer csv = csvReader.read(file, Charset.forName("gbk"));
|
|
|
*/
|
|
|
|
|
|
- String encoding = System.getProperty("file.encoding");
|
|
|
- System.out.println("系统编码===="+encoding);
|
|
|
+// String encoding = System.getProperty("file.encoding");
|
|
|
+// System.out.println("系统编码===="+encoding);
|
|
|
+// String os = System.getProperty("os.name");
|
|
|
+// System.out.println("system----------"+os);
|
|
|
|
|
|
String charset = FileUtils.getFileEncoding(file);
|
|
|
System.out.println("文件编码===="+charset);
|
|
|
|
|
|
+ //FileUtils.addBom(file);
|
|
|
+
|
|
|
InputStreamReader isr = new InputStreamReader(new FileInputStream(file),charset);
|
|
|
CsvContainer csv = csvReader.read(isr);
|
|
|
|
|
@@ -74,10 +78,15 @@ public class CsvImportUtil {
|
|
|
|
|
|
rowMap.forEach((key,vlue)->{
|
|
|
System.out.println(key);
|
|
|
- String keyStr = key.replace(" ","");
|
|
|
- vlue = vlue.replace(" ","");
|
|
|
|
|
|
- if (StringUtils.isNotNull(keyStr)){
|
|
|
+ if (StringUtils.isNotNull(key)){
|
|
|
+ String keyStr = key.replace(" ","");
|
|
|
+
|
|
|
+ if (StringUtils.isNotNull(vlue)){
|
|
|
+ vlue = vlue.replace(" ","");
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
|
|
|
if (keyStr.contains("家ID")){
|
|
|
objectMap.put("sellerId",vlue);
|