|
|
@ -10,7 +10,6 @@ import jnpf.model.UploaderVO;
|
|
|
|
import jnpf.util.FilePathUtil;
|
|
|
|
import jnpf.util.FilePathUtil;
|
|
|
|
import jnpf.util.JsonUtil;
|
|
|
|
import jnpf.util.JsonUtil;
|
|
|
|
import jnpf.util.context.SpringContext;
|
|
|
|
import jnpf.util.context.SpringContext;
|
|
|
|
import lombok.Cleanup;
|
|
|
|
|
|
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
|
|
import org.apache.poi.ss.usermodel.Cell;
|
|
|
|
import org.apache.poi.ss.usermodel.CellType;
|
|
|
|
import org.apache.poi.ss.usermodel.CellType;
|
|
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
|
|
import org.apache.poi.ss.usermodel.Row;
|
|
|
@ -74,7 +73,7 @@ public class FileCopy {
|
|
|
|
} else {
|
|
|
|
} else {
|
|
|
|
// 这个文件图片的信息
|
|
|
|
// 这个文件图片的信息
|
|
|
|
ArrayList<Object> list = new ArrayList<>();
|
|
|
|
ArrayList<Object> list = new ArrayList<>();
|
|
|
|
@Cleanup InputStream input = new FileInputStream(file);
|
|
|
|
InputStream input = new FileInputStream(file);
|
|
|
|
|
|
|
|
|
|
|
|
// MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
|
|
|
|
// MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
|
|
|
|
MultipartFile multipartFile = new MultipartFileDto(file.getName(), file.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
|
|
|
|
MultipartFile multipartFile = new MultipartFileDto(file.getName(), file.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
|
|
|
@ -82,6 +81,7 @@ public class FileCopy {
|
|
|
|
ActionResult annex = utilsController.uploader(multipartFile, "annex");
|
|
|
|
ActionResult annex = utilsController.uploader(multipartFile, "annex");
|
|
|
|
|
|
|
|
|
|
|
|
UploaderVO data = (UploaderVO)annex.getData();
|
|
|
|
UploaderVO data = (UploaderVO)annex.getData();
|
|
|
|
|
|
|
|
|
|
|
|
String url = data.getUrl();
|
|
|
|
String url = data.getUrl();
|
|
|
|
Map<String,Object> dataMap= JsonUtil.entityToMap(annex.getData());
|
|
|
|
Map<String,Object> dataMap= JsonUtil.entityToMap(annex.getData());
|
|
|
|
if (!dataMap.containsKey("fileId")) {
|
|
|
|
if (!dataMap.containsKey("fileId")) {
|
|
|
@ -110,11 +110,12 @@ public class FileCopy {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
// 将车辆照片存在车辆照片中
|
|
|
|
// 将车辆照片存在车辆照片中
|
|
|
|
|
|
|
|
input.close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
if (i == fileList.length - 1) {
|
|
|
|
if (i == fileList.length - 1) {
|
|
|
|
if (excelFile != null) {
|
|
|
|
if (excelFile != null) {
|
|
|
|
ExcelReader reader = ExcelUtil.getReader(excelFile);
|
|
|
|
ExcelReader reader = ExcelUtil.getReader(excelFile);
|
|
|
|
|
|
|
|
|
|
|
|
reader.setIgnoreEmptyRow(true);
|
|
|
|
reader.setIgnoreEmptyRow(true);
|
|
|
|
// List<HashMap> read = reader.read(3, reader.read().size(), HashMap.class);
|
|
|
|
// List<HashMap> read = reader.read(3, reader.read().size(), HashMap.class);
|
|
|
|
// List<Object> objects1 = reader.readRow(0);
|
|
|
|
// List<Object> objects1 = reader.readRow(0);
|
|
|
@ -206,7 +207,8 @@ public class FileCopy {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
writer.flush(excelFile);
|
|
|
|
writer.flush(excelFile);
|
|
|
|
writer.close();
|
|
|
|
writer.close();
|
|
|
|
@Cleanup InputStream input = new FileInputStream(excelFile);
|
|
|
|
reader.close();
|
|
|
|
|
|
|
|
InputStream input = new FileInputStream(excelFile);
|
|
|
|
|
|
|
|
|
|
|
|
// MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
|
|
|
|
// MultipartFile multipartFile = new MultipartFileDto(file.getName(),input);
|
|
|
|
MultipartFile multipartFile = new MultipartFileDto(excelFile.getName(), excelFile.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
|
|
|
|
MultipartFile multipartFile = new MultipartFileDto(excelFile.getName(), excelFile.getName(), ContentType.JSON.toString(), FileCopyUtils.copyToByteArray(input));
|
|
|
@ -222,11 +224,16 @@ public class FileCopy {
|
|
|
|
resultList.add(fileMap);
|
|
|
|
resultList.add(fileMap);
|
|
|
|
return resultList;
|
|
|
|
return resultList;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
input.close();
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
resultList.add(fileName);
|
|
|
|
resultList.add(fileName);
|
|
|
|
resultList.add(carFileMap);
|
|
|
|
resultList.add(carFileMap);
|
|
|
|
resultList.add(fileMap);
|
|
|
|
resultList.add(fileMap);
|
|
|
|