Commit 029e3e71 authored by wujipeng's avatar wujipeng
Browse files

文件解析优化

parent 92e7440e
package com.platform.model.vo;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModelProperty;
import lombok.AllArgsConstructor;
import lombok.Builder;
......@@ -17,6 +18,7 @@ import java.util.List;
@AllArgsConstructor
@NoArgsConstructor
@Builder
@JsonInclude(JsonInclude.Include.NON_NULL)
public class AnalysisVO {
@ApiModelProperty("文件夹数")
......
......@@ -62,6 +62,33 @@ public class AnalysisServiceImpl implements AnalysisService {
@Override
@Transactional
public Result<?> canvas(List<MultipartFile> files, int caseId, String folderName) throws IOException {
//检查文件
List<AnalysisVO> detail = Lists.newArrayList();
int errorCount = 0;
int totalCount = 0;
for (MultipartFile file : files) {
if (isExcelFile(file.getOriginalFilename())) {
File tempFile = convertMultipartFileToFile(file);
Workbook workbook = getWorkbook(tempFile);
if (ObjectUtils.isEmpty(workbook)) {
errorCount++;
detail.add(AnalysisVO.builder().fileName(file.getOriginalFilename()).errorReason("文件格式错误").build());
}
totalCount++;
} else {
errorCount++;
totalCount++;
detail.add(AnalysisVO.builder().fileName(file.getOriginalFilename()).errorReason("文件格式错误").build());
}
}
if (errorCount > 0) {
return Result.data(400, AnalysisVO.builder()
.detail(detail)
.totalCount(totalCount)
.errorCount(errorCount)
.build(), "部分文件格式错误");
}
//查询模板
ExcelTemplateEntity ExcelTemplate = excelTemplateService.getMaxId();
List<TableHeaderVO> tableHeaderList;
......@@ -94,10 +121,6 @@ public class AnalysisServiceImpl implements AnalysisService {
return Result.fail("上传的文件为空");
}
List<FileUploadVO> fileUploadList = Lists.newArrayList();
//错误数量
List<AnalysisVO> detail = Lists.newArrayList();
int errorCount = 0;
int totalCount = 0;
Map<String, String> groupedMap = Maps.newHashMap();
List<UserAccountEntity> userAccountList = Lists.newArrayList();
List<ExcelDataEntity> excelData = Lists.newArrayList();
......@@ -115,16 +138,7 @@ public class AnalysisServiceImpl implements AnalysisService {
if (b) {
//文件上传
fileUploadList.add(fileUploadVO);
totalCount++;
} else {
errorCount++;
totalCount++;
detail.add(AnalysisVO.builder().folderName(folderName).fileName(file.getOriginalFilename()).errorReason("文件格式错误").build());
}
} else {
errorCount++;
totalCount++;
detail.add(AnalysisVO.builder().folderName(folderName).fileName(file.getOriginalFilename()).errorReason("文件格式错误").build());
}
}
//把tableHeaderList中filter为true索引组成一个数字类型的集合
......@@ -231,11 +245,7 @@ public class AnalysisServiceImpl implements AnalysisService {
.caseId(caseId).build());
}
}
if (errorCount == 0) {
return Result.data(fileUploadList);
} else {
return Result.data(AnalysisVO.builder().folderCount(1).totalCount(totalCount).errorCount(errorCount).detail(detail).build());
}
}
private void deduplicationData(Map<String, ExcelDataEntity> excelDataMap, List<ExcelDataEntity> excelData, List<Integer> filterIndex) {
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment