|
|
|
@ -157,20 +157,22 @@ public class TbUploadFileNewController {
|
|
|
|
|
if (null == files) {
|
|
|
|
|
return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.NO_FILE_INPUT), HttpStatus.OK);
|
|
|
|
|
}
|
|
|
|
|
// todo 记录文件上传记录
|
|
|
|
|
//记录文件上传记录
|
|
|
|
|
|
|
|
|
|
//记录文件上传记录
|
|
|
|
|
TbUploadFileNew resources = new TbUploadFileNew();
|
|
|
|
|
resources.setUploadTime(DateUtil.date().toTimestamp());
|
|
|
|
|
resources.setUploadFileTaskName(taskName);
|
|
|
|
|
resources.setFileCount((long) files.length);
|
|
|
|
|
resources.setGmtCreate(DateUtil.date().toTimestamp());
|
|
|
|
|
//操作人 获取当前登录人
|
|
|
|
|
resources.setOperation(SecurityUtils.getCurrentUser().getUsername());
|
|
|
|
|
TbUploadFileNewDto resourcesDto = tbUploadFileNewService.create(resources);
|
|
|
|
|
|
|
|
|
|
if (ObjectUtil.isEmpty(resourcesDto)) {
|
|
|
|
|
log.error("保存失败");
|
|
|
|
|
log.error("上传记录创建失败, resources is {} ", resources.toString());
|
|
|
|
|
return new ResponseEntity<>(CommonResponse.createByError(ResponseCode.FILE_HANDLE_FAIL), HttpStatus.OK);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 解析文件
|
|
|
|
|
int finishTag = 0;
|
|
|
|
|
List<FormdataDto> list = new ArrayList<>();
|
|
|
|
|
|
|
|
|
@ -179,7 +181,7 @@ public class TbUploadFileNewController {
|
|
|
|
|
if (StringUtils.isNotBlank(originalFilename)) {
|
|
|
|
|
String subOriginalFilename = StringUtils.substringAfterLast(originalFilename, SPLIT_FILE_SYMBOL);
|
|
|
|
|
if (XLSX_FILE_SUB_NAME.equalsIgnoreCase(subOriginalFilename)) {
|
|
|
|
|
// TODO: 2021/8/5 0005 解析 入库
|
|
|
|
|
// 解析 入库
|
|
|
|
|
list = formdataService.parseFileAndSaveToDB(file);
|
|
|
|
|
if (CollectionUtil.isNotEmpty(list)) {
|
|
|
|
|
finishTag += 1;
|
|
|
|
|