"...model/git@gitlab.ruzhoukj.com:wujipeng/relation.git" did not exist on "b7bf18795ae166608e730c8214668dafd2bb837a"
Commit d94136b1 authored by wujipeng's avatar wujipeng
Browse files

画布上传文件-单个处理

parent 3bc626f3
...@@ -5,6 +5,8 @@ import com.platform.model.entity.FileUploadEntity; ...@@ -5,6 +5,8 @@ import com.platform.model.entity.FileUploadEntity;
import com.platform.model.vo.FileUploadVO; import com.platform.model.vo.FileUploadVO;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.util.List;
/** /**
* @author wujipeng * @author wujipeng
* @version 1.0 * @version 1.0
......
...@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSON; ...@@ -4,10 +4,12 @@ import com.alibaba.fastjson.JSON;
import com.platform.model.entity.ExcelDataEntity; import com.platform.model.entity.ExcelDataEntity;
import com.platform.model.entity.ExcelTemplateEntity; import com.platform.model.entity.ExcelTemplateEntity;
import com.platform.model.resp.Result; import com.platform.model.resp.Result;
import com.platform.model.vo.FileUploadVO;
import com.platform.model.vo.TableHeaderVO; import com.platform.model.vo.TableHeaderVO;
import com.platform.service.AnalysisService; import com.platform.service.AnalysisService;
import com.platform.service.ExcelDataService; import com.platform.service.ExcelDataService;
import com.platform.service.ExcelTemplateService; import com.platform.service.ExcelTemplateService;
import com.platform.service.FileUploadService;
import com.platform.utils.DateUtils; import com.platform.utils.DateUtils;
import org.apache.commons.compress.utils.Lists; import org.apache.commons.compress.utils.Lists;
import org.apache.poi.hssf.usermodel.HSSFWorkbook; import org.apache.poi.hssf.usermodel.HSSFWorkbook;
...@@ -41,6 +43,9 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -41,6 +43,9 @@ public class AnalysisServiceImpl implements AnalysisService {
@Resource @Resource
private ExcelDataService excelDataService; private ExcelDataService excelDataService;
@Resource
private FileUploadService fileUploadService;
private static final String[] EXCEL_EXTENSIONS = {".xlsx", ".xls"}; private static final String[] EXCEL_EXTENSIONS = {".xlsx", ".xls"};
@Override @Override
...@@ -57,7 +62,10 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -57,7 +62,10 @@ public class AnalysisServiceImpl implements AnalysisService {
// 检查是否是Excel文件 // 检查是否是Excel文件
else if (isExcelFile(file.getOriginalFilename())) { else if (isExcelFile(file.getOriginalFilename())) {
File tempFile = convertMultipartFileToFile(file); File tempFile = convertMultipartFileToFile(file);
return Result.data(processSingleExcelFile(tempFile,ExcelTemplate)); processSingleExcelFile(tempFile,ExcelTemplate);
//文件上传
FileUploadVO fileUploadVO = fileUploadService.uploadFile(file);
return Result.data(fileUploadVO);
} }
// 检查是否是目录(通过检查是否没有扩展名) // 检查是否是目录(通过检查是否没有扩展名)
else if (isLikelyDirectory(file.getOriginalFilename())) { else if (isLikelyDirectory(file.getOriginalFilename())) {
...@@ -167,7 +175,7 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -167,7 +175,7 @@ public class AnalysisServiceImpl implements AnalysisService {
} }
// 处理单个Excel文件 // 处理单个Excel文件
private String processSingleExcelFile(File excelFile,ExcelTemplateEntity ExcelTemplate) throws IOException { private void processSingleExcelFile(File excelFile,ExcelTemplateEntity ExcelTemplate) throws IOException {
String json = ExcelTemplate.getJson(); String json = ExcelTemplate.getJson();
List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class); List<TableHeaderVO> tableHeaderList = JSON.parseArray(json, TableHeaderVO.class);
...@@ -185,7 +193,6 @@ public class AnalysisServiceImpl implements AnalysisService { ...@@ -185,7 +193,6 @@ public class AnalysisServiceImpl implements AnalysisService {
} }
//保存excel数据 //保存excel数据
excelDataService.saveBatch(excelData); excelDataService.saveBatch(excelData);
return "处理单个Excel文件:\n";
} }
private void handleExcelData(List<TableHeaderVO> tableHeaderList, Row row, List<ExcelDataEntity> excelData) { private void handleExcelData(List<TableHeaderVO> tableHeaderList, Row row, List<ExcelDataEntity> excelData) {
......
...@@ -26,7 +26,7 @@ import java.util.Date; ...@@ -26,7 +26,7 @@ import java.util.Date;
*/ */
@Service @Service
@Slf4j @Slf4j
public class BsFileUploadServiceImpl extends public class FileUploadServiceImpl extends
ServiceImpl<FileUploadMapper, FileUploadEntity> implements FileUploadService { ServiceImpl<FileUploadMapper, FileUploadEntity> implements FileUploadService {
private static String UPLOAD_DIR = "/home/back/relation/file/"; private static String UPLOAD_DIR = "/home/back/relation/file/";
......
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