|
@@ -20,6 +20,7 @@ import org.eco.common.core.core.domain.model.LoginUser;
|
|
|
import org.eco.common.core.core.page.PageResult;
|
|
|
import org.eco.common.core.utils.MapstructUtils;
|
|
|
import org.eco.common.core.utils.StringUtils;
|
|
|
+import org.eco.common.core.utils.file.FileUtils;
|
|
|
import org.eco.common.excel.entity.ExcelResultRes;
|
|
|
import org.eco.common.excel.service.IExcelService;
|
|
|
import org.eco.common.orm.core.page.PageQuery;
|
|
@@ -131,7 +132,7 @@ public class DataImportServiceImpl extends BaseServiceImpl<DataImportMapper, Dat
|
|
|
public boolean insert(DataImportBo dataImportBo) {
|
|
|
SysOssVo ossVo = ossService.getById(dataImportBo.getOssId());
|
|
|
String path = StringUtils.substringAfter(ossVo.getFileName(), Constants.RESOURCE_PREFIX);
|
|
|
- String pathCsv = EcoConfig.getTempPath() + CsvUtils.extractFilename(dataImportBo.getSortieNo());
|
|
|
+ String pathCsv = EcoConfig.getTempPath() + "/" + CsvUtils.getName(FileUtils.getNameNotSuffix(ossVo.getOriginalName()));
|
|
|
File file = CsvUtils.excelToFileCsv(EcoConfig.getProfile() + path, pathCsv);
|
|
|
ossVo = ossService.upload(file);
|
|
|
FileUtil.del(pathCsv);
|